From 1cc08038f9109fa78cc5f18affd70895aca6d627 Mon Sep 17 00:00:00 2001
From: Robert Wagner <rwwagner90@gmail.com>
Date: Sat, 25 Apr 2020 10:45:37 -0400
Subject: [PATCH 1/3] Show window on dock icon click

---
 src/Menubar.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Menubar.ts b/src/Menubar.ts
index 8711b95..c4212c0 100644
--- a/src/Menubar.ts
+++ b/src/Menubar.ts
@@ -202,6 +202,12 @@ export class Menubar extends EventEmitter {
       this.app.dock.hide();
     }
 
+    this.app.on('activate', (event, hasVisibleWindows) => {
+      if (!hasVisibleWindows) {
+        this.showWindow();
+      }
+    });
+
     let trayImage =
       this._options.icon || path.join(this._options.dir, 'IconTemplate.png');
     if (typeof trayImage === 'string' && !fs.existsSync(trayImage)) {

From bc864c484aa7816170fac477b08bfa1ac259fa05 Mon Sep 17 00:00:00 2001
From: Robert Wagner <rwwagner90@gmail.com>
Date: Sat, 25 Apr 2020 11:10:23 -0400
Subject: [PATCH 2/3] Fix lint

---
 src/Menubar.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Menubar.ts b/src/Menubar.ts
index c4212c0..a1a8e10 100644
--- a/src/Menubar.ts
+++ b/src/Menubar.ts
@@ -202,7 +202,7 @@ export class Menubar extends EventEmitter {
       this.app.dock.hide();
     }
 
-    this.app.on('activate', (event, hasVisibleWindows) => {
+    this.app.on('activate', (_event, hasVisibleWindows) => {
       if (!hasVisibleWindows) {
         this.showWindow();
       }

From bb6701f700c439fa2b8540301f2378de4d84a327 Mon Sep 17 00:00:00 2001
From: Robert Wagner <rwwagner90@gmail.com>
Date: Mon, 27 Apr 2020 09:21:48 -0400
Subject: [PATCH 3/3] Update electron.ts

---
 src/__mocks__/electron.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/__mocks__/electron.ts b/src/__mocks__/electron.ts
index 7c7b5a3..16b8673 100644
--- a/src/__mocks__/electron.ts
+++ b/src/__mocks__/electron.ts
@@ -4,7 +4,10 @@ export const MOCK_APP_GETAPPPATH = 'mock.app.getAppPath';
 
 export const app = {
   getAppPath: jest.fn(() => MOCK_APP_GETAPPPATH),
-  isReady: (): Promise<void> => Promise.resolve()
+  isReady: (): Promise<void> => Promise.resolve(),
+  on: (): void => {
+    /* Do nothing */
+  }
 };
 
 export class BrowserWindow {