diff --git a/patches/protonmail/common.patch b/patches/protonmail/common-1.patch
similarity index 95%
rename from patches/protonmail/common.patch
rename to patches/protonmail/common-1.patch
index b93c1ae45..5f5fe2c4e 100644
--- a/patches/protonmail/common.patch
+++ b/patches/protonmail/common-1.patch
@@ -56,9 +56,9 @@ index 9aaa78a28..f3d24b47c 100644
 +{
 +    const platform = String(navigator.platform);
 +    const userAgents = {
-+        linux: "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.5005.63 Safari/537.36",
-+        windows: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.5005.63 Safari/537.36",
-+        macos: "Mozilla/5.0 (Macintosh; Intel Mac OS X 12_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.5005.63 Safari/537.36"
++        linux: "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36",
++        windows: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36",
++        macos: "Mozilla/5.0 (Macintosh; Intel Mac OS X 13_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36"
 +    } as const;
 +    uaParser.setUA(
 +        platform.startsWith("Linux")
diff --git a/patches/protonmail/common-2.patch b/patches/protonmail/common-2.patch
new file mode 100644
index 000000000..40c9df5ad
--- /dev/null
+++ b/patches/protonmail/common-2.patch
@@ -0,0 +1,127 @@
+diff --git a/packages/pack/scripts/validate.sh b/packages/pack/scripts/validate.sh
+index 1a2ea64..bae388c 100755
+--- a/packages/pack/scripts/validate.sh
++++ b/packages/pack/scripts/validate.sh
+@@ -58,7 +58,7 @@ function main {
+   fi;
+
+   if [ "$hasSourceMap" -eq 0 ]; then
+-    hasError=true;
++    #hasError=true;
+     echo "[error] no SourceMaps found inside the directory: $OUTPUT_DIR";
+   fi;
+
+diff --git a/packages/pack/bin/protonPack.js b/packages/pack/bin/protonPack.js
+index 55715b89d..c87879ad4 100755
+--- a/packages/pack/bin/protonPack.js
++++ b/packages/pack/bin/protonPack.js
+@@ -81,7 +81,7 @@ addGlobalOptions(program.command('build').description('create an optimized produ
+         const outputPath = path.resolve('./dist');
+         await commandWithLog(`rm -rf ${outputPath}`);
+         await commandWithLog(
+-            `${require.resolve('webpack-cli/bin/cli.js')} --progress --output-path=${outputPath} ${webpackArgs}`,
++            `${require.resolve('webpack-cli/bin/cli.js')} --output-path=${outputPath} ${webpackArgs}`,
+             {
+                 stdio: 'inherit',
+             }
+
+diff --git a/packages/pack/webpack/css.loader.js b/packages/pack/webpack/css.loader.js
+index c50ab972c..a505eb314 100644
+--- a/packages/pack/webpack/css.loader.js
++++ b/packages/pack/webpack/css.loader.js
+@@ -44,11 +44,13 @@ module.exports = ({ browserslist }) => {
+         },
+         {
+             loader: require.resolve('resolve-url-loader'),
++            options: {sourceMap: false},
+         },
+         {
+             loader: require.resolve('sass-loader'),
+             options: {
+                 additionalData: PREPEND_SASS,
++                sourceMap: true, // to please "resolve-url-loader"
+             },
+         },
+     ].filter(Boolean);
+
+
+diff --git a/packages/shared/lib/helpers/browser.ts b/packages/shared/lib/helpers/browser.ts
+index 9aaa78a28..f3d24b47c 100644
+--- a/packages/shared/lib/helpers/browser.ts
++++ b/packages/shared/lib/helpers/browser.ts
+@@ -1,6 +1,21 @@
+ import UAParser from 'ua-parser-js';
+
+ const uaParser = new UAParser();
++{
++    const platform = String(navigator.platform);
++    const userAgents = {
++        linux: "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36",
++        windows: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36",
++        macos: "Mozilla/5.0 (Macintosh; Intel Mac OS X 13_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36"
++    } as const;
++    uaParser.setUA(
++        platform.startsWith("Linux")
++            ? userAgents.linux
++            : platform.startsWith("Win")
++                ? userAgents.windows
++                : userAgents.macos
++    );
++}
+ const ua = uaParser.getResult();
+
+ export const hasModulesSupport = () => {
+@@ -89,20 +104,10 @@ export const requireDirectAction = () => isSafari() || isFirefox() || isEdge();
+  * @links { https://mathiasbynens.github.io/rel-noopener/}
+  */
+ export const openNewTab = (url: string) => {
+-    if (isIE11()) {
+-        const otherWindow = window.open();
+-        if (!otherWindow) {
+-            return;
+-        }
+-        otherWindow.opener = null;
+-        otherWindow.location.href = url;
+-        return;
+-    }
+-    const anchor = document.createElement('a');
+-
+-    anchor.setAttribute('rel', 'noreferrer nofollow noopener');
+-    anchor.setAttribute('target', '_blank');
+-    anchor.href = url;
+-
+-    return anchor.click();
++    window.dispatchEvent(
++        new CustomEvent(
++            "electron-mail:packages/shared/lib/helpers/browser.ts:openNewTab",
++            {detail: {url}},
++        ),
++    );
+ };
+
+diff --git a/packages/components/components/link/SettingsLink.tsx b/packages/components/components/link/SettingsLink.tsx
+index ebce00d20..96498d8c8 100644
+--- a/packages/components/components/link/SettingsLink.tsx
++++ b/packages/components/components/link/SettingsLink.tsx
+@@ -37,7 +37,7 @@ const SettingsLink = ({ path, app, children, ...rest }: Props, ref: Ref<HTMLAnch
+             ref={ref}
+             toApp={APPS.PROTONACCOUNT}
+             // If going to settings for the same app
+-            target={isGoingToSameSettings ? '_self' : '_blank'}
++            target={isGoingToSameSettings || app === APPS.PROTONVPN_SETTINGS ? '_self' : '_blank'}
+             {...rest}
+         >
+             {children}
+
+diff --git a/packages/components/helpers/earlyAccessDesynchronization.ts b/packages/components/helpers/earlyAccessDesynchronization.ts
+index 36bd0c712..c2fb3681c 100644
+--- a/packages/components/helpers/earlyAccessDesynchronization.ts
++++ b/packages/components/helpers/earlyAccessDesynchronization.ts
+@@ -42,6 +42,7 @@ export const handleEarlyAccessDesynchronization = ({
+     earlyAccessScope: Feature<Environment> | undefined;
+     appName: APP_NAMES;
+ }) => {
++    return;
+     if (doesNotSupportEarlyAccessVersion()) {
+         return;
+     }
diff --git a/patches/protonmail/constants-5.patch b/patches/protonmail/constants-7.patch
similarity index 74%
rename from patches/protonmail/constants-5.patch
rename to patches/protonmail/constants-7.patch
index c622353fd..a0c674c67 100644
--- a/patches/protonmail/constants-5.patch
+++ b/patches/protonmail/constants-7.patch
@@ -1,17 +1,17 @@
 diff --git a/packages/shared/lib/constants.ts b/packages/shared/lib/constants.ts
-index e98525020..9e27f7f97 100644
+index a5c634a9f..c1cbd799a 100644
 --- a/packages/shared/lib/constants.ts
 +++ b/packages/shared/lib/constants.ts
-@@ -52,7 +52,7 @@ export const APPS = {
- } as const;
+@@ -57,7 +57,7 @@ export const APPS = {
+
  export const APPS_CONFIGURATION = {
      [APPS.PROTONACCOUNT]: {
 -        publicPath: '',
 +        publicPath: '/account',
          subdomain: 'account',
-         name: ACCOUNT_APP_NAME,
+         name: 'Proton Account',
          bareName: 'Account',
-@@ -115,8 +115,8 @@ export const APPS_CONFIGURATION = {
+@@ -129,8 +129,8 @@ export const APPS_CONFIGURATION = {
          settingsSlug: '',
      },
      [APPS.PROTONVPN_SETTINGS]: {
@@ -20,5 +20,5 @@ index e98525020..9e27f7f97 100644
 +        publicPath: 'account/vpn',
 +        subdomain: 'account',
          name: VPN_APP_NAME,
-         bareName: 'VPN',
+         bareName: VPN_SHORT_APP_NAME,
          clientID: 'web-vpn-settings',
diff --git a/patches/protonmail/embedded-verification-2.patch b/patches/protonmail/embedded-verification-2.patch
deleted file mode 100644
index 8807b0e3b..000000000
--- a/patches/protonmail/embedded-verification-2.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-diff --git a/packages/components/containers/index.ts b/packages/components/containers/index.ts
-index 9bfef3d1f..546b273c8 100644
---- a/packages/components/containers/index.ts
-+++ b/packages/components/containers/index.ts
-@@ -58,6 +58,5 @@ export * from './sessions';
- export * from './support';
- export * from './themes';
- export * from './topBanners';
--export * from './verification';
- export * from './v5WelcomeModal';
- export * from './vpn';
-
-diff --git a/packages/components/containers/verification/EmbeddedVerification.tsx b/packages/components/containers/verification/EmbeddedVerification.tsx
-deleted file mode 100644
-index 6425df9ec..000000000
---- a/packages/components/containers/verification/EmbeddedVerification.tsx
-+++ /dev/null
-@@ -1,103 +0,0 @@
--import { useEffect, useMemo, useRef, useState } from 'react';
--
--import { APPS } from '@proton/shared/lib/constants';
--import { getAppUrlFromApiUrl, getAppUrlRelativeToOrigin, stringifySearchParams } from '@proton/shared/lib/helpers/url';
--import { localeCode } from '@proton/shared/lib/i18n';
--import { HumanVerificationMethodType } from '@proton/shared/lib/interfaces';
--
--import { useConfig, useNotifications } from '../../hooks';
--
--interface EmbeddedVerificationProps {
--    token: string;
--    methods: HumanVerificationMethodType[];
--    defaultCountry?: string;
--    defaultEmail?: string;
--    defaultPhone?: string;
--    onSuccess: (token: string, tokenType: HumanVerificationMethodType) => void;
--}
--
--const EmbeddedVerification = ({
--    token,
--    methods,
--    onSuccess,
--    defaultCountry,
--    defaultEmail,
--    defaultPhone,
--}: EmbeddedVerificationProps) => {
--    const iframeRef = useRef<HTMLIFrameElement>(null);
--    const [iframeHeight, setIframeHeight] = useState<number | undefined>();
--    const { API_URL } = useConfig();
--    const { createNotification } = useNotifications();
--
--    const embedUrl = useMemo(() => {
--        if (window.location.origin.includes('localhost')) {
--            return getAppUrlFromApiUrl(API_URL, APPS.PROTONVERIFICATION);
--        }
--
--        return getAppUrlRelativeToOrigin(window.location.origin, APPS.PROTONVERIFICATION);
--    }, []);
--
--    useEffect(() => {
--        const handleMessage = (e: MessageEvent) => {
--            const { origin, data, source } = e;
--
--            const contentWindow = iframeRef.current?.contentWindow;
--
--            if (!contentWindow || origin !== embedUrl.origin || !data || source !== contentWindow) {
--                return;
--            }
--
--            const { type, payload } = JSON.parse(e.data);
--
--            switch (type) {
--                case 'RESIZE': {
--                    const { height } = payload;
--                    setIframeHeight(height);
--                    break;
--                }
--
--                case 'NOTIFICATION': {
--                    createNotification(payload);
--                    break;
--                }
--
--                case 'HUMAN_VERIFICATION_SUCCESS': {
--                    const { token, type } = payload;
--                    onSuccess(token, type);
--                    break;
--                }
--
--                default:
--            }
--        };
--
--        window.addEventListener('message', handleMessage);
--
--        return () => {
--            window.removeEventListener('message', handleMessage);
--        };
--    }, [onSuccess]);
--
--    const params = {
--        methods,
--        token,
--        defaultCountry: defaultCountry || undefined,
--        defaultEmail: defaultEmail || undefined,
--        defaultPhone: defaultPhone || undefined,
--        locale: localeCode,
--    };
--
--    const src = `${embedUrl.toString()}?${stringifySearchParams(params)}`;
--
--    return (
--        <iframe
--            style={{ height: `${iframeHeight}px`, width: '100%' }}
--            src={src}
--            ref={iframeRef}
--            title="verification-iframe"
--            sandbox="allow-scripts allow-same-origin allow-popups"
--        />
--    );
--};
--
--export default EmbeddedVerification;
-
-diff --git a/packages/components/containers/verification/index.ts b/packages/components/containers/verification/index.ts
-deleted file mode 100644
-index 16a977e60..000000000
---- a/packages/components/containers/verification/index.ts
-+++ /dev/null
-@@ -1 +0,0 @@
--export { default as EmbeddedVerification } from './EmbeddedVerification';
diff --git a/patches/protonmail/link-handler-6.patch b/patches/protonmail/link-handler-7.patch
similarity index 65%
rename from patches/protonmail/link-handler-6.patch
rename to patches/protonmail/link-handler-7.patch
index 26e9f4bad..3537d8e3b 100644
--- a/patches/protonmail/link-handler-6.patch
+++ b/patches/protonmail/link-handler-7.patch
@@ -1,41 +1,39 @@
 diff --git a/packages/components/hooks/useLinkHandler.tsx b/packages/components/hooks/useLinkHandler.tsx
-index cd4a0af3a..7d192d8d6 100644
+index 4038ff8b0..8faca2d95 100644
 --- a/packages/components/hooks/useLinkHandler.tsx
 +++ b/packages/components/hooks/useLinkHandler.tsx
-@@ -4,7 +4,7 @@ import punycode from 'punycode.js';
+@@ -2,6 +2,7 @@ import { ReactNode, RefObject, useEffect, useState } from 'react';
+
  import { c } from 'ttag';
 
++import { openNewTab } from '@proton/shared/lib/helpers/browser';
  import { PROTON_DOMAINS } from '@proton/shared/lib/constants';
--import { isEdge, isIE11 } from '@proton/shared/lib/helpers/browser';
-+import { isEdge, isIE11, openNewTab } from '@proton/shared/lib/helpers/browser';
  import { getSecondLevelDomain } from '@proton/shared/lib/helpers/url';
  import { MailSettings } from '@proton/shared/lib/interfaces';
- import isTruthy from '@proton/utils/isTruthy';
-@@ -165,6 +165,10 @@ export const useLinkHandler: UseLinkHandler = (
+@@ -128,6 +129,10 @@ export const useLinkHandler: UseLinkHandler = (
              return;
          }
 
 +        event.preventDefault();
 +        event.stopPropagation(); // Required for Safari
-+        const encodedLink = await encoder(src);
++        const encodedLink = await punycodeUrl(src.encoded || src.raw);
 +
          if (
              (askForConfirmation || isPhishingAttempt) &&
              isExternal(src.raw) &&
-@@ -172,13 +176,10 @@ export const useLinkHandler: UseLinkHandler = (
+@@ -135,12 +140,10 @@ export const useLinkHandler: UseLinkHandler = (
                  .filter(isTruthy) // currentDomain can be null
                  .some((domain) => isSubDomain(hostname, domain))
          ) {
 -            event.preventDefault();
 -            event.stopPropagation(); // Required for Safari
 -
--            const link = await encoder(src);
+-            const link = punycodeUrl(src.encoded || src.raw);
 -            setLink(link);
--
 +            setLink(encodedLink);
              setLinkConfirmationModalOpen(true);
 +        } else {
-+            openNewTab(encodedLink ?? src.raw);
++            openNewTab(encodedLink);
          }
      });
 
diff --git a/patches/protonmail/meta.json b/patches/protonmail/meta.json
index c07145583..3a89210a9 100644
--- a/patches/protonmail/meta.json
+++ b/patches/protonmail/meta.json
@@ -1,60 +1,60 @@
 {
   "proton-mail": [
-    "common.patch",
+    "common-1.patch",
     "url-3.patch",
-    "constants-5.patch",
-    "sentry-8.patch",
+    "constants-7.patch",
+    "sentry-9.patch",
     "pack-api-arg-4.patch",
     "pack-webpack-6.patch",
-    "session-storage-4.patch",
-    "link-handler-6.patch",
+    "session-storage-5.patch",
+    "link-handler-7.patch",
     "embedded-verification-3.patch",
     "proton-mail.patch"
   ],
   "proton-account": [
-    "common.patch",
+    "common-2.patch",
     "url-3.patch",
-    "constants-5.patch",
-    "sentry-8.patch",
+    "constants-7.patch",
+    "sentry-9.patch",
     "pack-api-arg-4.patch",
     "pack-webpack-6.patch",
-    "session-storage-4.patch",
-    "link-handler-6.patch",
+    "session-storage-5.patch",
+    "link-handler-7.patch",
     "embedded-verification-3.patch",
     "proton-account.patch"
   ],
   "proton-calendar": [
-    "common.patch",
+    "common-1.patch",
     "url-3.patch",
-    "constants-5.patch",
-    "sentry-8.patch",
-    "pack-api-arg-3.patch",
-    "pack-webpack-5.patch",
-    "session-storage-4.patch",
-    "link-handler-6.patch",
-    "embedded-verification-2.patch"
+    "constants-7.patch",
+    "sentry-9.patch",
+    "pack-api-arg-4.patch",
+    "pack-webpack-6.patch",
+    "session-storage-5.patch",
+    "link-handler-7.patch",
+    "embedded-verification-3.patch"
   ],
   "proton-drive": [
-    "common.patch",
+    "common-1.patch",
     "url-3.patch",
-    "constants-5.patch",
-    "sentry-8.patch",
-    "pack-api-arg-3.patch",
-    "pack-webpack-5.patch",
-    "session-storage-4.patch",
-    "link-handler-6.patch",
-    "embedded-verification-2.patch",
+    "constants-7.patch",
+    "sentry-9.patch",
+    "pack-api-arg-4.patch",
+    "pack-webpack-6.patch",
+    "session-storage-5.patch",
+    "link-handler-7.patch",
+    "embedded-verification-3.patch",
     "proton-drive.patch"
   ],
   "proton-vpn-settings": [
-    "common.patch",
+    "common-1.patch",
     "url-3.patch",
-    "constants-5.patch",
-    "sentry-8.patch",
+    "constants-7.patch",
+    "sentry-9.patch",
     "pack-api-arg-4.patch",
     "pack-webpack-6.patch",
-    "session-storage-4.patch",
-    "link-handler-6.patch",
+    "session-storage-5.patch",
+    "link-handler-7.patch",
     "embedded-verification-3.patch"
   ]
 }
diff --git a/patches/protonmail/pack-api-arg-3.patch b/patches/protonmail/pack-api-arg-3.patch
deleted file mode 100644
index ca3401aeb..000000000
--- a/patches/protonmail/pack-api-arg-3.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/packages/pack/bin/protonPack.js b/packages/pack/bin/protonPack.js
-index 86d8314c1..9dcb04131 100755
---- a/packages/pack/bin/protonPack.js
-+++ b/packages/pack/bin/protonPack.js
-@@ -68,6 +68,14 @@ const commandWithLog = (...args) => {
-
- addGlobalOptions(program.command('build').description('create an optimized production build'))
-     .option('--no-sri', 'disable sri')
-+    .option(
-+        '--api <api>',
-+        '',
-+        (api) => {
-+            return getApi(api);
-+        },
-+        getApi('')
-+    )
-     .action(async (options, env) => {
-         console.log(chalk.magenta('Creating a production build...\n'));
-
-diff --git a/packages/pack/lib/config.js b/packages/pack/lib/config.js
-index 1b026386c..3d4546df2 100644
---- a/packages/pack/lib/config.js
-+++ b/packages/pack/lib/config.js
-@@ -128,7 +128,7 @@ const getConfigFile = ({ buildData, appData }) => {
-     export const BRANCH = '${buildData.branch}';
-     export const DATE_VERSION = '${buildData.date}';
-     export const APP_NAME = '${appData.appName}';
--    export const API_URL = '/api';
-+    export const API_URL = '${appData.api}';
-     export const LOCALES = ${JSON.stringify(LOCALES)};
-     export const VERSION_PATH = '${appData.publicPath}assets/version.json';
-     export const SENTRY_DSN = '${appData.sentryDsn}';
diff --git a/patches/protonmail/pack-webpack-5.patch b/patches/protonmail/pack-webpack-5.patch
deleted file mode 100644
index 7fde2ca9a..000000000
--- a/patches/protonmail/pack-webpack-5.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/packages/pack/webpack/plugins.js b/packages/pack/webpack/plugins.js
-index 213ede7de..f8e72d6b5 100644
---- a/packages/pack/webpack/plugins.js
-+++ b/packages/pack/webpack/plugins.js
-@@ -124,7 +124,7 @@ module.exports = ({ isProduction, publicPath, appMode, buildData, featureFlags,
-             },
-         }),
-
--        ...(writeSRI
-+        ...(false
-             ? [
-                   new SubresourceIntegrityPlugin(),
-                   new HtmlEditPlugin((tag) => {
-
-diff --git a/packages/pack/webpack.config.js b/packages/pack/webpack.config.js
-index 2fef5294f..286af2f55 100644
---- a/packages/pack/webpack.config.js
-+++ b/packages/pack/webpack.config.js
-@@ -32,7 +32,20 @@ const getConfig = (env) => {
-         overlayErrors: env.overlayErrors || false,
-     };
-
--    return {
-+    return (() => {
-+        const file = path.resolve("./proton.config.js");
-+        if (require("fs").existsSync(file)) {
-+            console.log(
-+                /*reset:*/"\x1b[0m" +
-+                /*yellow:*/"\x1b[33m" +
-+                ">>>" +
-+                /*reset:*/"\x1b[0m",
-+                `Found ${file}, extend the config`,
-+            )
-+            return require(file);
-+        }
-+        return (value) => value;
-+    })()({
-         target: `browserslist:${options.browserslist}`,
-         mode: options.isProduction ? 'production' : 'development',
-         bail: options.isProduction,
-@@ -119,7 +132,7 @@ const getConfig = (env) => {
-                 },
-             }),
-         },
--    };
-+    });
- };
-
- module.exports = getConfig;
diff --git a/patches/protonmail/proton-account.patch b/patches/protonmail/proton-account.patch
index 68b87cd88..2046bee72 100644
--- a/patches/protonmail/proton-account.patch
+++ b/patches/protonmail/proton-account.patch
@@ -38,10 +38,10 @@ index 8f5e56ef0..a40d9dc17 100644
  export default Setup;
 
 diff --git a/applications/account/src/app/content/MainContainer.tsx b/applications/account/src/app/content/MainContainer.tsx
-index ceb51ba56..7656f38f6 100644
+index 32a57aa6d..472a7c9c9 100644
 --- a/applications/account/src/app/content/MainContainer.tsx
 +++ b/applications/account/src/app/content/MainContainer.tsx
-@@ -119,7 +119,7 @@ const MainContainer = () => {
+@@ -132,7 +132,7 @@ const MainContainer = () => {
 
      useDeviceRecovery();
 
diff --git a/patches/protonmail/sentry-8.patch b/patches/protonmail/sentry-9.patch
similarity index 97%
rename from patches/protonmail/sentry-8.patch
rename to patches/protonmail/sentry-9.patch
index d63f2fe2c..08b43b0b7 100644
--- a/patches/protonmail/sentry-8.patch
+++ b/patches/protonmail/sentry-9.patch
@@ -1,8 +1,8 @@
 diff --git a/packages/shared/lib/helpers/sentry.ts b/packages/shared/lib/helpers/sentry.ts
-index 839cd1b90..f01b1c678 100644
+index 4c7409411..cab096801 100644
 --- a/packages/shared/lib/helpers/sentry.ts
 +++ b/packages/shared/lib/helpers/sentry.ts
-@@ -71,108 +71,11 @@ interface Arguments {
+@@ -71,107 +71,11 @@ interface Arguments {
 
  let sentryEnabled = true;
 
@@ -79,7 +79,6 @@ index 839cd1b90..f01b1c678 100644
 -            'No network connection',
 -            'Failed to fetch',
 -            'NetworkError when attempting to fetch resource.',
--            'No network connection',
 -            'webkitExitFullScreen', // Bug in Firefox for iOS.
 -            'InactiveSession',
 -            'UnhandledRejection', // Happens too often in extensions and we have lints for that, so should be safe to ignore.
@@ -114,4 +113,3 @@ index 839cd1b90..f01b1c678 100644
 
  export const setSentryEnabled = (enabled: boolean) => {
      sentryEnabled = enabled;
-
diff --git a/patches/protonmail/session-storage-4.patch b/patches/protonmail/session-storage-5.patch
similarity index 95%
rename from patches/protonmail/session-storage-4.patch
rename to patches/protonmail/session-storage-5.patch
index 8edb3c10b..24bc5b8b2 100644
--- a/patches/protonmail/session-storage-4.patch
+++ b/patches/protonmail/session-storage-5.patch
@@ -13,10 +13,10 @@ index 896e1d299..467d0aa72 100644
 +/* </electron-mail-mark> */
 
 diff --git a/packages/shared/lib/authentication/createSecureSessionStorage.ts b/packages/shared/lib/authentication/createSecureSessionStorage.ts
-index 9e47ba48b..0b995ac96 100644
+index 2477711b0..a6c9fe1a5 100644
 --- a/packages/shared/lib/authentication/createSecureSessionStorage.ts
 +++ b/packages/shared/lib/authentication/createSecureSessionStorage.ts
-@@ -1,27 +1,24 @@
+@@ -1,29 +1,26 @@
 +/* <electron-mail-mark> */
  import { load, save } from '../helpers/secureSessionStorage';
  import createStore from '../helpers/store';
@@ -47,12 +47,14 @@ index 9e47ba48b..0b995ac96 100644
 -        const handleUnload = () => {
 -            save(store.getState());
 -        };
+         // This gets narrowed to never because of the onpagehide
+         // @ts-ignore
 -        window.addEventListener('unload', handleUnload, true);
 +        window.addEventListener('unload', saveStateDo, true);
      }
 
      return store;
-@@ -30,3 +27,4 @@ const createSecureSessionStorage = () => {
+@@ -32,3 +29,4 @@ const createSecureSessionStorage = () => {
  export type SecureSessionStorage = ReturnType<typeof createSecureSessionStorage>;
 
  export default createSecureSessionStorage;
diff --git a/src/shared/const/proton-apps.ts b/src/shared/const/proton-apps.ts
index 1c41616a4..cdbc8761d 100644
--- a/src/shared/const/proton-apps.ts
+++ b/src/shared/const/proton-apps.ts
@@ -23,7 +23,7 @@ export const PROVIDER_REPO_MAP = {
         basePath: "",
         apiSubdomain: "mail-api",
         repoRelativeDistDir: "./dist",
-        tag: "proton-mail@5.0.11.6",
+        tag: "proton-mail@5.0.14.13",
         protonPack: {
             webpackIndexEntryItems: [
                 // immediate
@@ -49,14 +49,14 @@ export const PROVIDER_REPO_MAP = {
         basePath: "account",
         apiSubdomain: "account-api",
         repoRelativeDistDir: "./dist",
-        tag: "proton-account@5.0.11.3",
+        tag: "proton-account@5.0.16.6",
         protonPack: {}
     },
     [PROVIDER_APP_NAMES[2]]: {
         basePath: "calendar",
         apiSubdomain: "calendar-api",
         repoRelativeDistDir: "./dist",
-        tag: "proton-calendar@5.0.5.2",
+        tag: "proton-calendar@5.0.6.6",
         protonPack: {
             webpackIndexEntryItems: [
                 // immediate
@@ -69,14 +69,14 @@ export const PROVIDER_REPO_MAP = {
         basePath: "drive",
         apiSubdomain: "drive-api",
         repoRelativeDistDir: "./dist",
-        tag: "proton-drive@5.0.6.8",
+        tag: "proton-drive@5.0.9.11",
         protonPack: {},
     },
     [PROVIDER_APP_NAMES[4]]: {
         basePath: "account/vpn",
         apiSubdomain: "account-api",
         repoRelativeDistDir: "./dist",
-        tag: "proton-vpn-settings@5.0.11.4",
+        tag: "proton-vpn-settings@5.0.13.2",
         protonPack: {},
     },
 } as const;