From 8fbf57ef3cf47cf8dacc851d7ee4af87739f403a Mon Sep 17 00:00:00 2001
From: automated-signal <37887102+automated-signal@users.noreply.github.com>
Date: Wed, 6 Apr 2022 11:39:33 -0700
Subject: [PATCH] Add Cannot_Update_Require_Manual dialog type

Co-authored-by: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
---
 _locales/en/messages.json              | 14 +++++++++
 ts/components/DialogUpdate.stories.tsx | 20 ++++++++++++
 ts/components/DialogUpdate.tsx         | 42 ++++++++++++++++++++++++++
 ts/types/Dialogs.ts                    |  1 +
 ts/updater/common.ts                   |  3 +-
 5 files changed, 79 insertions(+), 1 deletion(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 75ff1cdbb..43f946e63 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -1055,6 +1055,20 @@
       }
     }
   },
+  "cannotUpdateRequireManualDetail": {
+    "message": "Signal couldn't update. Visit $url$ to install it manually. Then, $support$ about this problem",
+    "description": "Shown if a general error happened while trying to install update package and manual update is required",
+    "placeholders": {
+      "url": {
+        "content": "$2",
+        "example": "https://signal.org/download"
+      },
+      "support": {
+        "content": "$3",
+        "example": "contact support"
+      }
+    }
+  },
   "readOnlyVolume": {
     "message": "Signal Desktop is likely in a macOS quarantine, and will not be able to auto-update. Please try moving $app$ to $folder$ with Finder.",
     "description": "Shown on MacOS if running on a read-only volume and we cannot update",
diff --git a/ts/components/DialogUpdate.stories.tsx b/ts/components/DialogUpdate.stories.tsx
index 866d01c6d..9c98a65ee 100644
--- a/ts/components/DialogUpdate.stories.tsx
+++ b/ts/components/DialogUpdate.stories.tsx
@@ -128,6 +128,26 @@ story.add('Knobs Playground', () => {
     </FakeLeftPaneContainer>
   ));
 
+  story.add(`Cannot Update & Require Manual (${name} container)`, () => (
+    <FakeLeftPaneContainer containerWidthBreakpoint={containerWidthBreakpoint}>
+      <DialogUpdate
+        {...defaultPropsForBreakpoint}
+        dialogType={DialogType.Cannot_Update_Require_Manual}
+        currentVersion="5.24.0"
+      />
+    </FakeLeftPaneContainer>
+  ));
+
+  story.add(`Cannot Update & Require Manual Beta (${name} container)`, () => (
+    <FakeLeftPaneContainer containerWidthBreakpoint={containerWidthBreakpoint}>
+      <DialogUpdate
+        {...defaultPropsForBreakpoint}
+        dialogType={DialogType.Cannot_Update_Require_Manual}
+        currentVersion="5.24.0-beta.1"
+      />
+    </FakeLeftPaneContainer>
+  ));
+
   story.add(`macOS RO Error (${name} container)`, () => (
     <FakeLeftPaneContainer containerWidthBreakpoint={containerWidthBreakpoint}>
       <DialogUpdate
diff --git a/ts/components/DialogUpdate.tsx b/ts/components/DialogUpdate.tsx
index aab7d6d9a..07877b189 100644
--- a/ts/components/DialogUpdate.tsx
+++ b/ts/components/DialogUpdate.tsx
@@ -108,6 +108,48 @@ export const DialogUpdate = ({
     );
   }
 
+  if (dialogType === DialogType.Cannot_Update_Require_Manual) {
+    const url = isBeta(currentVersion)
+      ? BETA_DOWNLOAD_URL
+      : PRODUCTION_DOWNLOAD_URL;
+    return (
+      <LeftPaneDialog
+        containerWidthBreakpoint={containerWidthBreakpoint}
+        type="warning"
+        title={i18n('cannotUpdate')}
+      >
+        <span>
+          <Intl
+            components={{
+              url: (
+                <a
+                  key="signal-download"
+                  href={url}
+                  rel="noreferrer"
+                  target="_blank"
+                >
+                  {url}
+                </a>
+              ),
+              support: (
+                <a
+                  key="signal-support"
+                  href="https://support.signal.org/hc/en-us/requests/new?desktop"
+                  rel="noreferrer"
+                  target="_blank"
+                >
+                  {i18n('autoUpdateContactSupport')}
+                </a>
+              ),
+            }}
+            i18n={i18n}
+            id="cannotUpdateRequireManualDetail"
+          />
+        </span>
+      </LeftPaneDialog>
+    );
+  }
+
   if (dialogType === DialogType.MacOS_Read_Only) {
     return (
       <LeftPaneDialog
diff --git a/ts/types/Dialogs.ts b/ts/types/Dialogs.ts
index 6f359ed8a..5e2008250 100644
--- a/ts/types/Dialogs.ts
+++ b/ts/types/Dialogs.ts
@@ -7,6 +7,7 @@ export enum DialogType {
   None = 'None',
   Update = 'Update',
   Cannot_Update = 'Cannot_Update',
+  Cannot_Update_Require_Manual = 'Cannot_Update_Require_Manual',
   MacOS_Read_Only = 'MacOS_Read_Only',
   DownloadReady = 'DownloadReady',
   FullDownloadReady = 'FullDownloadReady',
diff --git a/ts/updater/common.ts b/ts/updater/common.ts
index 477549d3f..0d0b294a8 100644
--- a/ts/updater/common.ts
+++ b/ts/updater/common.ts
@@ -363,7 +363,8 @@ export abstract class Updater {
     if (parsedYaml.requireManualUpdate) {
       this.logger.warn('checkForUpdates: manual update required');
       this.markCannotUpdate(
-        new Error('yaml file has requireManualUpdate flag')
+        new Error('yaml file has requireManualUpdate flag'),
+        DialogType.Cannot_Update_Require_Manual
       );
       return;
     }