Merge branch 'develop' into release/4.12.0

Author: danielmain

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ### Fixes
 
+- Fixed downloaded installer being left in Downloads after latest update installs ([PR 2941](https://github.com/input-output-hk/daedalus/pull/2941))
 - Fixed incorrect amount of token sent ([PR 2962](https://github.com/input-output-hk/daedalus/pull/2962))
 
 ### Chores

source/renderer/app/stores/AppUpdateStore.ts

@@ -102,9 +102,21 @@ export default class AppUpdateStore extends Store {
   }
 
   // ================= REACTIONS ==================
-  _watchForNewsfeedUpdates = () => {
+  _watchForNewsfeedUpdates = async () => {
     const { update } = this.stores.newsFeed.newsFeedData;
-    if (update) this._checkNewAppUpdate(update);
+    if (update) {
+      this._checkNewAppUpdate(update);
+    } else {
+      const isFileInDownloads = await this._checkFileExists();
+      if (isFileInDownloads && !this.availableUpdate) {
+        this._clearDownloads();
+      }
+    }
+  };
+
+  _clearDownloads = async () => {
+    this._removeUpdateFile();
+    await this._removeLocalDataInfo();
   };
 
   // ==================== PUBLIC ==================
@@ -186,7 +198,9 @@ export default class AppUpdateStore extends Store {
      * We can't simply compare with the `package.json` version
      * otherwise we would trigger the local data cleaning on every app load
      */
-    if (appUpdateCompleted === version) return false;
+    if (appUpdateCompleted === version) {
+      return false;
+    }
 
     // Was the update already installed?
     if (this.isUpdateInstalled(update)) {
@@ -263,26 +277,31 @@ export default class AppUpdateStore extends Store {
     await this._removeLocalDataInfo();
     return this._requestUpdateDownload(update);
   };
+
   _removeLocalDataInfo = async () => {
     clearDownloadLocalDataChannel.request({
       id: APP_UPDATE_DOWNLOAD_ID,
     });
   };
+
   _removeUpdateFile = () => {
     deleteDownloadedFile.request({
       id: APP_UPDATE_DOWNLOAD_ID,
     });
   };
+
   _getUpdateDownloadLocalData = async (): Promise<
     DownloadLocalDataMainResponse
   > =>
     getDownloadLocalDataChannel.request({
       id: APP_UPDATE_DOWNLOAD_ID,
     });
+
   _checkFileExists = async (): Promise<CheckFileExistsMainResponse> =>
     checkFileExistsChannel.request({
       id: APP_UPDATE_DOWNLOAD_ID,
     });
+
   _manageUpdateResponse = ({
     eventType,
     info,
@@ -331,6 +350,7 @@ export default class AppUpdateStore extends Store {
       fileUrl: '',
     });
   };
+
   _requestResumeUpdateDownload = async () => {
     await requestResumeDownloadChannel.request({
       id: APP_UPDATE_DOWNLOAD_ID,
@@ -341,6 +361,7 @@ export default class AppUpdateStore extends Store {
       },
     });
   };
+
   // @ts-ignore ts-migrate(2749) FIXME: 'News' refers to a value, but is being used as a t... Remove this comment to see the full error message
   _requestUpdateDownload = (update: News) => {
     const { url: fileUrl } = this.getUpdateInfo(update);
@@ -354,6 +375,7 @@ export default class AppUpdateStore extends Store {
       },
     });
   };
+
   _installUpdate = async () => {
     if (
       !this.availableUpdate ||
@@ -386,6 +408,7 @@ export default class AppUpdateStore extends Store {
       hash,
     });
   };
+
   _manageQuitAndInstallResponse = ({
     status,
     data,
@@ -414,22 +437,26 @@ export default class AppUpdateStore extends Store {
       hash: '',
     });
   };
+
   _setAppAutomaticUpdateFailed = async () => {
     // @ts-ignore ts-migrate(1320) FIXME: Type of 'await' operand must either be a valid pro... Remove this comment to see the full error message
     await this.setAppAutomaticUpdateFailedRequest.execute();
     runInAction(() => {
       this.isAutomaticUpdateFailed = true;
     });
   };
+
   @action
   _openAppUpdateOverlay = () => {
     this.isUpdateProgressOpen = true;
     this.isUpdatePostponed = false;
   };
+
   @action
   _closeAppUpdateOverlay = () => {
     this.isUpdateProgressOpen = false;
   };
+
   @action
   _postponeUpdate = () => {
     this.isUpdatePostponed = true;