Merge branch 'master' into mainnet

MinterTeam · Mar 29, 2020 · 56d4821 · 56d4821
2 parents 25b4ed8 + 3ddbe93
commit 56d4821
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/desktop/electron-builder.config.js b/desktop/electron-builder.config.js
@@ -10,6 +10,7 @@ module.exports = {
     "files": [
         "dist/**/*",
         "desktop/electron.js",
+        "desktop/utils/**/*",
         // "desktop/electron.dev.js",
         // "nuxt.config.js",
         ".nuxt/**/*",

diff --git a/desktop/electron.js b/desktop/electron.js
@@ -65,7 +65,7 @@ app.on('ready', async () => {
     }
     // setTimeout(createWindow, 3000)
     createWindow();
-    createMenu(Menu);
+    createMenu(app, Menu);
 });
 
 app.on('window-all-closed', () => {
@@ -113,7 +113,7 @@ function createWindow() {
         mainWindow.webContents.openDevTools();
     }
 
-    mainWindow.on('close',  async (e) => {
+    mainWindow.on('close', (e) => {
         // console.log('close');
         // prevent first close to give time for `checkStorage` to run, otherwise `closed` event fires too early and set `mainWindow` to null
         if (isReadyToClose) {
@@ -148,7 +148,7 @@ function createWindow() {
         // console.log('close end');
     });
 
-    mainWindow.on('closed', async () => {
+    mainWindow.on('closed',  () => {
         // console.log('closed');
         mainWindow = null;
     });

diff --git a/desktop/utils/menu.js b/desktop/utils/menu.js
@@ -1,4 +1,4 @@
-module.exports = function createMenu(Menu) {
+module.exports = function createMenu(app, Menu) {
     const template = [{
         label: "Minter Console",
         submenu: [