diff options
| author | Emīls Piņķis <emils@mullvad.net> | 2019-11-13 14:44:18 +0000 |
|---|---|---|
| committer | Odd Stranne <odd@mullvad.net> | 2019-11-25 13:49:44 +0100 |
| commit | c76763846bac543b893426a2416b3f2e99ccf487 (patch) | |
| tree | 2ca8e7564e48e5f2218a12907d5e7e6077e3fc67 /gui/src | |
| parent | b3326556d446365862f8f2f925a42f47e8d7169d (diff) | |
| download | mullvadvpn-c76763846bac543b893426a2416b3f2e99ccf487.tar.xz mullvadvpn-c76763846bac543b893426a2416b3f2e99ccf487.zip | |
Enable wireguard keys menu on all platforms
Diffstat (limited to 'gui/src')
| -rw-r--r-- | gui/src/renderer/components/AdvancedSettings.tsx | 25 | ||||
| -rw-r--r-- | gui/src/renderer/containers/AdvancedSettingsPage.tsx | 2 |
2 files changed, 8 insertions, 19 deletions
diff --git a/gui/src/renderer/components/AdvancedSettings.tsx b/gui/src/renderer/components/AdvancedSettings.tsx index d55c67f152..dd9568bed5 100644 --- a/gui/src/renderer/components/AdvancedSettings.tsx +++ b/gui/src/renderer/components/AdvancedSettings.tsx @@ -43,7 +43,6 @@ interface IProps { wireguard: { port?: number }; mssfix?: number; bridgeState: BridgeState; - enableWireguardKeysPage: boolean; setBridgeState: (value: BridgeState) => void; setEnableIpv6: (value: boolean) => void; setBlockWhenDisconnected: (value: boolean) => void; @@ -332,7 +331,14 @@ export default class AdvancedSettings extends Component<IProps, IState> { )} </Cell.FooterText> </Cell.Footer> - {this.wireguardKeysButton()} + <View style={styles.advanced_settings__wgkeys_cell}> + <Cell.CellButton onPress={this.props.onViewWireguardKeys}> + <Cell.Label> + {messages.pgettext('advanced-settings-view', 'WireGuard key')} + </Cell.Label> + <Cell.Icon height={12} width={7} source="icon-chevron" /> + </Cell.CellButton> + </View> </NavigationScrollbars> </View> </NavigationContainer> @@ -342,21 +348,6 @@ export default class AdvancedSettings extends Component<IProps, IState> { ); } - private wireguardKeysButton() { - if (this.props.enableWireguardKeysPage) { - return ( - <View style={styles.advanced_settings__wgkeys_cell}> - <Cell.CellButton onPress={this.props.onViewWireguardKeys}> - <Cell.Label>{messages.pgettext('advanced-settings-view', 'WireGuard key')}</Cell.Label> - <Cell.Icon height={12} width={7} source="icon-chevron" /> - </Cell.CellButton> - </View> - ); - } else { - return null; - } - } - private onSelectTunnelProtocol = (protocol?: TunnelProtocol) => { this.props.setTunnelProtocol(protocol); }; diff --git a/gui/src/renderer/containers/AdvancedSettingsPage.tsx b/gui/src/renderer/containers/AdvancedSettingsPage.tsx index e31365b86d..fad5704a97 100644 --- a/gui/src/renderer/containers/AdvancedSettingsPage.tsx +++ b/gui/src/renderer/containers/AdvancedSettingsPage.tsx @@ -12,14 +12,12 @@ import { IReduxState, ReduxDispatch } from '../redux/store'; const mapStateToProps = (state: IReduxState) => { const protocolAndPort = mapRelaySettingsToProtocolAndPort(state.settings.relaySettings); - const enableWireguardKeysPage = process.platform === 'linux' || process.platform === 'darwin'; return { enableIpv6: state.settings.enableIpv6, blockWhenDisconnected: state.settings.blockWhenDisconnected, mssfix: state.settings.openVpn.mssfix, bridgeState: state.settings.bridgeState, - enableWireguardKeysPage, ...protocolAndPort, }; }; |
