Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nt/boost tweaks #2835

Merged
merged 3 commits into from
Feb 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/header/container/headerContainer.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const HeaderContainer = ({ selectedUser, isReverse, handleOnBackPress, hideUser,
};

const _handleOnBoostPress = () => {
//TODO: navigate to boost plus screen;
//navigate to boost plus screen;
navigation.navigate(ROUTES.SCREENS.REDEEM, {
redeemType:'boost_plus'
})
Expand Down
11 changes: 4 additions & 7 deletions src/components/header/view/headerStyles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,11 @@ export default EStyleSheet.create({
flexDirection:'row',
marginRight:10,
},
plusIcon: {
fontSize: 12,
color: '$primaryBlue',
justifyContent: 'center',

} as ViewStyle,
boostIconContainer:{
marginLeft:6,
},
boostPlusIcon: {
fontSize: 22,
fontSize: 24,
color: '$primaryBlue',
justifyContent: 'center',
},
Expand Down
28 changes: 11 additions & 17 deletions src/components/header/view/headerView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -109,23 +109,7 @@ const HeaderView = ({
</View>
) : (
<View style={styles.backButtonWrapper}>
{showBoost && (
<TouchableOpacity onPress={handleOnBoostPress} >
<View style={styles.boostContainer}>
<Icon
style={styles.boostPlusIcon}
name="fire"
iconType="FontAwesome5"
/>
<Icon
style={styles.plusIcon}
name="plus"
iconType="FontAwesome5"
/>
</View>

</TouchableOpacity>
)}

{showQR && (
<IconButton
style={styles.viewIconContainer}
Expand All @@ -136,6 +120,16 @@ const HeaderView = ({
/>
)}
<IconButton iconStyle={styles.backIcon} name="md-search" onPress={_onPressSearchButton} />

{showBoost && isLoggedIn && (
<IconButton
style={styles.boostIconContainer}
iconStyle={styles.boostPlusIcon}
name="fire"
iconType="FontAwesome5"
onPress={handleOnBoostPress}
/>
)}
</View>
)}
</>
Expand Down
2 changes: 1 addition & 1 deletion src/config/locales/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"checkin_extra_desc": "Consistent use of app gives you extra chances to earn more points, be more active and earn more.",
"dropdown_transfer": "Gift",
"dropdown_promote": "Promote",
"dropdown_boost": "Boost",
"dropdown_boost": "Boost+",
"from": "From",
"to": "To",
"estimated_value_desc": "According to purchase value",
Expand Down
2 changes: 1 addition & 1 deletion src/containers/pointsContainer.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ const PointsContainer = ({
navigateTo = ROUTES.SCREENS.REDEEM;
navigateParams = {
balance,
redeemType: 'boost',
redeemType: 'boost_plus',
};
}

Expand Down
2 changes: 1 addition & 1 deletion src/screens/assetDetails/screen/assetDetailsScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ const AssetDetailsScreen = ({ navigation, route }: AssetDetailsScreenProps) => {
navigateTo = ROUTES.SCREENS.REDEEM;
navigateParams = {
balance: coinData.balance,
redeemType: transferType === 'dropdown_promote' ? 'promote' : 'boost',
redeemType: transferType === 'dropdown_promote' ? 'promote' : 'boost_plus',
};
} else {
let { balance } = coinData;
Expand Down