diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2020-01-24 11:55:41 +0100 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2020-01-24 14:33:10 +0100 |
| commit | 6d7d256ad73ee5eb274fd1daefae19db5e549b57 (patch) | |
| tree | cacd4e121253d4e2232334933bfb544f54c176aa /gui/src | |
| parent | da00258b174159acc547acc7dfb6deb21e09f7b3 (diff) | |
| download | mullvadvpn-6d7d256ad73ee5eb274fd1daefae19db5e549b57.tar.xz mullvadvpn-6d7d256ad73ee5eb274fd1daefae19db5e549b57.zip | |
Move wireguard key error messages to between key info and buttons
Diffstat (limited to 'gui/src')
| -rw-r--r-- | gui/src/renderer/components/WireguardKeys.tsx | 36 | ||||
| -rw-r--r-- | gui/src/renderer/components/WireguardKeysStyles.tsx | 12 |
2 files changed, 22 insertions, 26 deletions
diff --git a/gui/src/renderer/components/WireguardKeys.tsx b/gui/src/renderer/components/WireguardKeys.tsx index fd4c739a65..f51287ce52 100644 --- a/gui/src/renderer/components/WireguardKeys.tsx +++ b/gui/src/renderer/components/WireguardKeys.tsx @@ -48,22 +48,10 @@ export default class WireguardKeys extends Component<IProps> { </HeaderTitle> </SettingsHeader> - {this.props.isOffline && ( - <Text style={[styles.wgkeys__row, styles.wgkeys__invalid_key]}> - {messages.pgettext( - 'wireguard-key-view', - 'Unable to manage keys while in a blocked state', - )} - </Text> - )} - <View style={styles.wgkeys__row}> - <View style={styles.wgkeys__validity_row}> - <Text style={styles.wgkeys__row_label}> - {messages.pgettext('wireguard-keys', 'Public key')} - </Text> - {this.keyValidityLabel()} - </View> + <Text style={styles.wgkeys__row_label}> + {messages.pgettext('wireguard-keys', 'Public key')} + </Text> <View style={styles.wgkeys__row_value}>{this.getKeyText()}</View> </View> @@ -74,6 +62,19 @@ export default class WireguardKeys extends Component<IProps> { <Text style={styles.wgkeys__row_value}>{this.ageOfKeyString()}</Text> </View> + <View style={styles.wgkeys__messages}> + {this.props.isOffline ? ( + <Text style={[styles.wgkeys__row, styles.wgkeys__invalid_key]}> + {messages.pgettext( + 'wireguard-key-view', + 'Unable to manage keys while in a blocked state', + )} + </Text> + ) : ( + <View style={styles.wgkeys__row}>{this.keyValidityLabel()}</View> + )} + </View> + <View style={styles.wgkeys__row}>{this.getGenerateButton()}</View> <View style={styles.wgkeys__row}> <AppButton.GreenButton @@ -234,10 +235,7 @@ export default class WireguardKeys extends Component<IProps> { } default: - return ( - // Placeholder to take up the same amount of space as the validity text/spinner - <View style={{ marginBottom: 20 }} /> - ); + return null; } } diff --git a/gui/src/renderer/components/WireguardKeysStyles.tsx b/gui/src/renderer/components/WireguardKeysStyles.tsx index a1aebdedf2..7d0bd43e76 100644 --- a/gui/src/renderer/components/WireguardKeysStyles.tsx +++ b/gui/src/renderer/components/WireguardKeysStyles.tsx @@ -10,11 +10,12 @@ export default { flexDirection: 'column', flex: 1, }), + wgkeys__messages: Styles.createViewStyle({ + flex: 1, + }), wgkeys__row: Styles.createViewStyle({ - paddingTop: 0, - paddingBottom: 0, - paddingLeft: 24, - paddingRight: 24, + paddingVertical: 0, + paddingHorizontal: 24, marginBottom: 24, }), wgkeys__row_label: Styles.createTextStyle({ @@ -27,9 +28,6 @@ export default { color: colors.white60, marginBottom: 9, }), - wgkeys__validity_row: Styles.createViewStyle({ - flexDirection: 'row', - }), wgkeys__row_value: Styles.createTextStyle({ fontFamily: 'Open Sans', fontSize: 16, |