diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2022-02-22 11:29:46 +0100 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2022-02-22 11:29:46 +0100 |
| commit | 79702044ae55a4af48cfbdd4bc3f13d26b3e1672 (patch) | |
| tree | 0ebb1377449f1889afd3babea66407a57f9a8204 /gui/src/renderer/containers | |
| parent | 7aea025585bf95654bdd216c48edd3769057aba0 (diff) | |
| parent | ffc9971f8a5ab51b5b05b09f282fcae4b916b41b (diff) | |
| download | mullvadvpn-79702044ae55a4af48cfbdd4bc3f13d26b3e1672.tar.xz mullvadvpn-79702044ae55a4af48cfbdd4bc3f13d26b3e1672.zip | |
Merge branch 'add-blocking-message-on-login-page'
Diffstat (limited to 'gui/src/renderer/containers')
| -rw-r--r-- | gui/src/renderer/containers/LoginPage.tsx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/gui/src/renderer/containers/LoginPage.tsx b/gui/src/renderer/containers/LoginPage.tsx index 6797f40d3e..a6c494c601 100644 --- a/gui/src/renderer/containers/LoginPage.tsx +++ b/gui/src/renderer/containers/LoginPage.tsx @@ -6,11 +6,17 @@ import accountActions from '../redux/account/actions'; import { IReduxState, ReduxDispatch } from '../redux/store'; const mapStateToProps = (state: IReduxState) => { + const tunnelState = state.connection.status; + const blockWhenDisconnected = state.settings.blockWhenDisconnected; const { accountToken, accountHistory, status } = state.account; + + const showBlockMessage = tunnelState.state === 'error' || blockWhenDisconnected; + return { accountToken, accountHistory, loginState: status, + showBlockMessage, }; }; const mapDispatchToProps = (dispatch: ReduxDispatch, props: IAppContext) => { |