Rename block_when_disconnected to lockdown_mode in Electron app

14 files changed, 85 insertions, 93 deletions

diff --git a/desktop/packages/mullvad-vpn/src/main/daemon-rpc.ts b/desktop/packages/mullvad-vpn/src/main/daemon-rpc.ts
index c3594b9590..8db5d1b5f2 100644
--- a/desktop/packages/mullvad-vpn/src/main/daemon-rpc.ts
+++ b/desktop/packages/mullvad-vpn/src/main/daemon-rpc.ts
@@ -297,8 +297,8 @@ export class DaemonRpc extends GrpcClient {
     await this.callBool(this.client.setEnableIpv6, enableIpv6);
   }
 
-  public async setBlockWhenDisconnected(blockWhenDisconnected: boolean): Promise<void> {
-    await this.callBool(this.client.setBlockWhenDisconnected, blockWhenDisconnected);
+  public async setLockdownMode(lockdownMode: boolean): Promise<void> {
+    await this.callBool(this.client.setLockdownMode, lockdownMode);
   }
 
   public async setBridgeState(bridgeState: BridgeState): Promise<void> {
diff --git a/desktop/packages/mullvad-vpn/src/main/default-settings.ts b/desktop/packages/mullvad-vpn/src/main/default-settings.ts
index a80afa03e1..9ba2b18e9b 100644
--- a/desktop/packages/mullvad-vpn/src/main/default-settings.ts
+++ b/desktop/packages/mullvad-vpn/src/main/default-settings.ts
@@ -34,7 +34,7 @@ export function getDefaultSettings(): ISettings {
   return {
     allowLan: false,
     autoConnect: false,
-    blockWhenDisconnected: false,
+    lockdownMode: false,
     showBetaReleases: false,
     splitTunnel: {
       enableExclusions: false,
diff --git a/desktop/packages/mullvad-vpn/src/main/index.ts b/desktop/packages/mullvad-vpn/src/main/index.ts
index 0b582c3cd6..d56247dd4d 100644
--- a/desktop/packages/mullvad-vpn/src/main/index.ts
+++ b/desktop/packages/mullvad-vpn/src/main/index.ts
@@ -695,7 +695,7 @@ class ApplicationMain
       // update the tray icon to indicate that the computer is not secure anymore
       this.userInterface?.updateTray(false, {
         state: 'disconnected',
-        lockedDown: this.settings.blockWhenDisconnected,
+        lockedDown: this.settings.lockdownMode,
       });
 
       // notify renderer process
diff --git a/desktop/packages/mullvad-vpn/src/main/settings.ts b/desktop/packages/mullvad-vpn/src/main/settings.ts
index bfe2bc140d..20c000a3dc 100644
--- a/desktop/packages/mullvad-vpn/src/main/settings.ts
+++ b/desktop/packages/mullvad-vpn/src/main/settings.ts
@@ -37,8 +37,8 @@ export default class Settings implements Readonly<ISettings> {
     IpcMainEventChannel.settings.handleSetEnableIpv6((enableIpv6) =>
       this.daemonRpc.setEnableIpv6(enableIpv6),
     );
-    IpcMainEventChannel.settings.handleSetBlockWhenDisconnected((blockWhenDisconnected) =>
-      this.daemonRpc.setBlockWhenDisconnected(blockWhenDisconnected),
+    IpcMainEventChannel.settings.handleSetLockdownMode((lockdownMode) =>
+      this.daemonRpc.setLockdownMode(lockdownMode),
     );
     IpcMainEventChannel.settings.handleSetBridgeState(async (bridgeState) => {
       await this.daemonRpc.setBridgeState(bridgeState);
@@ -158,8 +158,8 @@ export default class Settings implements Readonly<ISettings> {
   public get autoConnect() {
     return this.settingsValue.autoConnect;
   }
-  public get blockWhenDisconnected() {
-    return this.settingsValue.blockWhenDisconnected;
+  public get lockdownMode() {
+    return this.settingsValue.lockdownMode;
   }
   public get showBetaReleases() {
     return this.settingsValue.showBetaReleases;
diff --git a/desktop/packages/mullvad-vpn/src/renderer/app.tsx b/desktop/packages/mullvad-vpn/src/renderer/app.tsx
index 69ae19338d..5b7f625019 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/app.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/app.tsx
@@ -594,10 +594,10 @@ export default class AppRenderer {
     actions.settings.updateBridgeState(bridgeState);
   };
 
-  public setBlockWhenDisconnected = async (blockWhenDisconnected: boolean) => {
+  public setLockdownMode = async (lockdownMode: boolean) => {
     const actions = this.reduxActions;
-    await IpcRendererEventChannel.settings.setBlockWhenDisconnected(blockWhenDisconnected);
-    actions.settings.updateBlockWhenDisconnected(blockWhenDisconnected);
+    await IpcRendererEventChannel.settings.setLockdownMode(lockdownMode);
+    actions.settings.updateLockdownMode(lockdownMode);
   };
 
   public setOpenVpnMssfix = async (mssfix?: number) => {
@@ -956,7 +956,7 @@ export default class AppRenderer {
 
     reduxSettings.updateAllowLan(newSettings.allowLan);
     reduxSettings.updateEnableIpv6(newSettings.tunnelOptions.generic.enableIpv6);
-    reduxSettings.updateBlockWhenDisconnected(newSettings.blockWhenDisconnected);
+    reduxSettings.updateLockdownMode(newSettings.lockdownMode);
     reduxSettings.updateShowBetaReleases(newSettings.showBetaReleases);
     reduxSettings.updateOpenVpnMssfix(newSettings.tunnelOptions.openvpn.mssfix);
     reduxSettings.updateWireguardMtu(newSettings.tunnelOptions.wireguard.mtu);
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/ExpiredAccountErrorView.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/ExpiredAccountErrorView.tsx
index 28e00e4151..61db44db59 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/ExpiredAccountErrorView.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/ExpiredAccountErrorView.tsx
@@ -34,7 +34,7 @@ import { ModalAlert, ModalAlertType, ModalMessage } from './Modal';
 enum RecoveryAction {
   openBrowser,
   disconnect,
-  disableBlockedWhenDisconnected,
+  disableLockdownMode,
 }
 
 export default function ExpiredAccountErrorView() {
@@ -103,7 +103,7 @@ function ExpiredAccountErrorViewComponent() {
             </FlexColumn>
           </Footer>
 
-          <BlockWhenDisconnectedAlert />
+          <LockdownModeAlert />
         </StyledContainer>
       </StyledCustomScrollbars>
     </Layout>
@@ -183,7 +183,7 @@ function Content() {
 }
 
 function ExternalPaymentButton() {
-  const { setShowBlockWhenDisconnectedAlert } = useExpiredAccountContext();
+  const { setShowLockdownModeAlert } = useExpiredAccountContext();
   const { recoveryAction } = useRecoveryAction();
   const { openUrlWithAuth } = useAppContext();
   const isNewAccount = useIsNewAccount();
@@ -193,8 +193,8 @@ function ExternalPaymentButton() {
     : messages.gettext('Buy more credit');
 
   const [openExternalPayment, openingExternalPayment] = useExclusiveTask(async () => {
-    if (recoveryAction === RecoveryAction.disableBlockedWhenDisconnected) {
-      setShowBlockWhenDisconnectedAlert(true);
+    if (recoveryAction === RecoveryAction.disableLockdownMode) {
+      setShowLockdownModeAlert(true);
     } else {
       await openUrlWithAuth(urls.purchase);
     }
@@ -215,38 +215,37 @@ function ExternalPaymentButton() {
   );
 }
 
-function BlockWhenDisconnectedAlert() {
-  const { showBlockWhenDisconnectedAlert, setShowBlockWhenDisconnectedAlert } =
-    useExpiredAccountContext();
-  const { setBlockWhenDisconnected } = useAppContext();
-  const blockWhenDisconnected = useSelector((state) => state.settings.blockWhenDisconnected);
+function LockdownModeAlert() {
+  const { showLockdownModeAlert, setShowLockdownModeAlert } = useExpiredAccountContext();
+  const { setLockdownMode } = useAppContext();
+  const lockdownMode = useSelector((state) => state.settings.lockdownMode);
 
-  const onCloseBlockWhenDisconnectedInstructions = useCallback(() => {
-    setShowBlockWhenDisconnectedAlert(false);
-  }, [setShowBlockWhenDisconnectedAlert]);
+  const onCloseLockdownModeInstructions = useCallback(() => {
+    setShowLockdownModeAlert(false);
+  }, [setShowLockdownModeAlert]);
 
   const onChange = useCallback(
-    async (blockWhenDisconnected: boolean) => {
+    async (lockdownMode: boolean) => {
       try {
-        await setBlockWhenDisconnected(blockWhenDisconnected);
+        await setLockdownMode(lockdownMode);
       } catch (e) {
         const error = e as Error;
-        log.error('Failed to update block when disconnected', error.message);
+        log.error('Failed to update lockdown mode', error.message);
       }
     },
-    [setBlockWhenDisconnected],
+    [setLockdownMode],
   );
 
   return (
     <ModalAlert
-      isOpen={showBlockWhenDisconnectedAlert}
+      isOpen={showLockdownModeAlert}
       type={ModalAlertType.caution}
       buttons={[
-        <Button key="cancel" onClick={onCloseBlockWhenDisconnectedInstructions}>
+        <Button key="cancel" onClick={onCloseLockdownModeInstructions}>
           <Button.Text>{messages.gettext('Close')}</Button.Text>
         </Button>,
       ]}
-      close={onCloseBlockWhenDisconnectedInstructions}>
+      close={onCloseLockdownModeInstructions}>
       <ModalMessage>
         {messages.pgettext(
           'connect-view',
@@ -261,28 +260,28 @@ function BlockWhenDisconnectedAlert() {
       </ModalMessage>
       <StyledModalCellContainer>
         <Cell.Label>{messages.pgettext('vpn-settings-view', 'Lockdown mode')}</Cell.Label>
-        <Cell.Switch isOn={blockWhenDisconnected} onChange={onChange} />
+        <Cell.Switch isOn={lockdownMode} onChange={onChange} />
       </StyledModalCellContainer>
     </ModalAlert>
   );
 }
 
 type ExpiredAccountContextType = {
-  setShowBlockWhenDisconnectedAlert: (val: boolean) => void;
-  showBlockWhenDisconnectedAlert: boolean;
+  setShowLockdownModeAlert: (val: boolean) => void;
+  showLockdownModeAlert: boolean;
 };
 
 const ExpiredAccountContext = createContext<ExpiredAccountContextType | undefined>(undefined);
 
 const ExpiredAccountContextProvider = ({ children }: { children: ReactNode }) => {
-  const [showBlockWhenDisconnectedAlert, setShowBlockWhenDisconnectedAlert] = useState(false);
+  const [showLockdownModeAlert, setShowLockdownModeAlert] = useState(false);
 
   const value: ExpiredAccountContextType = useMemo(
     () => ({
-      setShowBlockWhenDisconnectedAlert,
-      showBlockWhenDisconnectedAlert,
+      setShowLockdownModeAlert,
+      showLockdownModeAlert,
     }),
-    [setShowBlockWhenDisconnectedAlert, showBlockWhenDisconnectedAlert],
+    [setShowLockdownModeAlert, showLockdownModeAlert],
   );
   return <ExpiredAccountContext.Provider value={value}>{children}</ExpiredAccountContext.Provider>;
 };
@@ -300,13 +299,13 @@ const useExpiredAccountContext = () => {
 
 const useRecoveryAction = () => {
   const isBlocked = useSelector((state) => state.connection.isBlocked);
-  const blockWhenDisconnected = useSelector((state) => state.settings.blockWhenDisconnected);
+  const lockdownMode = useSelector((state) => state.settings.lockdownMode);
 
   let recoveryAction: RecoveryAction;
 
-  if (blockWhenDisconnected && isBlocked) {
-    recoveryAction = RecoveryAction.disableBlockedWhenDisconnected;
-  } else if (!blockWhenDisconnected && isBlocked) {
+  if (lockdownMode && isBlocked) {
+    recoveryAction = RecoveryAction.disableLockdownMode;
+  } else if (!lockdownMode && isBlocked) {
     recoveryAction = RecoveryAction.disconnect;
   } else {
     recoveryAction = RecoveryAction.openBrowser;
@@ -316,7 +315,7 @@ const useRecoveryAction = () => {
 
   switch (recoveryAction) {
     case RecoveryAction.openBrowser:
-    case RecoveryAction.disableBlockedWhenDisconnected:
+    case RecoveryAction.disableLockdownMode:
       recoveryMessage = messages.pgettext(
         'connect-view',
         'Either buy credit on our website or redeem a voucher.',
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/NotificationArea.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/NotificationArea.tsx
index 64c82197eb..bf61ff8003 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/NotificationArea.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/NotificationArea.tsx
@@ -3,13 +3,13 @@ import { useCallback, useState } from 'react';
 import { messages } from '../../shared/gettext';
 import log from '../../shared/logging';
 import {
-  BlockWhenDisconnectedNotificationProvider,
   CloseToAccountExpiryNotificationProvider,
   ConnectingNotificationProvider,
   ErrorNotificationProvider,
   InAppNotificationAction,
   InAppNotificationProvider,
   InconsistentVersionNotificationProvider,
+  LockdownModeNotificationProvider,
   ReconnectingNotificationProvider,
   UnsupportedVersionNotificationProvider,
 } from '../../shared/notifications';
@@ -69,9 +69,7 @@ export default function NotificationArea(props: IProps) {
   const allowedPortRanges = useSelector((state) => state.settings.wireguardEndpointData.portRanges);
   const relaySettings = useSelector((state) => state.settings.relaySettings);
 
-  const blockWhenDisconnectedSetting = useSelector(
-    (state: IReduxState) => state.settings.blockWhenDisconnected,
-  );
+  const lockdownModeSetting = useSelector((state: IReduxState) => state.settings.lockdownMode);
   const hasExcludedApps = useSelector(
     (state: IReduxState) =>
       state.settings.splitTunneling && state.settings.splitTunnelingApplications.length > 0,
@@ -122,9 +120,9 @@ export default function NotificationArea(props: IProps) {
   const notificationProviders: InAppNotificationProvider[] = [
     new ConnectingNotificationProvider({ tunnelState }),
     new ReconnectingNotificationProvider(tunnelState),
-    new BlockWhenDisconnectedNotificationProvider({
+    new LockdownModeNotificationProvider({
       tunnelState,
-      blockWhenDisconnectedSetting,
+      lockdownModeSetting,
       hasExcludedApps,
     }),
     new AppUpgradeErrorNotificationProvider({
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/login/LoginView.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/views/login/LoginView.tsx
index 87de6e1a61..939eb82e20 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/views/login/LoginView.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/login/LoginView.tsx
@@ -552,23 +552,23 @@ function AccountDropdownItem({ label, onRemove, onSelect, value }: AccountDropdo
 }
 
 function BlockMessage() {
-  const { setBlockWhenDisconnected, disconnectTunnel } = useAppContext();
+  const { setLockdownMode, disconnectTunnel } = useAppContext();
   const tunnelState = useSelector((state) => state.connection.status);
-  const blockWhenDisconnected = tunnelState.state === 'disconnected' && tunnelState.lockedDown;
+  const lockdownMode = tunnelState.state === 'disconnected' && tunnelState.lockedDown;
 
   const unlock = useCallback(() => {
-    if (blockWhenDisconnected) {
-      void setBlockWhenDisconnected(false);
+    if (lockdownMode) {
+      void setLockdownMode(false);
     }
 
     if (tunnelState.state === 'error') {
       void disconnectTunnel();
     }
-  }, [blockWhenDisconnected, tunnelState, setBlockWhenDisconnected, disconnectTunnel]);
+  }, [lockdownMode, tunnelState, setLockdownMode, disconnectTunnel]);
 
   const lockdownModeSettingName = messages.pgettext('vpn-settings-view', 'Lockdown mode');
   const message = formatHtml(
-    blockWhenDisconnected
+    lockdownMode
       ? sprintf(
           // TRANSLATORS: This is a warning message shown when the app is blocking the users
           // TRANSLATORS: internet connection while logged out.
@@ -585,9 +585,7 @@ function BlockMessage() {
         // TRANSLATORS: internet connection while logged out.
         messages.pgettext('login-view', 'Our kill switch is currently blocking your connection.'),
   );
-  const buttonText = blockWhenDisconnected
-    ? messages.gettext('Disable')
-    : messages.gettext('Unblock');
+  const buttonText = lockdownMode ? messages.gettext('Disable') : messages.gettext('Unblock');
 
   return (
     <StyledBlockMessageContainer>
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/vpn-settings/components/lockdown-mode-setting/LockdownModeSetting.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/views/vpn-settings/components/lockdown-mode-setting/LockdownModeSetting.tsx
index 30da61d848..381e8605ea 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/views/vpn-settings/components/lockdown-mode-setting/LockdownModeSetting.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/vpn-settings/components/lockdown-mode-setting/LockdownModeSetting.tsx
@@ -11,22 +11,22 @@ import { ModalAlert, ModalAlertType, ModalMessage } from '../../../../Modal';
 import { SettingsToggleListItem } from '../../../../settings-toggle-list-item';
 
 export function LockdownModeSetting() {
-  const blockWhenDisconnected = useSelector((state) => state.settings.blockWhenDisconnected);
-  const { setBlockWhenDisconnected: setBlockWhenDisconnectedImpl } = useAppContext();
+  const lockdownMode = useSelector((state) => state.settings.lockdownMode);
+  const { setLockdownMode: setLockdownModeImpl } = useAppContext();
 
   const [confirmationDialogVisible, showConfirmationDialog, hideConfirmationDialog] =
     useBoolean(false);
 
-  const setBlockWhenDisconnected = useCallback(
-    async (blockWhenDisconnected: boolean) => {
+  const setLockdownMode = useCallback(
+    async (lockdownMode: boolean) => {
       try {
-        await setBlockWhenDisconnectedImpl(blockWhenDisconnected);
+        await setLockdownModeImpl(lockdownMode);
       } catch (e) {
         const error = e as Error;
-        log.error('Failed to update block when disconnected', error.message);
+        log.error('Failed to update lockdown mode', error.message);
       }
     },
-    [setBlockWhenDisconnectedImpl],
+    [setLockdownModeImpl],
   );
 
   const setLockDownMode = useCallback(
@@ -34,21 +34,21 @@ export function LockdownModeSetting() {
       if (newValue) {
         showConfirmationDialog();
       } else {
-        await setBlockWhenDisconnected(false);
+        await setLockdownMode(false);
       }
     },
-    [setBlockWhenDisconnected, showConfirmationDialog],
+    [setLockdownMode, showConfirmationDialog],
   );
 
   const confirmLockdownMode = useCallback(async () => {
     hideConfirmationDialog();
-    await setBlockWhenDisconnected(true);
-  }, [hideConfirmationDialog, setBlockWhenDisconnected]);
+    await setLockdownMode(true);
+  }, [hideConfirmationDialog, setLockdownMode]);
 
   return (
     <SettingsToggleListItem
       anchorId="lockdown-mode-setting"
-      checked={blockWhenDisconnected}
+      checked={lockdownMode}
       onCheckedChange={setLockDownMode}>
       <SettingsToggleListItem.Label>
         {messages.pgettext('vpn-settings-view', 'Lockdown mode')}
diff --git a/desktop/packages/mullvad-vpn/src/renderer/redux/settings/actions.ts b/desktop/packages/mullvad-vpn/src/renderer/redux/settings/actions.ts
index d2a3fb1c4a..c87b9a73a0 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/redux/settings/actions.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/redux/settings/actions.ts
@@ -43,9 +43,9 @@ export interface IUpdateEnableIpv6Action {
   enableIpv6: boolean;
 }
 
-export interface IUpdateBlockWhenDisconnectedAction {
-  type: 'UPDATE_BLOCK_WHEN_DISCONNECTED';
-  blockWhenDisconnected: boolean;
+export interface IUpdateLockdownModeAction {
+  type: 'UPDATE_LOCKDOWN_MODE';
+  lockdownMode: boolean;
 }
 
 export interface IUpdateShowBetaReleasesAction {
@@ -135,7 +135,7 @@ export type SettingsAction =
   | IUpdateWireguardEndpointData
   | IUpdateAllowLanAction
   | IUpdateEnableIpv6Action
-  | IUpdateBlockWhenDisconnectedAction
+  | IUpdateLockdownModeAction
   | IUpdateShowBetaReleasesAction
   | IUpdateBridgeSettingsAction
   | IUpdateBridgeStateAction
@@ -199,12 +199,10 @@ function updateEnableIpv6(enableIpv6: boolean): IUpdateEnableIpv6Action {
   };
 }
 
-function updateBlockWhenDisconnected(
-  blockWhenDisconnected: boolean,
-): IUpdateBlockWhenDisconnectedAction {
+function updateLockdownMode(lockdownMode: boolean): IUpdateLockdownModeAction {
   return {
-    type: 'UPDATE_BLOCK_WHEN_DISCONNECTED',
-    blockWhenDisconnected,
+    type: 'UPDATE_LOCKDOWN_MODE',
+    lockdownMode,
   };
 }
 
@@ -333,7 +331,7 @@ export default {
   updateWireguardEndpointData,
   updateAllowLan,
   updateEnableIpv6,
-  updateBlockWhenDisconnected,
+  updateLockdownMode,
   updateShowBetaReleases,
   updateBridgeSettings,
   updateBridgeState,
diff --git a/desktop/packages/mullvad-vpn/src/renderer/redux/settings/reducers.ts b/desktop/packages/mullvad-vpn/src/renderer/redux/settings/reducers.ts
index 9ac8bb3a61..285a0500e2 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/redux/settings/reducers.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/redux/settings/reducers.ts
@@ -105,7 +105,7 @@ export interface ISettingsReduxState {
   enableIpv6: boolean;
   bridgeSettings: BridgeSettingsRedux;
   bridgeState: BridgeState;
-  blockWhenDisconnected: boolean;
+  lockdownMode: boolean;
   showBetaReleases: boolean;
   openVpn: {
     mssfix?: number;
@@ -166,7 +166,7 @@ const initialState: ISettingsReduxState = {
     custom: undefined,
   },
   bridgeState: 'auto',
-  blockWhenDisconnected: false,
+  lockdownMode: false,
   showBetaReleases: false,
   openVpn: {},
   wireguard: {},
@@ -242,10 +242,10 @@ export default function (
         enableIpv6: action.enableIpv6,
       };
 
-    case 'UPDATE_BLOCK_WHEN_DISCONNECTED':
+    case 'UPDATE_LOCKDOWN_MODE':
       return {
         ...state,
-        blockWhenDisconnected: action.blockWhenDisconnected,
+        lockdownMode: action.lockdownMode,
       };
 
     case 'UPDATE_SHOW_BETA_NOTIFICATIONS':
diff --git a/desktop/packages/mullvad-vpn/src/shared/daemon-rpc-types.ts b/desktop/packages/mullvad-vpn/src/shared/daemon-rpc-types.ts
index 026df6d189..f1c3dd8ac4 100644
--- a/desktop/packages/mullvad-vpn/src/shared/daemon-rpc-types.ts
+++ b/desktop/packages/mullvad-vpn/src/shared/daemon-rpc-types.ts
@@ -492,7 +492,7 @@ export type AccessMethodExistsError = { type: 'name already exists' };
 export interface ISettings {
   allowLan: boolean;
   autoConnect: boolean;
-  blockWhenDisconnected: boolean;
+  lockdownMode: boolean;
   showBetaReleases: boolean;
   relaySettings: RelaySettings;
   tunnelOptions: ITunnelOptions;
diff --git a/desktop/packages/mullvad-vpn/src/shared/ipc-schema.ts b/desktop/packages/mullvad-vpn/src/shared/ipc-schema.ts
index a685a2974e..dae1de0da3 100644
--- a/desktop/packages/mullvad-vpn/src/shared/ipc-schema.ts
+++ b/desktop/packages/mullvad-vpn/src/shared/ipc-schema.ts
@@ -195,7 +195,7 @@ export const ipcSchema = {
     setAllowLan: invoke<boolean, void>(),
     setShowBetaReleases: invoke<boolean, void>(),
     setEnableIpv6: invoke<boolean, void>(),
-    setBlockWhenDisconnected: invoke<boolean, void>(),
+    setLockdownMode: invoke<boolean, void>(),
     setBridgeState: invoke<BridgeState, void>(),
     setOpenVpnMssfix: invoke<number | undefined, void>(),
     setWireguardMtu: invoke<number | undefined, void>(),
diff --git a/desktop/packages/mullvad-vpn/src/shared/notifications/block-when-disconnected.ts b/desktop/packages/mullvad-vpn/src/shared/notifications/block-when-disconnected.ts
index 6b8022c381..9950aa3b8b 100644
--- a/desktop/packages/mullvad-vpn/src/shared/notifications/block-when-disconnected.ts
+++ b/desktop/packages/mullvad-vpn/src/shared/notifications/block-when-disconnected.ts
@@ -12,21 +12,20 @@ import {
   SystemNotificationSeverityType,
 } from './notification';
 
-interface BlockWhenDisconnectedNotificationContext {
+interface LockdownModeNotificationContext {
   tunnelState: TunnelState;
-  blockWhenDisconnectedSetting: boolean;
+  lockdownModeSetting: boolean;
   hasExcludedApps: boolean;
 }
 
-export class BlockWhenDisconnectedNotificationProvider
+export class LockdownModeNotificationProvider
   implements InAppNotificationProvider, SystemNotificationProvider
 {
-  public constructor(private context: BlockWhenDisconnectedNotificationContext) {}
+  public constructor(private context: LockdownModeNotificationContext) {}
 
   public mayDisplay() {
     return (
-      (this.context.tunnelState.state === 'disconnecting' &&
-        this.context.blockWhenDisconnectedSetting) ||
+      (this.context.tunnelState.state === 'disconnecting' && this.context.lockdownModeSetting) ||
       (this.context.tunnelState.state === 'disconnected' && this.context.tunnelState.lockedDown)
     );
   }