Merge branch 'develop' into 2444-fix-explorer-link-for-ethereum-network

bloomwalletio · May 14, 2024 · 050851a · 050851a
2 parents 0dcdc2c + 937b8ea
commit 050851a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/packages/desktop/lib/electron/processes/main.process.ts b/packages/desktop/lib/electron/processes/main.process.ts
@@ -257,12 +257,8 @@ export function createMainWindow(): BrowserWindow {
     /**
      * Handle permissions requests
      */
-    session.defaultSession.setPermissionRequestHandler((_webContents, permission, cb, details) => {
-        if (permission === 'openExternal' && details && details.externalURL) {
-            return cb(true)
-        }
-
-        const permissionAllowlist = ['clipboard-read', 'notifications', 'fullscreen']
+    session.defaultSession.setPermissionRequestHandler((_webContents, permission, cb) => {
+        const permissionAllowlist = ['clipboard-read', 'notifications', 'fullscreen', 'openExternal']
 
         return cb(permissionAllowlist.indexOf(permission) > -1)
     })

diff --git a/packages/desktop/package.json b/packages/desktop/package.json
@@ -52,7 +52,7 @@
         "copy-webpack-plugin": "12.0.2",
         "cross-env": "7.0.3",
         "css-loader": "7.1.1",
-        "electron": "29.2.0",
+        "electron": "30.0.3",
         "electron-builder": "24.13.3",
         "@electron/notarize": "2.3.0",
         "esbuild": "0.20.2",

diff --git a/yarn.lock b/yarn.lock
@@ -5103,10 +5103,10 @@ [email protected]:
     semver "^7.3.8"
     tiny-typed-emitter "^2.1.0"
 
-electron@29.2.0:
-  version "29.2.0"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-29.2.0.tgz#98e9d45dcebda124fb0bd1ff20fc509ec692101c"
-  integrity sha512-ALKrCN52RG4g9prx4DriXSPnY5WoiyRUCNp7zEVQuoiNOpHTNqMMpRidQAHzntV4hajF1LMWHVoBkwqIs1jHhg==
+electron@30.0.3:
+  version "30.0.3"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-30.0.3.tgz#7c25ddb12ba89fd117991d010f1b274b1bafcb73"
+  integrity sha512-h+suwx6e0fnv/9wi0/cmCMtG+4LrPzJZa+3DEEpxcPcP+pcWnBI70t8QspxgMNIh2wzXLMD9XVqrLkEbiBAInw==
   dependencies:
     "@electron/get" "^2.0.0"
     "@types/node" "^20.9.0"