Skip to content

Commit e47d7aa

Browse files
authored
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 <[email protected]> * Update snapshots Signed-off-by: Michael Telatynski <[email protected]> --------- Signed-off-by: Michael Telatynski <[email protected]>
1 parent 8857c07 commit e47d7aa

File tree

8 files changed

+19
-18
lines changed

8 files changed

+19
-18
lines changed

docs/config.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,14 +163,14 @@ These two options describe the various availability for the application. When th
163163
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
164164
at to see if the link should be to somewhere else.
165165

166-
Starting with `desktop_builds`, the following subproperties are available:
166+
Starting with `desktop_builds`, the following sub-properties are available:
167167

168168
1. `available`: Required. When `true`, the desktop app can be downloaded from somewhere.
169169
2. `logo`: Required. A URL to a logo (SVG), intended to be shown at 24x24 pixels.
170170
3. `url`: Required. The download URL for the app. This is used as a hyperlink.
171171
4. `url_macos`: Optional. Direct link to download macOS desktop app.
172-
5. `url_win32`: Optional. Direct link to download Windows 32-bit desktop app.
173-
6. `url_win64`: Optional. Direct link to download Windows 64-bit desktop app.
172+
5. `url_win64`: Optional. Direct link to download Windows x86 64-bit desktop app.
173+
6. `url_win64arm`: Optional. Direct link to download Windows ARM 64-bit desktop app.
174174
7. `url_linux`: Optional. Direct link to download Linux desktop app.
175175

176176
When `desktop_builds` is not specified at all, the app will assume desktop downloads are available from https://element.io

src/IConfigOptions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ export interface IConfigOptions {
7171
url: string; // download url
7272
url_macos?: string;
7373
url_win64?: string;
74-
url_win32?: string;
74+
url_win64arm?: string;
7575
url_linux?: string;
7676
};
7777
mobile_builds: {

src/SdkConfig.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export const DEFAULTS: DeepReadonly<IConfigOptions> = {
5959
url: "https://element.io/download",
6060
url_macos: "https://packages.element.io/desktop/install/macos/Element.dmg",
6161
url_win64: "https://packages.element.io/desktop/install/win32/x64/Element%20Setup.exe",
62-
url_win32: "https://packages.element.io/desktop/install/win32/ia32/Element%20Setup.exe",
62+
url_win64arm: "https://packages.element.io/desktop/install/win32/arm64/Element%20Setup.exe",
6363
url_linux: "https://element.io/download#linux",
6464
},
6565
mobile_builds: {

src/async-components/structures/ErrorView.tsx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ const MobileAppLinks: React.FC<{
8080
const DesktopAppLinks: React.FC<{
8181
macOsUrl?: string;
8282
win64Url?: string;
83-
win32Url?: string;
83+
win64ArmUrl?: string;
8484
linuxUrl?: string;
85-
}> = ({ macOsUrl, win64Url, win32Url, linuxUrl }) => {
85+
}> = ({ macOsUrl, win64Url, win64ArmUrl, linuxUrl }) => {
8686
return (
8787
<Flex gap="var(--cpd-space-4x)">
8888
{macOsUrl && (
@@ -92,12 +92,12 @@ const DesktopAppLinks: React.FC<{
9292
)}
9393
{win64Url && (
9494
<Button as="a" href={win64Url} kind="secondary" Icon={MicrosoftIcon}>
95-
{_t("incompatible_browser|windows", { bits: "64" })}
95+
{_t("incompatible_browser|windows_64bit")}
9696
</Button>
9797
)}
98-
{win32Url && (
99-
<Button as="a" href={win32Url} kind="secondary" Icon={MicrosoftIcon}>
100-
{_t("incompatible_browser|windows", { bits: "32" })}
98+
{win64ArmUrl && (
99+
<Button as="a" href={win64ArmUrl} kind="secondary" Icon={MicrosoftIcon}>
100+
{_t("incompatible_browser|windows_arm_64bit")}
101101
</Button>
102102
)}
103103
{linuxUrl && (
@@ -127,7 +127,7 @@ export const UnsupportedBrowserView: React.FC<{
127127
config.desktop_builds?.available &&
128128
(config.desktop_builds?.url_macos ||
129129
config.desktop_builds?.url_win64 ||
130-
config.desktop_builds?.url_win32 ||
130+
config.desktop_builds?.url_win64arm ||
131131
config.desktop_builds?.url_linux);
132132
const hasMobileBuilds = Boolean(
133133
config.mobile_builds?.ios || config.mobile_builds?.android || config.mobile_builds?.fdroid,
@@ -157,7 +157,7 @@ export const UnsupportedBrowserView: React.FC<{
157157
<DesktopAppLinks
158158
macOsUrl={config.desktop_builds?.url_macos}
159159
win64Url={config.desktop_builds?.url_win64}
160-
win32Url={config.desktop_builds?.url_win32}
160+
win64ArmUrl={config.desktop_builds?.url_win64arm}
161161
linuxUrl={config.desktop_builds?.url_linux}
162162
/>
163163
</>

src/i18n/strings/en_EN.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1286,7 +1286,8 @@
12861286
"use_desktop_heading": "Use %(brand)s Desktop instead",
12871287
"use_mobile_heading": "Use %(brand)s on mobile instead",
12881288
"use_mobile_heading_after_desktop": "Or use our mobile app",
1289-
"windows": "Windows (%(bits)s-bit)"
1289+
"windows_64bit": "Windows (64-bit)",
1290+
"windows_arm_64bit": "Windows (ARM 64-bit)"
12901291
},
12911292
"info_tooltip_title": "Information",
12921293
"integration_manager": {

test/unit-tests/async-components/structures/__snapshots__/ErrorView-test.tsx.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ exports[`<UnsupportedBrowserView /> should match snapshot 1`] = `
176176
class="_button_i91xf_17 _has-icon_i91xf_66"
177177
data-kind="secondary"
178178
data-size="lg"
179-
href="https://packages.element.io/desktop/install/win32/ia32/Element%20Setup.exe"
179+
href="https://packages.element.io/desktop/install/win32/arm64/Element%20Setup.exe"
180180
role="link"
181181
tabindex="0"
182182
>
@@ -185,7 +185,7 @@ exports[`<UnsupportedBrowserView /> should match snapshot 1`] = `
185185
height="20"
186186
width="20"
187187
/>
188-
Windows (32-bit)
188+
Windows (ARM 64-bit)
189189
</a>
190190
<a
191191
class="_button_i91xf_17 _has-icon_i91xf_66"

test/unit-tests/vector/__snapshots__/init-test.ts.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ exports[`showIncompatibleBrowser should match snapshot 1`] = `
189189
class="_button_i91xf_17 _has-icon_i91xf_66"
190190
data-kind="secondary"
191191
data-size="lg"
192-
href="https://packages.element.io/desktop/install/win32/ia32/Element%20Setup.exe"
192+
href="https://packages.element.io/desktop/install/win32/arm64/Element%20Setup.exe"
193193
role="link"
194194
tabindex="0"
195195
>
@@ -198,7 +198,7 @@ exports[`showIncompatibleBrowser should match snapshot 1`] = `
198198
height="20"
199199
width="20"
200200
/>
201-
Windows (32-bit)
201+
Windows (ARM 64-bit)
202202
</a>
203203
<a
204204
class="_button_i91xf_17 _has-icon_i91xf_66"

0 commit comments

Comments
 (0)