Merge branch 'update-to-electron-26'

gui/package.json

@@ -43,7 +43,7 @@
     "@types/google-protobuf": "^3.15.6",
     "@types/history": "^4.7.11",
     "@types/mocha": "^10.0.0",
-    "@types/node": "^18.15.0",
+    "@types/node": "^18.16.1",
     "@types/node-gettext": "^3.0.3",
     "@types/rbush": "^3.0.0",
     "@types/react": "^18.0.21",
@@ -61,7 +61,7 @@
     "chai-as-promised": "^7.1.1",
     "chai-spies": "^1.0.0",
     "cross-env": "^7.0.3",
-    "electron": "^25.2.0",
+    "electron": "^26.3.0",
     "electron-builder": "^23.6.0",
     "electron-devtools-installer": "^3.2.0",
     "electron-mocha": "^11.0.2",
@@ -112,7 +112,7 @@
     "npm": ">=8.3"
   },
   "volta": {
-    "node": "18.15.0",
-    "npm": "9.7.2"
+    "node": "18.16.1",
+    "npm": "10.2.0"
   }
 }

gui/src/main/index.ts

@@ -183,7 +183,6 @@ class ApplicationMain
       );
     });
 
-    app.on('activate', this.onActivate);
     app.on('ready', this.onReady);
 
     app.on('before-quit', this.onBeforeQuit);
@@ -195,9 +194,6 @@ class ApplicationMain
       log.info('quit received');
       this.onQuit();
     });
-
-    powerMonitor.on('suspend', this.onSuspend);
-    powerMonitor.on('resume', this.onResume);
   }
 
   public async performPostUpgradeCheck(): Promise<void> {
@@ -368,6 +364,10 @@ class ApplicationMain
   }
 
   private onReady = async () => {
+    app.on('activate', this.onActivate);
+    powerMonitor.on('suspend', this.onSuspend);
+    powerMonitor.on('resume', this.onResume);
+
     // Disable built-in DNS resolver.
     app.configureHostResolver({
       enableBuiltInResolver: false,