Merge branch 'simplify-protocol-constraint-selection'

2 files changed, 37 insertions, 29 deletions

diff --git a/gui/src/renderer/components/AdvancedSettings.tsx b/gui/src/renderer/components/AdvancedSettings.tsx
index cffdf4a34e..2745fbf1a2 100644
--- a/gui/src/renderer/components/AdvancedSettings.tsx
+++ b/gui/src/renderer/components/AdvancedSettings.tsx
@@ -222,7 +222,7 @@ export default class AdvancedSettings extends Component<IProps, IState> {
                   {process.platform !== 'win32' ? (
                     <View style={styles.advanced_settings__content}>
                       <Selector
-                        title={messages.pgettext('advanced-settings-view', 'Tunnel protocols')}
+                        title={messages.pgettext('advanced-settings-view', 'Tunnel protocol')}
                         values={this.tunnelProtocolItems}
                         value={this.props.tunnelProtocol}
                         onSelect={this.onSelectTunnelProtocol}
@@ -232,36 +232,44 @@ export default class AdvancedSettings extends Component<IProps, IState> {
                     undefined
                   )}
 
-                  <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 ? (
+                  {this.props.tunnelProtocol !== 'wireguard' ? (
+                    <View style={styles.advanced_settings__content}>
                       <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(),
-                          },
+                        title={messages.pgettext(
+                          'advanced-settings-view',
+                          'OpenVPN transport protocol',
                         )}
-                        values={this.portItems[this.props.openvpn.protocol]}
-                        value={this.props.openvpn.port}
-                        onSelect={this.onSelectOpenVpnPort}
+                        values={this.protocolItems}
+                        value={this.props.openvpn.protocol}
+                        onSelect={this.onSelectOpenvpnProtocol}
                       />
-                    ) : (
-                      undefined
-                    )}
-                  </View>
+
+                      {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',
+                              'OpenVPN %(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
+                  )}
+
                   {this.props.tunnelProtocol === 'wireguard' && process.platform !== 'win32' ? (
                     <View style={styles.advanced_settings__content}>
                       <Selector
diff --git a/gui/src/renderer/components/WireguardKeys.tsx b/gui/src/renderer/components/WireguardKeys.tsx
index ce28c28454..3bc4b129e1 100644
--- a/gui/src/renderer/components/WireguardKeys.tsx
+++ b/gui/src/renderer/components/WireguardKeys.tsx
@@ -55,7 +55,7 @@ export default class WireguardKeys extends Component<IProps> {
                   disabled={this.props.isOffline}
                   onPress={this.props.onVisitWebsiteKey}>
                   <AppButton.Label>
-                    {messages.pgettext('wireguard-key-view', 'Manage keys in website')}
+                    {messages.pgettext('wireguard-key-view', 'Manage keys')}
                   </AppButton.Label>
                   <AppButton.Icon source="icon-extLink" height={16} width={16} />
                 </AppButton.GreenButton>