diff options
| author | anderklander <anderklander@gmail.com> | 2018-01-09 13:48:32 +0100 |
|---|---|---|
| committer | anderklander <anderklander@gmail.com> | 2018-01-18 19:28:03 +0100 |
| commit | 22aa08d6aefae17acc2c5082609d5fc585f24088 (patch) | |
| tree | 409b7c382447db3765d53e6b5a515e98f4370bce | |
| parent | fc65b7414afed915de8bce89d00a46449e91f196 (diff) | |
| download | mullvadvpn-22aa08d6aefae17acc2c5082609d5fc585f24088.tar.xz mullvadvpn-22aa08d6aefae17acc2c5082609d5fc585f24088.zip | |
Settings view and style fix for paid until label
| -rw-r--r-- | app/components/Settings.js | 12 | ||||
| -rw-r--r-- | app/components/SettingsStyles.js | 15 |
2 files changed, 14 insertions, 13 deletions
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 bb6a3fed97..15b55d5009 100644 --- a/app/components/SettingsStyles.js +++ b/app/components/SettingsStyles.js @@ -79,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, @@ -122,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', }, })); |