Add app menu item for updating

desktop/main.js

@@ -71,22 +71,36 @@ for (let i = 0; i < process.argv.length; i++) {
 // Add the listeners and variables required to ensure that auto-updating
 // happens correctly.
 let hasUpdate = false;
+let downloadedVersion;
 
-const quitAndInstallWithUpdate = (version) => {
+const quitAndInstallWithUpdate = () => {
+    if (!downloadedVersion) {
+        return;
+    }
     app.relaunch({
-        args: [`${EXPECTED_UPDATE_VERSION_FLAG}=${version}`],
+        args: [`${EXPECTED_UPDATE_VERSION_FLAG}=${downloadedVersion}`],
     });
     hasUpdate = true;
     autoUpdater.quitAndInstall();
 };
 
+// Defines the system-level menu item for manually triggering an update after
+const updateAppMenuItem = new MenuItem({
+    label: 'Update Expensify.cash',
+    enabled: false,
+    click: quitAndInstallWithUpdate,
+});
+
+// Actual auto-update listeners
 const electronUpdater = browserWindow => ({
     init: () => {
         autoUpdater.on('update-downloaded', (info) => {
+            downloadedVersion = info.version;
+            updateAppMenuItem.enabled = true;
             if (browserWindow.isVisible()) {
                 browserWindow.webContents.send('update-downloaded', info.version);
             } else {
-                quitAndInstallWithUpdate(info.version);
+                quitAndInstallWithUpdate();
             }
         });
 
@@ -134,6 +148,9 @@ const mainWindow = (() => {
                 }],
             }));
 
+            const appMenu = systemMenu.items.find(item => item.role === 'appmenu');
+            appMenu.submenu.insert(1, updateAppMenuItem);
+
             // On mac, pressing cmd++ actually sends a cmd+=. cmd++ is generally the zoom in shortcut, but this is
             // not properly listened for by electron. Adding in an invisible cmd+= listener fixes this.
             const viewWindow = systemMenu.items.find(item => item.role === 'viewmenu');

src/Expensify.js

@@ -46,16 +46,16 @@ const propTypes = {
         accountID: PropTypes.number,
     }),
 
-    // Version of newly downloaded update.
-    version: PropTypes.string,
+    // Whether a new update is available and ready to install.
+    updateAvailable: PropTypes.bool,
 };
 
 const defaultProps = {
     session: {
         authToken: null,
         accountID: null,
     },
-    version: '',
+    updateAvailable: false,
 };
 
 class Expensify extends PureComponent {
@@ -98,7 +98,7 @@ class Expensify extends PureComponent {
         return (
             <>
                 {/* We include the modal for showing a new update at the top level so the option is always present. */}
-                {this.props.version ? <UpdateAppModal updateVersion={this.props.version} /> : null}
+                {this.props.updateAvailable ? <UpdateAppModal /> : null}
                 <NavigationRoot authenticated={Boolean(authToken)} />
             </>
         );
@@ -111,8 +111,8 @@ export default withOnyx({
     session: {
         key: ONYXKEYS.SESSION,
     },
-    version: {
-        key: ONYXKEYS.UPDATE_VERSION,
+    updateAvailable: {
+        key: ONYXKEYS.UPDATE_AVAILABLE,
         initWithStoredValues: false,
     },
 })(Expensify);

src/ONYXKEYS.js

@@ -38,8 +38,8 @@ export default {
     // Contains the user preference for the LHN priority mode
     PRIORITY_MODE: 'priorityMode',
 
-    // Contains the version of the update that has newly been downloaded.
-    UPDATE_VERSION: 'updateVersion',
+    // Indicates whether an update is available and ready to beinstalled.
+    UPDATE_AVAILABLE: 'updateAvailable',
 
     // Saves the current country code which is displayed when the user types a phone number without
     // an international code

src/components/UpdateAppModal/UpdateAppModalPropTypes.js

@@ -3,15 +3,10 @@ import PropTypes from 'prop-types';
 const propTypes = {
     // Callback to fire when we want to trigger the update.
     onSubmit: PropTypes.func,
-
-    // Version string for the app to update to.
-    // eslint-disable-next-line react/no-unused-prop-types
-    version: PropTypes.string,
 };
 
 const defaultProps = {
     onSubmit: null,
-    version: '',
 };
 
 export {propTypes, defaultProps};

src/components/UpdateAppModal/index.desktop.js

@@ -8,7 +8,7 @@ const UpdateAppModal = (props) => {
         if (props.onSubmit) {
             props.onSubmit();
         }
-        ipcRenderer.sendSync('start-update', props.version);
+        ipcRenderer.sendSync('start-update');
     };
     return <BaseUpdateAppModal onSubmit={updateApp} />;
 };

src/libs/Notification/LocalNotification/BrowserNotifications.js

@@ -122,17 +122,14 @@ export default {
 
     /**
      * Create a notification to indicate that an update is available.
-     *
-     * @param {Object} params
-     * @param {String} params.version
      */
-    pushUpdateAvailableNotification({version}) {
+    pushUpdateAvailableNotification() {
         push({
             title: 'Update available',
             body: 'A new version of Expensify.cash is available!',
             delay: 0,
             onClick: () => {
-                Onyx.merge(ONYXKEYS.UPDATE_VERSION, version);
+                Onyx.merge(ONYXKEYS.UPDATE_AVAILABLE, true);
             },
         });
     },

src/libs/Notification/LocalNotification/index.js

@@ -4,8 +4,8 @@ function showCommentNotification({reportAction, onClick}) {
     BrowserNotifications.pushReportCommentNotification({reportAction, onClick});
 }
 
-function showUpdateAvailableNotification({version}) {
-    BrowserNotifications.pushUpdateAvailableNotification({version});
+function showUpdateAvailableNotification() {
+    BrowserNotifications.pushUpdateAvailableNotification();
 }
 
 export default {

src/setup/index.desktop.js

@@ -9,7 +9,7 @@ export default function () {
         rootTag: document.getElementById('root'),
     });
 
-    ipcRenderer.on('update-downloaded', (_, version) => {
-        LocalNotification.showUpdateAvailableNotification({version});
+    ipcRenderer.on('update-downloaded', () => {
+        LocalNotification.showUpdateAvailableNotification();
     });
 }