diff options
6 files changed, 2 insertions, 28 deletions
diff --git a/desktop/packages/mullvad-vpn/src/main/index.ts b/desktop/packages/mullvad-vpn/src/main/index.ts index efbd5e1654..f855278ba9 100644 --- a/desktop/packages/mullvad-vpn/src/main/index.ts +++ b/desktop/packages/mullvad-vpn/src/main/index.ts @@ -787,7 +787,6 @@ class ApplicationMain splitTunnelingApplications: this.splitTunnelingApplications, macOsScrollbarVisibility: this.macOsScrollbarVisibility, changelog: this.changelog ?? [], - forceShowChanges: CommandLineOptions.showChanges.match, navigationHistory: this.navigationHistory, currentApiAccessMethod: this.currentApiAccessMethod, isMacOs13OrNewer: isMacOs13OrNewer(), diff --git a/desktop/packages/mullvad-vpn/src/renderer/app.tsx b/desktop/packages/mullvad-vpn/src/renderer/app.tsx index 243cce4633..a71df61f56 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/app.tsx +++ b/desktop/packages/mullvad-vpn/src/renderer/app.tsx @@ -242,7 +242,7 @@ export default class AppRenderer { this.setUpgradeVersion(initialState.upgradeVersion); this.setGuiSettings(initialState.guiSettings); this.storeAutoStart(initialState.autoStart); - this.setChangelog(initialState.changelog, initialState.forceShowChanges); + this.setChangelog(initialState.changelog); this.setCurrentApiAccessMethod(initialState.currentApiAccessMethod); this.reduxActions.userInterface.setIsMacOs13OrNewer(initialState.isMacOs13OrNewer); @@ -1000,9 +1000,8 @@ export default class AppRenderer { this.reduxActions.settings.updateAutoStart(autoStart); } - private setChangelog(changelog: IChangelog, forceShowChanges: boolean) { + private setChangelog(changelog: IChangelog) { this.reduxActions.userInterface.setChangelog(changelog); - this.reduxActions.userInterface.setForceShowChanges(forceShowChanges); } private updateLocation() { diff --git a/desktop/packages/mullvad-vpn/src/renderer/redux/userinterface/actions.ts b/desktop/packages/mullvad-vpn/src/renderer/redux/userinterface/actions.ts index 238835318e..83c0252452 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/redux/userinterface/actions.ts +++ b/desktop/packages/mullvad-vpn/src/renderer/redux/userinterface/actions.ts @@ -41,11 +41,6 @@ export interface ISetChangelog { changelog: IChangelog; } -export interface ISetForceShowChanges { - type: 'SET_FORCE_SHOW_CHANGES'; - forceShowChanges: boolean; -} - export interface ISetIsPerformingPostUpgrade { type: 'SET_IS_PERFORMING_POST_UPGRADE'; isPerformingPostUpgrade: boolean; @@ -70,7 +65,6 @@ export type UserInterfaceAction = | ISetConnectedToDaemon | ISetDaemonAllowed | ISetChangelog - | ISetForceShowChanges | ISetIsPerformingPostUpgrade | ISetSelectLocationView | ISetIsMacOs13OrNewer; @@ -132,13 +126,6 @@ function setChangelog(changelog: IChangelog): ISetChangelog { }; } -function setForceShowChanges(forceShowChanges: boolean): ISetForceShowChanges { - return { - type: 'SET_FORCE_SHOW_CHANGES', - forceShowChanges, - }; -} - function setIsPerformingPostUpgrade(isPerformingPostUpgrade: boolean): ISetIsPerformingPostUpgrade { return { type: 'SET_IS_PERFORMING_POST_UPGRADE', @@ -169,7 +156,6 @@ export default { setConnectedToDaemon, setDaemonAllowed, setChangelog, - setForceShowChanges, setIsPerformingPostUpgrade, setSelectLocationView, setIsMacOs13OrNewer, diff --git a/desktop/packages/mullvad-vpn/src/renderer/redux/userinterface/reducers.ts b/desktop/packages/mullvad-vpn/src/renderer/redux/userinterface/reducers.ts index 89427e9b06..46bdfc6308 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/redux/userinterface/reducers.ts +++ b/desktop/packages/mullvad-vpn/src/renderer/redux/userinterface/reducers.ts @@ -12,7 +12,6 @@ export interface IUserInterfaceReduxState { connectedToDaemon: boolean; daemonAllowed?: boolean; changelog: IChangelog; - forceShowChanges: boolean; isPerformingPostUpgrade: boolean; selectLocationView: LocationType; isMacOs13OrNewer: boolean; @@ -26,7 +25,6 @@ const initialState: IUserInterfaceReduxState = { connectedToDaemon: false, daemonAllowed: undefined, changelog: [], - forceShowChanges: false, isPerformingPostUpgrade: false, selectLocationView: LocationType.exit, isMacOs13OrNewer: true, @@ -64,12 +62,6 @@ export default function ( changelog: action.changelog, }; - case 'SET_FORCE_SHOW_CHANGES': - return { - ...state, - forceShowChanges: action.forceShowChanges, - }; - case 'SET_IS_PERFORMING_POST_UPGRADE': return { ...state, diff --git a/desktop/packages/mullvad-vpn/src/shared/ipc-schema.ts b/desktop/packages/mullvad-vpn/src/shared/ipc-schema.ts index 856239c0f5..3580c679f3 100644 --- a/desktop/packages/mullvad-vpn/src/shared/ipc-schema.ts +++ b/desktop/packages/mullvad-vpn/src/shared/ipc-schema.ts @@ -73,7 +73,6 @@ export interface IAppStateSnapshot { splitTunnelingApplications?: ISplitTunnelingApplication[]; macOsScrollbarVisibility?: MacOsScrollbarVisibility; changelog: IChangelog; - forceShowChanges: boolean; navigationHistory?: IHistoryObject; currentApiAccessMethod?: AccessMethodSetting; isMacOs13OrNewer: boolean; diff --git a/desktop/packages/mullvad-vpn/test/e2e/setup/main.ts b/desktop/packages/mullvad-vpn/test/e2e/setup/main.ts index d8f3ceee48..1795451046 100644 --- a/desktop/packages/mullvad-vpn/test/e2e/setup/main.ts +++ b/desktop/packages/mullvad-vpn/test/e2e/setup/main.ts @@ -171,7 +171,6 @@ class ApplicationMain { splitTunnelingApplications: [], macOsScrollbarVisibility: MacOsScrollbarVisibility.whenScrolling, changelog: [], - forceShowChanges: false, navigationHistory: undefined, scrollPositions: {}, isMacOs13OrNewer: true, |