From e47d7aaaff768c6e58b37632ec0e4d3aa5ef4d58 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 19 Feb 2025 16:17:56 +0000 Subject: [PATCH] Add Windows 64-bit arm link and remove 32-bit link on compatibility page (#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> --- docs/config.md | 6 +++--- ...ported-browser-CompatibilityView-linux.png | Bin 231484 -> 232111 bytes src/IConfigOptions.ts | 2 +- src/SdkConfig.ts | 2 +- src/async-components/structures/ErrorView.tsx | 16 ++++++++-------- src/i18n/strings/en_EN.json | 3 ++- .../__snapshots__/ErrorView-test.tsx.snap | 4 ++-- .../vector/__snapshots__/init-test.ts.snap | 4 ++-- 8 files changed, 19 insertions(+), 18 deletions(-) diff --git a/docs/config.md b/docs/config.md index 47d148247f..9ae9f21254 100644 --- 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/playwright/snapshots/app-loading/feature-detection.spec.ts/unsupported-browser-CompatibilityView-linux.png b/playwright/snapshots/app-loading/feature-detection.spec.ts/unsupported-browser-CompatibilityView-linux.png index 9e7aa4795796868b7bdd637c7ea83c39995f661f..b0bb64273eb61530c58d447ada1c26c60fd62a2e 100644 GIT binary patch delta 19316 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%0D(sSF+@Z*N0#gHR? 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 diff --git a/src/IConfigOptions.ts b/src/IConfigOptions.ts index 2eebd9c760..67b7515eac 100644 --- 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 index 33d3f98683..a41b890b19 100644 --- a/src/SdkConfig.ts +++ b/src/SdkConfig.ts @@ -59,7 +59,7 @@ export const DEFAULTS: DeepReadonly = { 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 index 90c03c12dd..57cf048403 100644 --- 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 ( {macOsUrl && ( @@ -92,12 +92,12 @@ const DesktopAppLinks: React.FC<{ )} {win64Url && ( )} - {win32Url && ( - )} {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<{ diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index d88d29008e..2428efc72f 100644 --- 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 index f3a3689646..16e94cdeee 100644 --- 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[` 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[` should match snapshot 1`] = ` height="20" width="20" /> - Windows (32-bit) + Windows (ARM 64-bit) @@ -198,7 +198,7 @@ exports[`showIncompatibleBrowser should match snapshot 1`] = ` height="20" width="20" /> - Windows (32-bit) + Windows (ARM 64-bit)