Add Windows 64-bit arm link and remove 32-bit link on compatibility p…

…age (#29312) * Add Windows 64-bit arm link and remove 32-bit link on compatibility page Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Update snapshots Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --------- Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
element-hq · Feb 19, 2025 · e47d7aa · e47d7aa
1 parent 8857c07
commit e47d7aa
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 18 deletions.
diff --git a/docs/config.md b/docs/config.md
@@ -163,14 +163,14 @@ These two options describe the various availability for the application. When th
 such as trying to get the user to use an Android app or the desktop app for encrypted search, the config options will be looked
 at to see if the link should be to somewhere else.
 
-Starting with `desktop_builds`, the following subproperties are available:
+Starting with `desktop_builds`, the following sub-properties are available:
 
 1. `available`: Required. When `true`, the desktop app can be downloaded from somewhere.
 2. `logo`: Required. A URL to a logo (SVG), intended to be shown at 24x24 pixels.
 3. `url`: Required. The download URL for the app. This is used as a hyperlink.
 4. `url_macos`: Optional. Direct link to download macOS desktop app.
-5. `url_win32`: Optional. Direct link to download Windows 32-bit desktop app.
-6. `url_win64`: Optional. Direct link to download Windows 64-bit desktop app.
+5. `url_win64`: Optional. Direct link to download Windows x86 64-bit desktop app.
+6. `url_win64arm`: Optional. Direct link to download Windows ARM 64-bit desktop app.
 7. `url_linux`: Optional. Direct link to download Linux desktop app.
 
 When `desktop_builds` is not specified at all, the app will assume desktop downloads are available from https://element.io

diff --git a/...ading/feature-detection.spec.ts/unsupported-browser-CompatibilityView-linux.png b/...ading/feature-detection.spec.ts/unsupported-browser-CompatibilityView-linux.png
diff --git a/src/IConfigOptions.ts b/src/IConfigOptions.ts
@@ -71,7 +71,7 @@ export interface IConfigOptions {
         url: string; // download url
         url_macos?: string;
         url_win64?: string;
-        url_win32?: string;
+        url_win64arm?: string;
         url_linux?: string;
     };
     mobile_builds: {

diff --git a/src/SdkConfig.ts b/src/SdkConfig.ts
@@ -59,7 +59,7 @@ export const DEFAULTS: DeepReadonly<IConfigOptions> = {
         url: "https://element.io/download",
         url_macos: "https://packages.element.io/desktop/install/macos/Element.dmg",
         url_win64: "https://packages.element.io/desktop/install/win32/x64/Element%20Setup.exe",
-        url_win32: "https://packages.element.io/desktop/install/win32/ia32/Element%20Setup.exe",
+        url_win64arm: "https://packages.element.io/desktop/install/win32/arm64/Element%20Setup.exe",
         url_linux: "https://element.io/download#linux",
     },
     mobile_builds: {

diff --git a/src/async-components/structures/ErrorView.tsx b/src/async-components/structures/ErrorView.tsx
@@ -80,9 +80,9 @@ const MobileAppLinks: React.FC<{
 const DesktopAppLinks: React.FC<{
     macOsUrl?: string;
     win64Url?: string;
-    win32Url?: string;
+    win64ArmUrl?: string;
     linuxUrl?: string;
-}> = ({ macOsUrl, win64Url, win32Url, linuxUrl }) => {
+}> = ({ macOsUrl, win64Url, win64ArmUrl, linuxUrl }) => {
     return (
         <Flex gap="var(--cpd-space-4x)">
             {macOsUrl && (
@@ -92,12 +92,12 @@ const DesktopAppLinks: React.FC<{
             )}
             {win64Url && (
                 <Button as="a" href={win64Url} kind="secondary" Icon={MicrosoftIcon}>
-                    {_t("incompatible_browser|windows", { bits: "64" })}
+                    {_t("incompatible_browser|windows_64bit")}
                 </Button>
             )}
-            {win32Url && (
-                <Button as="a" href={win32Url} kind="secondary" Icon={MicrosoftIcon}>
-                    {_t("incompatible_browser|windows", { bits: "32" })}
+            {win64ArmUrl && (
+                <Button as="a" href={win64ArmUrl} kind="secondary" Icon={MicrosoftIcon}>
+                    {_t("incompatible_browser|windows_arm_64bit")}
                 </Button>
             )}
             {linuxUrl && (
@@ -127,7 +127,7 @@ export const UnsupportedBrowserView: React.FC<{
         config.desktop_builds?.available &&
         (config.desktop_builds?.url_macos ||
             config.desktop_builds?.url_win64 ||
-            config.desktop_builds?.url_win32 ||
+            config.desktop_builds?.url_win64arm ||
             config.desktop_builds?.url_linux);
     const hasMobileBuilds = Boolean(
         config.mobile_builds?.ios || config.mobile_builds?.android || config.mobile_builds?.fdroid,
@@ -157,7 +157,7 @@ export const UnsupportedBrowserView: React.FC<{
                             <DesktopAppLinks
                                 macOsUrl={config.desktop_builds?.url_macos}
                                 win64Url={config.desktop_builds?.url_win64}
-                                win32Url={config.desktop_builds?.url_win32}
+                                win64ArmUrl={config.desktop_builds?.url_win64arm}
                                 linuxUrl={config.desktop_builds?.url_linux}
                             />
                         </>

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
@@ -1286,7 +1286,8 @@
         "use_desktop_heading": "Use %(brand)s Desktop instead",
         "use_mobile_heading": "Use %(brand)s on mobile instead",
         "use_mobile_heading_after_desktop": "Or use our mobile app",
-        "windows": "Windows (%(bits)s-bit)"
+        "windows_64bit": "Windows (64-bit)",
+        "windows_arm_64bit": "Windows (ARM 64-bit)"
     },
     "info_tooltip_title": "Information",
     "integration_manager": {

diff --git a/test/unit-tests/async-components/structures/__snapshots__/ErrorView-test.tsx.snap b/test/unit-tests/async-components/structures/__snapshots__/ErrorView-test.tsx.snap
@@ -176,7 +176,7 @@ exports[`<UnsupportedBrowserView /> should match snapshot 1`] = `
         class="_button_i91xf_17 _has-icon_i91xf_66"
         data-kind="secondary"
         data-size="lg"
-        href="https://packages.element.io/desktop/install/win32/ia32/Element%20Setup.exe"
+        href="https://packages.element.io/desktop/install/win32/arm64/Element%20Setup.exe"
         role="link"
         tabindex="0"
       >
@@ -185,7 +185,7 @@ exports[`<UnsupportedBrowserView /> should match snapshot 1`] = `
           height="20"
           width="20"
         />
-        Windows (32-bit)
+        Windows (ARM 64-bit)
       </a>
       <a
         class="_button_i91xf_17 _has-icon_i91xf_66"

diff --git a/test/unit-tests/vector/__snapshots__/init-test.ts.snap b/test/unit-tests/vector/__snapshots__/init-test.ts.snap
@@ -189,7 +189,7 @@ exports[`showIncompatibleBrowser should match snapshot 1`] = `
         class="_button_i91xf_17 _has-icon_i91xf_66"
         data-kind="secondary"
         data-size="lg"
-        href="https://packages.element.io/desktop/install/win32/ia32/Element%20Setup.exe"
+        href="https://packages.element.io/desktop/install/win32/arm64/Element%20Setup.exe"
         role="link"
         tabindex="0"
       >
@@ -198,7 +198,7 @@ exports[`showIncompatibleBrowser should match snapshot 1`] = `
           height="20"
           width="20"
         />
-        Windows (32-bit)
+        Windows (ARM 64-bit)
       </a>
       <a
         class="_button_i91xf_17 _has-icon_i91xf_66"