From 56d279f4651ac088da8d39c6fe87899c8b605860 Mon Sep 17 00:00:00 2001
From: Jari Kolehmainen <jari.kolehmainen@gmail.com>
Date: Wed, 29 Apr 2020 18:08:09 +0300
Subject: [PATCH] improve dashboard reload

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
---
 src/main/menu.ts   | 9 +++++++--
 src/main/router.ts | 5 +++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/menu.ts b/src/main/menu.ts
index 749ab63c4949..f834d33cbc39 100644
--- a/src/main/menu.ts
+++ b/src/main/menu.ts
@@ -145,8 +145,13 @@ export default function initMenu(opts: MenuOptions, promiseIpc: any) {
           webContents.getFocusedWebContents().executeJavaScript('window.history.forward()')
         }
       },
-      { role: 'reload' },
-      { role: 'forceReload' },
+      {
+        label: 'Reload',
+        accelerator: 'CmdOrCtrl+R',
+        click () {
+          webContents.getFocusedWebContents().reload()
+        }
+      },
       ...(isDevelopment ? [
         { role: 'toggleDevTools'} as MenuItemConstructorOptions,
         {
diff --git a/src/main/router.ts b/src/main/router.ts
index e1297a5d33b5..07ca8195587f 100644
--- a/src/main/router.ts
+++ b/src/main/router.ts
@@ -92,13 +92,14 @@ export class Router {
     const asset = path.join(assetsPath, file)
     readFile(asset, (err, data) => {
       if (err) {
-        response.statusCode = 404
+        // default to index.html so that react routes work when page is refreshed
+        this.handleStaticFile("index.html", response)
       } else {
         const type = mimeTypes[path.extname(asset).slice(1)] || "text/plain";
         response.setHeader("Content-Type", type);
         response.write(data)
+        response.end()
       }
-      response.end()
     })
   }