bug with updater

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.1.2] - 2021-05-31
+
+### Fixed
+
+- Bug with update window when banner is currently open
+
 ## [1.1.1] - 2021-05-28
 
 ### Added

package.json

@@ -11,7 +11,7 @@
   "repository": {
     "url": "https://github.com/cupcakearmy/unpixel"
   },
-  "version": "1.1.1",
+  "version": "1.1.2",
   "main": "./dist/back/index.js",
   "scripts": {
     "start": "electron .",
@@ -62,7 +62,7 @@
     "electron": "^12.0.0",
     "electron-builder": "^22.10.5",
     "npm-run-all": "^4.1.5",
-    "parcel": "next",
+    "parcel": "^2.0.0-beta.3.1",
     "postcss": "^8.2.10",
     "typescript": "^4.2.3"
   }

src/back/tray.ts

@@ -60,11 +60,11 @@ export default class TrayUtility {
 
   static init() {
     if (!this.tray) {
-      const file = path.join(__dirname, '../../assets/trayTemplate.png')
+      const file = path.join(__dirname, '../../assets/tray.png')
-      // const resized = nativeImage.createFromPath(file).resize({ width: 24, height: 24 })
+      const resized = nativeImage.createFromPath(file).resize({ width: 24, height: 24 })
-      // resized.setTemplateImage(true)
+      resized.setTemplateImage(true)
-      // resized.isMacTemplateImage = true
+      resized.isMacTemplateImage = true
-      this.tray = new Tray(file)
+      this.tray = new Tray(resized)
       this.build()
     }
   }

src/back/updater.ts

@@ -4,6 +4,7 @@ import logger from 'electron-log'
 import { dialog, shell } from 'electron'
 
 import pkg from '../../package.json'
+import Banner from './banner'
 
 const current = semver.coerce(pkg.version)
 const url = 'https://api.github.com/repos/cupcakearmy/unpixel/tags'
@@ -25,7 +26,9 @@ export default class Updater {
     if (!current) throw new Error('Could not determine current version')
     if (semver.lt(current, latest)) {
       logger.info('New version available')
+      Banner.close()
       dialog
+        // @ts-ignore
         .showMessageBox(null, {
           title: 'Update available',
           message: 'A newer version is available, please download.',