From d17c9f5bf9b776fd8c61ad0b69f2a476a51f7128 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 8 Nov 2024 01:56:50 +0000
Subject: [PATCH 1/2] [deps]: Update electron to v33

---
 package-lock.json | 27 +++++----------------------
 package.json      |  2 +-
 2 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 099ff554..f151050f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -67,7 +67,7 @@
         "cross-env": "7.0.3",
         "css-loader": "7.1.2",
         "dotenv": "16.4.5",
-        "electron": "28.3.3",
+        "electron": "33.2.0",
         "electron-builder": "24.13.3",
         "electron-log": "5.2.0",
         "electron-reload": "2.0.0-alpha.1",
@@ -10025,15 +10025,15 @@
       }
     },
     "node_modules/electron": {
-      "version": "28.3.3",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-28.3.3.tgz",
-      "integrity": "sha512-ObKMLSPNhomtCOBAxFS8P2DW/4umkh72ouZUlUKzXGtYuPzgr1SYhskhFWgzAsPtUzhL2CzyV2sfbHcEW4CXqw==",
+      "version": "33.2.0",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-33.2.0.tgz",
+      "integrity": "sha512-PVw1ICAQDPsnnsmpNFX/b1i/49h67pbSPxuIENd9K9WpGO1tsRaQt+K2bmXqTuoMJsbzIc75Ce8zqtuwBPqawA==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
         "@electron/get": "^2.0.0",
-        "@types/node": "^18.11.18",
+        "@types/node": "^20.9.0",
         "extract-zip": "^2.0.1"
       },
       "bin": {
@@ -10279,23 +10279,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/electron/node_modules/@types/node": {
-      "version": "18.19.55",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.55.tgz",
-      "integrity": "sha512-zzw5Vw52205Zr/nmErSEkN5FLqXPuKX/k5d1D7RKHATGqU7y6YfX9QxZraUzUrFGqH6XzOzG196BC35ltJC4Cw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~5.26.4"
-      }
-    },
-    "node_modules/electron/node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/emittery": {
       "version": "0.13.1",
       "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
diff --git a/package.json b/package.json
index 2c6eecf0..09b460c6 100644
--- a/package.json
+++ b/package.json
@@ -98,7 +98,7 @@
     "cross-env": "7.0.3",
     "css-loader": "7.1.2",
     "dotenv": "16.4.5",
-    "electron": "28.3.3",
+    "electron": "33.2.0",
     "electron-builder": "24.13.3",
     "electron-log": "5.2.0",
     "electron-reload": "2.0.0-alpha.1",

From e902a8e46c4547c8b0fbee0f26c84991124e75aa Mon Sep 17 00:00:00 2001
From: Brandon <btreston@bitwarden.com>
Date: Fri, 15 Nov 2024 16:25:05 -0500
Subject: [PATCH 2/2] remove event parameter from handler function params

---
 jslib/electron/src/tray.main.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/jslib/electron/src/tray.main.ts b/jslib/electron/src/tray.main.ts
index ca2e53dd..2854bc5b 100644
--- a/jslib/electron/src/tray.main.ts
+++ b/jslib/electron/src/tray.main.ts
@@ -60,9 +60,8 @@ export class TrayMain {
   }
 
   setupWindowListeners(win: BrowserWindow) {
-    win.on("minimize", async (e: Event) => {
+    win.on("minimize", async () => {
       if (await this.stateService.getEnableMinimizeToTray()) {
-        e.preventDefault();
         this.hideToTray();
       }
     });