Skip to content

Commit 77dae74

Browse files
chore: refactoring and separation of suggestUdevInstaller into @trezor/utils
1 parent 772c4f7 commit 77dae74

File tree

3 files changed

+14
-16
lines changed

3 files changed

+14
-16
lines changed

packages/connect/src/data/udevInfo.ts

+12-12
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,22 @@ const info: UdevInfo = {
1313
name: 'DEB package',
1414
platform: ['deb32', 'deb64'],
1515
url: '/udev/trezor-udev_2_all.deb',
16+
preferred: true, // DEB package is the most common
1617
},
1718
],
1819
};
1920

20-
export const suggestUdevInstaller = (platform?: string) => {
21-
const info2 = info;
22-
// check if preferred field was already added
23-
if (!info2.packages.find(p => p.preferred)) {
24-
if (platform) {
25-
// override UdevInfo packages, add preferred field
26-
info2.packages = info2.packages.map(p => ({
27-
...p,
28-
preferred: p.platform.indexOf(platform) >= 0,
29-
}));
30-
}
21+
export const suggestUdevInstaller = (platform?: string): UdevInfo => {
22+
// `platform` is not available on the desktop, in that case we assume the preferred as DEB
23+
24+
if (platform !== undefined) {
25+
return {
26+
packages: info.packages.map(it => ({
27+
...it,
28+
preferred: it.platform.indexOf(platform) >= 0,
29+
})),
30+
};
3131
}
3232

33-
return info2;
33+
return info;
3434
};

packages/connect/src/events/transport.ts

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import type { MessageFactoryFn } from '../types/utils';
1010
export { TRANSPORT } from '@trezor/transport/src/constants';
1111

1212
export const TRANSPORT_EVENT = 'TRANSPORT_EVENT';
13+
1314
export interface BridgeInfo {
1415
version: number[];
1516
packages: {

packages/suite/src/components/suite/UdevDownload.tsx

+1-4
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,11 @@ interface Installer {
5050
export const UdevDownload = () => {
5151
const udev = useSelector(selectUdevInstaller);
5252

53-
const hasPreferred = udev !== undefined && udev.packages.some(p => p.preferred);
54-
5553
const installers: Installer[] = udev
5654
? udev.packages.map(p => ({
5755
label: p.name,
5856
value: DATA_URL + p.url.substring(1),
59-
// preferred is not available on the desktop, so we fallback on the DEB package as it is the most common
60-
preferred: hasPreferred ? p.preferred : p.name === 'DEB package',
57+
preferred: p.preferred,
6158
}))
6259
: [];
6360

0 commit comments

Comments
 (0)