Merge branch 'rn-xp-style-fix'

3 files changed, 21 insertions, 18 deletions

diff --git a/app/components/PreferencesStyles.js b/app/components/PreferencesStyles.js
index 002494a6c5..24d0884605 100644
--- a/app/components/PreferencesStyles.js
+++ b/app/components/PreferencesStyles.js
@@ -5,7 +5,7 @@ import { createViewStyles, createTextStyles } from '../lib/styles';
 export default {
   ...createViewStyles({
     preferences: {
-      background: '#192E45',
+      backgroundColor: '#192E45',
       height: '100%',
     },
     preferences__container: {
@@ -72,20 +72,20 @@ export default {
     preferences__close_title: {
       fontFamily: 'Open Sans',
       fontSize: 13,
-      fontWeight: 600,
+      fontWeight: '600',
       color: 'rgba(255, 255, 255, 0.6)',
     },
     preferences__title: {
       fontFamily: 'DINPro',
       fontSize: 32,
-      fontWeight: 900,
+      fontWeight: '900',
       lineHeight: 40,
       color: '#fff',
     },
     preferences__cell_label: {
       fontFamily: 'DINPro',
       fontSize: 20,
-      fontWeight: 900,
+      fontWeight: '900',
       lineHeight: 26,
       letterSpacing: -0.2,
       color: '#fff',
@@ -93,7 +93,7 @@ export default {
     preferences__cell_footer_label: {
       fontFamily: 'Open Sans',
       fontSize: 13,
-      fontWeight: 600,
+      fontWeight: '600',
       lineHeight: 20,
       letterSpacing: -0.2,
       color: 'rgba(255,255,255,0.8)'
diff --git a/app/components/Settings.js b/app/components/Settings.js
index a92a7e57e8..a25cb39f19 100644
--- a/app/components/Settings.js
+++ b/app/components/Settings.js
@@ -80,13 +80,11 @@ export default class Settings extends Component {
         <Button onPress={ this.props.onViewAccount } testName='settings__view_account'>
           <View style={styles.settings__cell}>
             <Text style={styles.settings__cell_label}>Account</Text>
-            <View style={styles.settings__account_paid_until_label_container}>
-              {isOutOfTime ? (
-                <Text style={styles.settings__account_paid_until_label__error} testName='settings__account_paid_until_label'>OUT OF TIME</Text>
-              ) : (
-                <Text style={styles.settings__account_paid_until_label} testName='settings__account_paid_until_label'>{formattedExpiry}</Text>
-              )}
-            </View>
+            {isOutOfTime ? (
+              <Text style={styles.settings__account_paid_until_label__error} testName='settings__account_paid_until_label'>OUT OF TIME</Text>
+            ) : (
+              <Text style={styles.settings__account_paid_until_label} testName='settings__account_paid_until_label'>{formattedExpiry}</Text>
+            )}
             <Img style={styles.settings__cell_disclosure} source='icon-chevron' tintColor='currentColor'/>
           </View>
         </Button>
diff --git a/app/components/SettingsStyles.js b/app/components/SettingsStyles.js
index 394aa6f1ce..15b55d5009 100644
--- a/app/components/SettingsStyles.js
+++ b/app/components/SettingsStyles.js
@@ -60,6 +60,8 @@ export default Object.assign(createViewStyles({
   settings__cell_disclosure:{
     marginLeft: 8,
     color: 'rgba(255, 255, 255, 0.8)',
+    width: 7,
+    height: 12,
   },
   settings__cell_spacer:{
     height: 24,
@@ -77,9 +79,6 @@ export default Object.assign(createViewStyles({
     alignItems: 'flex-end',
     color: 'rgba(255, 255, 255, 0.8)',
   },
-  settings__account_paid_until_label__error:{
-    color: '#d0021b',
-  },
   settings__footer_button:{
     backgroundColor: 'rgba(208,2,27,1)',
     paddingTop: 7,
@@ -120,14 +119,20 @@ export default Object.assign(createViewStyles({
     lineHeight: 26,
     color: 'rgba(255,255,255,0.8)'
   },
-  settings__account_paid_until_label_container :{
+  settings__account_paid_until_label:{
+    fontFamily: 'Open Sans',
+    fontSize: 13,
+    fontWeight: '800',
+    color: 'rgba(255, 255, 255, 0.8)',
     flexGrow: 0,
     textAlign: 'right',
   },
-  settings__account_paid_until_label:{
+  settings__account_paid_until_label__error:{
     fontFamily: 'Open Sans',
     fontSize: 13,
     fontWeight: '800',
-    color: 'rgba(255, 255, 255, 0.8)',
+    flexGrow: 0,
+    textAlign: 'right',
+    color: '#d0021b',
   },
 }));