diff options
| author | Emīls Piņķis <emils@mullvad.net> | 2019-08-01 20:01:56 +0100 |
|---|---|---|
| committer | Emīls Piņķis <emils@mullvad.net> | 2019-08-01 20:01:56 +0100 |
| commit | fc28a749fba82bf2fed844a7ffab33f3619f7233 (patch) | |
| tree | 34a2a3583fd65277a8afeee1f15f559c85393aa9 | |
| parent | c72a8c119d95977d55326d965cc8fa4b91d14626 (diff) | |
| parent | 25c1681c413abea8261bc0cd4ffd3c185d5dc20e (diff) | |
| download | mullvadvpn-fc28a749fba82bf2fed844a7ffab33f3619f7233.tar.xz mullvadvpn-fc28a749fba82bf2fed844a7ffab33f3619f7233.zip | |
Merge branch 'improve-gui-show-all-constraints'
| -rw-r--r-- | gui/src/renderer/components/AdvancedSettings.tsx | 61 |
1 files changed, 27 insertions, 34 deletions
diff --git a/gui/src/renderer/components/AdvancedSettings.tsx b/gui/src/renderer/components/AdvancedSettings.tsx index e5c1c5f75e..cffdf4a34e 100644 --- a/gui/src/renderer/components/AdvancedSettings.tsx +++ b/gui/src/renderer/components/AdvancedSettings.tsx @@ -232,43 +232,36 @@ export default class AdvancedSettings extends Component<IProps, IState> { undefined )} - {this.props.tunnelProtocol === 'openvpn' || - this.props.tunnelProtocol === undefined || - process.platform === 'win32' ? ( - <View style={styles.advanced_settings__content}> + <View style={styles.advanced_settings__content}> + <Selector + title={messages.pgettext( + 'advanced-settings-view', + 'OpenVPN transport protocols', + )} + values={this.protocolItems} + value={this.props.openvpn.protocol} + onSelect={this.onSelectOpenvpnProtocol} + /> + + {this.props.openvpn.protocol ? ( <Selector - title={messages.pgettext( - 'advanced-settings-view', - 'OpenVPN transport protocols', + title={sprintf( + // TRANSLATORS: The title for the port selector section. + // TRANSLATORS: Available placeholders: + // TRANSLATORS: %(portType)s - a selected protocol (either TCP or UDP) + messages.pgettext('advanced-settings-view', '%(portType)s port'), + { + portType: this.props.openvpn.protocol.toUpperCase(), + }, )} - values={this.protocolItems} - value={this.props.openvpn.protocol} - onSelect={this.onSelectOpenvpnProtocol} + values={this.portItems[this.props.openvpn.protocol]} + value={this.props.openvpn.port} + onSelect={this.onSelectOpenVpnPort} /> - - {this.props.openvpn.protocol ? ( - <Selector - title={sprintf( - // TRANSLATORS: The title for the port selector section. - // TRANSLATORS: Available placeholders: - // TRANSLATORS: %(portType)s - a selected protocol (either TCP or UDP) - messages.pgettext('advanced-settings-view', '%(portType)s port'), - { - portType: this.props.openvpn.protocol.toUpperCase(), - }, - )} - values={this.portItems[this.props.openvpn.protocol]} - value={this.props.openvpn.port} - onSelect={this.onSelectOpenVpnPort} - /> - ) : ( - undefined - )} - </View> - ) : ( - undefined - )} - + ) : ( + undefined + )} + </View> {this.props.tunnelProtocol === 'wireguard' && process.platform !== 'win32' ? ( <View style={styles.advanced_settings__content}> <Selector |