diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2020-06-09 14:49:22 +0200 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2020-06-10 13:46:17 +0200 |
| commit | 74b6417edcc78ce43b763fab7635fb369b307f6d (patch) | |
| tree | e1e555d849a581ccec82af3dfc1674e52858e383 /gui/src | |
| parent | bfd3b02a3936451ae43867f8f3e2f986a2a2f9bc (diff) | |
| download | mullvadvpn-74b6417edcc78ce43b763fab7635fb369b307f6d.tar.xz mullvadvpn-74b6417edcc78ce43b763fab7635fb369b307f6d.zip | |
Change SecuredLabel to 'BLOCKED CONNECTION' when disconnected and always require vpn is enabled
Diffstat (limited to 'gui/src')
| -rw-r--r-- | gui/src/renderer/components/Connect.tsx | 2 | ||||
| -rw-r--r-- | gui/src/renderer/components/TunnelControl.tsx | 9 | ||||
| -rw-r--r-- | gui/src/renderer/containers/ConnectPage.tsx | 1 |
3 files changed, 10 insertions, 2 deletions
diff --git a/gui/src/renderer/components/Connect.tsx b/gui/src/renderer/components/Connect.tsx index 4acab681bc..b57c63a273 100644 --- a/gui/src/renderer/components/Connect.tsx +++ b/gui/src/renderer/components/Connect.tsx @@ -18,6 +18,7 @@ interface IProps { connection: IConnectionReduxState; loginState: LoginState; accountExpiry?: AccountExpiry; + blockWhenDisconnected: boolean; selectedRelayName: string; onSettings: () => void; onSelectLocation: () => void; @@ -156,6 +157,7 @@ export default class Connect extends Component<IProps, IState> { <TunnelControl tunnelState={this.props.connection.status} + blockWhenDisconnected={this.props.blockWhenDisconnected} selectedRelayName={this.props.selectedRelayName} city={this.props.connection.city} country={this.props.connection.country} diff --git a/gui/src/renderer/components/TunnelControl.tsx b/gui/src/renderer/components/TunnelControl.tsx index 5bf00fb9fa..aa8ae80183 100644 --- a/gui/src/renderer/components/TunnelControl.tsx +++ b/gui/src/renderer/components/TunnelControl.tsx @@ -13,6 +13,7 @@ import SecuredLabel, { SecuredDisplayStyle } from './SecuredLabel'; interface ITunnelControlProps { tunnelState: TunnelState; + blockWhenDisconnected: boolean; selectedRelayName: string; city?: string; country?: string; @@ -224,11 +225,14 @@ export default class TunnelControl extends Component<ITunnelControlProps> { </Wrapper> ); - case 'disconnected': + case 'disconnected': { + const displayStyle = this.props.blockWhenDisconnected + ? SecuredDisplayStyle.blocked + : SecuredDisplayStyle.unsecured; return ( <Wrapper> <Body> - <Secured displayStyle={SecuredDisplayStyle.unsecured} /> + <Secured displayStyle={displayStyle} /> <Location>{this.renderCountry()}</Location> </Body> <Footer> @@ -237,6 +241,7 @@ export default class TunnelControl extends Component<ITunnelControlProps> { </Footer> </Wrapper> ); + } default: throw new Error(`Unknown TunnelState: ${this.props.tunnelState}`); diff --git a/gui/src/renderer/containers/ConnectPage.tsx b/gui/src/renderer/containers/ConnectPage.tsx index 06e3713fe8..4ba47f7511 100644 --- a/gui/src/renderer/containers/ConnectPage.tsx +++ b/gui/src/renderer/containers/ConnectPage.tsx @@ -69,6 +69,7 @@ const mapStateToProps = (state: IReduxState) => { ? new AccountExpiry(state.account.expiry, state.userInterface.locale) : undefined, loginState: state.account.status, + blockWhenDisconnected: state.settings.blockWhenDisconnected, selectedRelayName: getRelayName(state.settings.relaySettings, state.settings.relayLocations), connection: state.connection, }; |