Skip to content

Add Windows 64-bit arm link and remove 32-bit link on compatibility page #29312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 19, 2025
Merged

Add Windows 64-bit arm link and remove 32-bit link on compatibility page #29312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a111fc8
Add Windows 64-bit arm link and remove 32-bit link on compatibility page
t3chguy Feb 18, 2025
9ac27a1
Update snapshots
t3chguy Feb 19, 2025
bd9991e
Merge branch 'develop' of https://github.com/vector-im/element-web in…
t3chguy Feb 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docs/config.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified ...ading/feature-detection.spec.ts/unsupported-browser-CompatibilityView-linux.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/IConfigOptions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
2 changes: 1 addition & 1 deletion src/SdkConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
16 changes: 8 additions & 8 deletions src/async-components/structures/ErrorView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 && (
Expand All @@ -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 && (
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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}
/>
</>
Expand Down
3 changes: 2 additions & 1 deletion src/i18n/strings/en_EN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
4 changes: 2 additions & 2 deletions test/unit-tests/async-components/structures/__snapshots__/ErrorView-test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
>
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions test/unit-tests/vector/__snapshots__/init-test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
>
Expand All @@ -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"
Expand Down
Loading