diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2021-10-27 15:15:36 +0200 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2021-10-27 15:15:36 +0200 |
| commit | c9e46c7126f2ca701953cba07c7b8e1b1136b15b (patch) | |
| tree | 077ad7fdbbef8b5008d4a56290d76afc87dc3494 /gui/src/renderer/components | |
| parent | b7677912e5557d0e5f7a2ebc0290041a3bece5af (diff) | |
| parent | 70459cc431c904e33ed38c3c87a84dd7d0c53466 (diff) | |
| download | mullvadvpn-c9e46c7126f2ca701953cba07c7b8e1b1136b15b.tar.xz mullvadvpn-c9e46c7126f2ca701953cba07c7b8e1b1136b15b.zip | |
Merge branch 'hide-settings-while-not-connected-to-daemon'
Diffstat (limited to 'gui/src/renderer/components')
| -rw-r--r-- | gui/src/renderer/components/Settings.tsx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gui/src/renderer/components/Settings.tsx b/gui/src/renderer/components/Settings.tsx index 1610f776f9..cd8bf623ea 100644 --- a/gui/src/renderer/components/Settings.tsx +++ b/gui/src/renderer/components/Settings.tsx @@ -29,6 +29,7 @@ import { LoginState } from '../redux/account/reducers'; export interface IProps { preferredLocaleDisplayName: string; loginState: LoginState; + connectedToDaemon: boolean; accountExpiry?: string; appVersion: string; consistentVersion: boolean; @@ -108,7 +109,7 @@ export default class Settings extends React.Component<IProps> { private renderTopButtons() { const isLoggedIn = this.props.loginState.type === 'ok'; - if (!isLoggedIn) { + if (!isLoggedIn || !this.props.connectedToDaemon) { return null; } |