diff --git a/src/components/bottomTabBar/view/bottomTabBarView.tsx b/src/components/bottomTabBar/view/bottomTabBarView.tsx
index 45bab50c14..bbf18f214b 100644
--- a/src/components/bottomTabBar/view/bottomTabBarView.tsx
+++ b/src/components/bottomTabBar/view/bottomTabBarView.tsx
@@ -66,7 +66,7 @@ const BottomTabBarView = ({
const _iconProps = {
iconType: 'MaterialIcons',
- style: { padding: 15 },
+ style: { paddingTop: 15 },
name: route.params.iconName,
color: iconColor,
size: scalePx(26),
diff --git a/src/components/horizontalIconList/horizontalIconListStyles.js b/src/components/horizontalIconList/horizontalIconListStyles.js
index a12a5c63b7..074384aa99 100644
--- a/src/components/horizontalIconList/horizontalIconListStyles.js
+++ b/src/components/horizontalIconList/horizontalIconListStyles.js
@@ -42,10 +42,9 @@ export default EStyleSheet.create({
backgroundColor: '$primaryBlue',
justifyContent: 'center',
alignItems: 'center',
- padding: 2,
- height: 12,
+ paddingHorizontal: 4,
minWidth: 18,
- borderRadius: 12 / 2,
+ borderRadius: 16,
},
badgeText: {
fontSize: 8,
diff --git a/src/components/icon/view/iconStyles.js b/src/components/icon/view/iconStyles.js
index 6a97ef04d6..19dff0abff 100644
--- a/src/components/icon/view/iconStyles.js
+++ b/src/components/icon/view/iconStyles.js
@@ -10,7 +10,7 @@ export default EStyleSheet.create({
},
badgeWrapper: {
position: 'absolute',
- right: scalePx(15),
+ left: scalePx(15),
top: scalePx(18),
backgroundColor: '$primaryRed',
borderWidth: 0,
diff --git a/src/screens/login/screen/loginScreen.js b/src/screens/login/screen/loginScreen.js
index 302f6f2065..38b7384b4e 100644
--- a/src/screens/login/screen/loginScreen.js
+++ b/src/screens/login/screen/loginScreen.js
@@ -123,12 +123,6 @@ const LoginScreen = ({
}}
/>
-
-
+
{intl.formatMessage({
@@ -213,7 +207,8 @@ const LoginScreen = ({
})}
-
+
+
+
{({
accounts,
@@ -30,10 +33,12 @@ class RedeemScreen extends PureComponent {
user,
}) => (
- {({ handleOnSubmit, SCPath, isSCModalOpen, handleOnSCModalClose, isLoading }) => (
-
- {redeemType === 'promote' && (
- {
+
+ let _retView = null;
+ switch (redeemType) {
+ case 'promote':
+ _retView =
- )}
-
- {redeemType === 'boost' && (
-
- )}
-
- {redeemType === 'boost_plus' && (
-
- )}
-
- )}
+ break;
+ }
+
+ return (
+
+ {_retView}
+
+ )
+ }}
)}
-
+
);
}
}
diff --git a/src/screens/redeem/children/boostPlus.styles.ts b/src/screens/redeem/styles/boostPlus.styles.ts
similarity index 100%
rename from src/screens/redeem/children/boostPlus.styles.ts
rename to src/screens/redeem/styles/boostPlus.styles.ts
diff --git a/src/screens/redeem/styles/redeemScreen.styles.ts b/src/screens/redeem/styles/redeemScreen.styles.ts
new file mode 100644
index 0000000000..6121370030
--- /dev/null
+++ b/src/screens/redeem/styles/redeemScreen.styles.ts
@@ -0,0 +1,8 @@
+import EStyleSheet from 'react-native-extended-stylesheet';
+
+export default EStyleSheet.create({
+ container: {
+ flex: 1,
+ backgroundColor: '$primaryBackgroundColor'
+ },
+})
\ No newline at end of file