diff options
| -rw-r--r-- | gui/src/renderer/components/WireguardKeys.tsx | 34 | ||||
| -rw-r--r-- | gui/src/renderer/components/WireguardKeysStyles.tsx | 9 |
2 files changed, 24 insertions, 19 deletions
diff --git a/gui/src/renderer/components/WireguardKeys.tsx b/gui/src/renderer/components/WireguardKeys.tsx index 053b8567c7..966d751b4f 100644 --- a/gui/src/renderer/components/WireguardKeys.tsx +++ b/gui/src/renderer/components/WireguardKeys.tsx @@ -48,17 +48,30 @@ export default class WireguardKeys extends Component<IProps> { </HeaderTitle> </SettingsHeader> - <View style={styles.wgkeys__row}>{this.blockedStateLabel()}</View> - <View style={styles.wgkeys__row}> - <Text style={styles.wgkeys__row_label}> - {messages.pgettext('wireguard-keys', 'Public key')} + {this.props.isOffline && ( + <Text style={[styles.wgkeys__row, styles.wgkeys__invalid_key]}> + {messages.pgettext( + 'wireguard-key-view', + "Can't manage keys whilst 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> + <View style={styles.wgkeys__row_value}>{this.getKeyText()}</View> + </View> + <View style={styles.wgkeys__row}> <Text style={styles.wgkeys__row_label}> {messages.pgettext('wireguard-keys', 'Key generated')} </Text> <Text style={styles.wgkeys__row_value}>{this.ageOfKeyString()}</Text> - <View style={styles.wgkeys__validity_row}>{this.keyValidityLabel()}</View> </View> <View style={styles.wgkeys__row}>{this.getGenerateButton()}</View> @@ -250,15 +263,4 @@ export default class WireguardKeys extends Component<IProps> { return failure; } } - - private blockedStateLabel() { - if (!this.props.isOffline) { - return undefined; - } - return ( - <Text style={styles.wgkeys__invalid_key}> - {messages.pgettext('wireguard-key-view', "Can't manage keys whilst in a blocked state")} - </Text> - ); - } } diff --git a/gui/src/renderer/components/WireguardKeysStyles.tsx b/gui/src/renderer/components/WireguardKeysStyles.tsx index ec3fd6cf2f..a1aebdedf2 100644 --- a/gui/src/renderer/components/WireguardKeysStyles.tsx +++ b/gui/src/renderer/components/WireguardKeysStyles.tsx @@ -18,15 +18,17 @@ export default { marginBottom: 24, }), wgkeys__row_label: Styles.createTextStyle({ + flex: 1, fontFamily: 'Open Sans', fontSize: 13, fontWeight: '600', lineHeight: 20, letterSpacing: -0.2, color: colors.white60, + marginBottom: 9, }), wgkeys__validity_row: Styles.createViewStyle({ - paddingTop: 5, + flexDirection: 'row', }), wgkeys__row_value: Styles.createTextStyle({ fontFamily: 'Open Sans', @@ -37,13 +39,14 @@ export default { }), wgkeys__invalid_key: Styles.createTextStyle({ fontFamily: 'Open Sans', - fontSize: 16, + fontSize: 13, fontWeight: '800', + lineHeight: 20, color: colors.red, }), wgkeys__valid_key: Styles.createTextStyle({ fontFamily: 'Open Sans', - fontSize: 16, + fontSize: 13, fontWeight: '600', lineHeight: 20, color: colors.green, |