diff options
| author | David Lönnhager <david.l@mullvad.net> | 2020-05-14 18:02:15 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2020-05-14 18:02:15 +0200 |
| commit | 65b957623a04bff6a9c5b246635225ff0317c819 (patch) | |
| tree | 34af684840c02a86e4f0432a17fe2aafb75f8943 /gui/src/renderer | |
| parent | 56209ac5b482af7a80a1c9061adbf736fe1093b9 (diff) | |
| parent | 5b88631de855b9ce48fe5da9b8a836602d3f403e (diff) | |
| download | mullvadvpn-65b957623a04bff6a9c5b246635225ff0317c819.tar.xz mullvadvpn-65b957623a04bff6a9c5b246635225ff0317c819.zip | |
Merge branch 'beta-program-update'
Diffstat (limited to 'gui/src/renderer')
| -rw-r--r-- | gui/src/renderer/components/Preferences.tsx | 4 | ||||
| -rw-r--r-- | gui/src/renderer/redux/settings/actions.ts | 4 | ||||
| -rw-r--r-- | gui/src/renderer/redux/settings/reducers.ts | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/gui/src/renderer/components/Preferences.tsx b/gui/src/renderer/components/Preferences.tsx index dc80143fc9..eaf695be84 100644 --- a/gui/src/renderer/components/Preferences.tsx +++ b/gui/src/renderer/components/Preferences.tsx @@ -18,7 +18,7 @@ export interface IProps { autoStart: boolean; autoConnect: boolean; allowLan: boolean; - showBetaReleases?: boolean; + showBetaReleases: boolean; enableSystemNotifications: boolean; monochromaticIcon: boolean; startMinimized: boolean; @@ -170,7 +170,7 @@ export default class Preferences extends Component<IProps> { {messages.pgettext('preferences-view', 'Beta program')} </Cell.Label> <Cell.Switch - isOn={this.props.showBetaReleases || false} + isOn={this.props.showBetaReleases} onChange={this.props.setShowBetaReleases} /> </Cell.Container> diff --git a/gui/src/renderer/redux/settings/actions.ts b/gui/src/renderer/redux/settings/actions.ts index 5a1972527e..d1f564bccd 100644 --- a/gui/src/renderer/redux/settings/actions.ts +++ b/gui/src/renderer/redux/settings/actions.ts @@ -39,7 +39,7 @@ export interface IUpdateBlockWhenDisconnectedAction { export interface IUpdateShowBetaReleasesAction { type: 'UPDATE_SHOW_BETA_NOTIFICATIONS'; - showBetaReleases?: boolean; + showBetaReleases: boolean; } export interface IUpdateBridgeSettingsAction { @@ -171,7 +171,7 @@ function updateBlockWhenDisconnected( }; } -function updateShowBetaReleases(showBetaReleases?: boolean): IUpdateShowBetaReleasesAction { +function updateShowBetaReleases(showBetaReleases: boolean): IUpdateShowBetaReleasesAction { return { type: 'UPDATE_SHOW_BETA_NOTIFICATIONS', showBetaReleases, diff --git a/gui/src/renderer/redux/settings/reducers.ts b/gui/src/renderer/redux/settings/reducers.ts index 3cfb414a42..9dac6064bd 100644 --- a/gui/src/renderer/redux/settings/reducers.ts +++ b/gui/src/renderer/redux/settings/reducers.ts @@ -126,7 +126,7 @@ export interface ISettingsReduxState { bridgeSettings: BridgeSettingsRedux; bridgeState: BridgeState; blockWhenDisconnected: boolean; - showBetaReleases?: boolean; + showBetaReleases: boolean; openVpn: { mssfix?: number; }; @@ -167,7 +167,7 @@ const initialState: ISettingsReduxState = { }, bridgeState: 'auto', blockWhenDisconnected: false, - showBetaReleases: undefined, + showBetaReleases: false, openVpn: {}, wireguard: {}, wireguardKeyState: { |
