diff --git a/docs/config.md b/docs/config.md index 47d148247f1..9ae9f212548 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 9e7aa479579..b0bb64273eb 100644 Binary files a/playwright/snapshots/app-loading/feature-detection.spec.ts/unsupported-browser-CompatibilityView-linux.png and b/playwright/snapshots/app-loading/feature-detection.spec.ts/unsupported-browser-CompatibilityView-linux.png differ diff --git a/src/IConfigOptions.ts b/src/IConfigOptions.ts index 2eebd9c7603..67b7515eac6 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 33d3f98683e..a41b890b19e 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 90c03c12dd9..57cf048403b 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 d88d29008e4..2428efc72fa 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 f3a36896468..16e94cdeee2 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)