From f5ffb1e8a2d4d84d902e696b4d6f109a5f72a8d5 Mon Sep 17 00:00:00 2001
From: Daniel Sanchez <daniel.sanchez@gnosis.pm>
Date: Fri, 16 Apr 2021 13:24:32 +0200
Subject: [PATCH] Setup to test electron v11 in Windows

---
 .github/workflows/release-mainnet-desktop.yml | 2 +-
 package.json                                  | 5 ++---
 public/electron.js                            | 2 +-
 yarn.lock                                     | 8 ++++----
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/release-mainnet-desktop.yml b/.github/workflows/release-mainnet-desktop.yml
index c8556827..c35c1ddb 100644
--- a/.github/workflows/release-mainnet-desktop.yml
+++ b/.github/workflows/release-mainnet-desktop.yml
@@ -52,7 +52,7 @@ jobs:
       - name: Install Node.js, NPM and Yarn
         uses: actions/setup-node@v2
         with:
-          node-version: 14
+          node-version: 12
 
       - name: Run yarn install
         run: yarn install --frozen-lockfile --network-concurrency 1
diff --git a/package.json b/package.json
index 7d0181a7..4df69f54 100644
--- a/package.json
+++ b/package.json
@@ -143,8 +143,7 @@
   },
   "resolutions": {
     "@babel/core": "^7.12.0",
-    "sass-loader": "^9.0.0",
-    "electron": "^11.0.1"
+    "sass-loader": "^9.0.0"
   },
   "browserslist": {
     "production": [
@@ -260,7 +259,7 @@
     "cross-env": "^7.0.3",
     "dotenv": "^8.2.0",
     "dotenv-expand": "^5.1.0",
-    "electron": "^11.0.1",
+    "electron": "11.2.3",
     "electron-builder": "22.10.5",
     "electron-notarize": "1.0.0",
     "eslint": "^7.17.0",
diff --git a/public/electron.js b/public/electron.js
index 94a7bbf5..885d3e2b 100644
--- a/public/electron.js
+++ b/public/electron.js
@@ -106,9 +106,9 @@ function createWindow(port = DEFAULT_PORT) {
 
   if (isDev) {
     // Open the DevTools.
-    mainWindow.webContents.openDevTools()
     //BrowserWindow.addDevToolsExtension('<location to your react chrome extension>');
   }
+  mainWindow.webContents.openDevTools()
 
   mainWindow.setMenu(null)
   mainWindow.setMenuBarVisibility(false)
diff --git a/yarn.lock b/yarn.lock
index 3c136504..abbd528f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8681,10 +8681,10 @@ electron-updater@4.3.8:
     lodash.isequal "^4.5.0"
     semver "^7.3.4"
 
-electron@^11.0.1:
-  version "11.4.2"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-11.4.2.tgz#02005d9f5d77ea6485efeffdb5c5433c769ddda4"
-  integrity sha512-P0PRLH7cXp8ZdpA9yVPe7jRVM+QeiAtsadqmqS6XY3AYrsH+7bJnVrNuw6p/fcmp+b/UxWaCexobqQpyFJ5Qkw==
+electron@11.2.3:
+  version "11.2.3"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-11.2.3.tgz#8ad1d9858436cfca0e2e5ea7fea326794ae58ebb"
+  integrity sha512-6yxOc42nDAptHKNlUG/vcOh2GI9x2fqp2nQbZO0/3sz2CrwsJkwR3i3oMN9XhVJaqI7GK1vSCJz0verOkWlXcQ==
   dependencies:
     "@electron/get" "^1.0.1"
     "@types/node" "^12.0.12"