Skip to content

Commit c9c99ec

Browse files
komretkomret
committed
chore: more t3w1 preparation
1 parent 745db41 commit c9c99ec

File tree

10 files changed

+58
-46
lines changed

10 files changed

+58
-46
lines changed

Diff for: ‎packages/product-components/src/utils/mapTrezorModelToIcon.ts

+1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ export const mapTrezorModelToIcon: Record<DeviceModelInternal, IconName> = {
77
[DeviceModelInternal.T2B1]: 'trezorSafe3Filled',
88
[DeviceModelInternal.T3B1]: 'trezorSafe3Filled',
99
[DeviceModelInternal.T3T1]: 'trezorSafe5Filled',
10+
[DeviceModelInternal.T3W1]: 'trezorSafe7Filled',
1011
};

Diff for: ‎packages/urls/tests/urls.test.ts

+4
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ const excluded = [
1010
URLS.LTC_ADDRESS_INFO_URL,
1111
// captcha, returning 403 in ci
1212
URLS.TREZOR_FORUM_URL,
13+
// TODO T3W1 - articles not live yet
14+
URLS.HELP_CENTER_DRY_RUN_T3W1_URL,
15+
URLS.HELP_CENTER_PACKAGING_T3W1_URL,
16+
URLS.HELP_CENTER_FW_DOWNGRADE_T3W1_URL,
1317
];
1418

1519
describe('Test that all external links are alive', () => {

Diff for: ‎suite-common/icons-deprecated/assets/icons/trezorT3W1.svg

+3
Loading

Diff for: ‎suite-common/icons-deprecated/src/icons.ts

+1
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ export const icons = {
210210
trezorT2T1: require('../assets/icons/trezorT2T1.svg'),
211211
trezorT3B1: require('../assets/icons/trezorT3B1.svg'),
212212
trezorT3T1: require('../assets/icons/trezorT3T1.svg'),
213+
trezorT3W1: require('../assets/icons/trezorT3T1.svg'),
213214
twitter: require('../assets/icons/twitter.svg'),
214215
twoUsers: require('../assets/icons/twoUsers.svg'),
215216
unlink: require('../assets/icons/unlink.svg'),

Diff for: ‎suite-common/wallet-config/src/networksConfig.ts

+13-13
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,9 @@ export const networks = {
179179
support: {
180180
[DeviceModelInternal.T2T1]: '2.6.4',
181181
[DeviceModelInternal.T2B1]: '2.6.4',
182-
[DeviceModelInternal.T3B1]: '2.8.1',
183-
[DeviceModelInternal.T3T1]: '2.7.1',
184-
[DeviceModelInternal.T3W1]: '2.99.99',
182+
[DeviceModelInternal.T3B1]: '2.0.0',
183+
[DeviceModelInternal.T3T1]: '2.0.0',
184+
[DeviceModelInternal.T3W1]: '2.0.0',
185185
},
186186
customBackends: ['solana'],
187187
accountTypes: {
@@ -212,10 +212,10 @@ export const networks = {
212212
},
213213
support: {
214214
[DeviceModelInternal.T2T1]: '2.4.3',
215-
[DeviceModelInternal.T2B1]: '2.6.1',
216-
[DeviceModelInternal.T3B1]: '2.8.1',
217-
[DeviceModelInternal.T3T1]: '2.7.1',
218-
[DeviceModelInternal.T3W1]: '2.99.99',
215+
[DeviceModelInternal.T2B1]: '2.0.0',
216+
[DeviceModelInternal.T3B1]: '2.0.0',
217+
[DeviceModelInternal.T3T1]: '2.0.0',
218+
[DeviceModelInternal.T3W1]: '2.0.0',
219219
},
220220
customBackends: ['blockfrost'],
221221
accountTypes: {
@@ -598,9 +598,9 @@ export const networks = {
598598
support: {
599599
[DeviceModelInternal.T2T1]: '2.6.4',
600600
[DeviceModelInternal.T2B1]: '2.6.4',
601-
[DeviceModelInternal.T3B1]: '2.8.1',
602-
[DeviceModelInternal.T3T1]: '2.7.1',
603-
[DeviceModelInternal.T3W1]: '2.99.99',
601+
[DeviceModelInternal.T3B1]: '2.0.0',
602+
[DeviceModelInternal.T3T1]: '2.0.0',
603+
[DeviceModelInternal.T3W1]: '2.0.0',
604604
},
605605
customBackends: ['solana'],
606606
accountTypes: {},
@@ -625,9 +625,9 @@ export const networks = {
625625
support: {
626626
[DeviceModelInternal.T2T1]: '2.4.3',
627627
[DeviceModelInternal.T2B1]: '2.6.1',
628-
[DeviceModelInternal.T3B1]: '2.8.1',
629-
[DeviceModelInternal.T3T1]: '2.7.1',
630-
[DeviceModelInternal.T3W1]: '2.99.99',
628+
[DeviceModelInternal.T3B1]: '2.0.0',
629+
[DeviceModelInternal.T3T1]: '2.0.0',
630+
[DeviceModelInternal.T3W1]: '2.0.0',
631631
},
632632
customBackends: ['blockfrost'],
633633
accountTypes: {

Diff for: ‎suite-native/device/src/utils.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import { DeviceModelInternal, VersionArray } from '@trezor/connect';
66
export const minimalSupportedFirmwareVersion = {
77
T1B1: [1, 12, 1] as VersionArray,
88
T2T1: [2, 6, 3] as VersionArray,
9-
T2B1: [2, 6, 3] as VersionArray,
10-
T3B1: [2, 8, 1] as VersionArray,
11-
T3T1: [2, 7, 1] as VersionArray,
12-
T3W1: [2, 99, 99] as VersionArray,
9+
T2B1: [2, 0, 0] as VersionArray,
10+
T3B1: [2, 0, 0] as VersionArray,
11+
T3T1: [2, 0, 0] as VersionArray,
12+
T3W1: [2, 0, 0] as VersionArray,
1313
} as const satisfies Record<DeviceModelInternal, VersionArray>;
1414

1515
export const isFirmwareVersionSupported = (

Diff for: ‎suite-native/icons/src/DeviceModelIcon.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ const icons = {
1414
T2B1: 'trezorSafe3',
1515
T3B1: 'trezorSafe3',
1616
T3T1: 'trezorSafe5',
17+
T3W1: 'trezorSafe5', // TODO T3W1
1718
} as const satisfies Record<DeviceModelInternal, IconName>;
1819

1920
export const deviceModelToIconName = (deviceModel: DeviceModelInternal) => icons[deviceModel];

Diff for: ‎suite-native/receive/src/components/DevicePaginationButton.tsx

+9-9
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ type DeviceScreenPaginationProps = {
1515
onPress: () => void;
1616
};
1717

18-
const T2B1_BUTTON_COLOR = '#2B2D2B';
1918
const BUTTON_HEIGHT = 56;
2019
const BUTTON_WIDTH = 296;
20+
const T2B1_BUTTON_COLOR = '#2B2D2B';
2121

2222
const ICON_COLOR: CSSColor = DEVICE_TEXT_COLOR;
2323

@@ -33,17 +33,17 @@ const safe3Styles = {
3333
borderWidth: nativeBorders.widths.large,
3434
} as const;
3535

36+
const touchscreenDeviceStyles = {
37+
backgroundColor: T2B1_BUTTON_COLOR,
38+
borderRadius: nativeBorders.radii.r8,
39+
} as const;
40+
3641
const modelToStyles = {
37-
[DeviceModelInternal.T2T1]: {
38-
backgroundColor: T2B1_BUTTON_COLOR,
39-
borderRadius: nativeBorders.radii.r8,
40-
},
41-
[DeviceModelInternal.T3T1]: {
42-
backgroundColor: T2B1_BUTTON_COLOR,
43-
borderRadius: nativeBorders.radii.r8,
44-
},
42+
[DeviceModelInternal.T2T1]: touchscreenDeviceStyles,
4543
[DeviceModelInternal.T2B1]: safe3Styles,
4644
[DeviceModelInternal.T3B1]: safe3Styles,
45+
[DeviceModelInternal.T3T1]: touchscreenDeviceStyles,
46+
[DeviceModelInternal.T3W1]: touchscreenDeviceStyles, // TODO T3W1
4747
} as const satisfies Record<PaginationCompatibleDeviceModel, Readonly<NativeStyle>>;
4848

4949
const deviceButtonStyle = prepareNativeStyle<DeviceButtonStyleProps>(

Diff for: ‎suite-native/receive/src/components/DeviceScreenContent.tsx

+10-15
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,13 @@ const safe3Styles = {
4040
lineHeight: 25,
4141
pagerOffset: 40,
4242
};
43+
const smallTouchscreenStyles = {
44+
fontSource: require('../../../../packages/theme/fonts/RobotoMono-Regular.ttf'),
45+
fontSize: 20,
46+
lineWidth: 230,
47+
lineHeight: 25,
48+
pagerOffset: 60,
49+
};
4350

4451
const deviceToContentStyles: Record<DeviceModelInternal, DeviceModelLayoutProps> = {
4552
[DeviceModelInternal.T1B1]: {
@@ -49,27 +56,15 @@ const deviceToContentStyles: Record<DeviceModelInternal, DeviceModelLayoutProps>
4956
lineHeight: 17,
5057
pagerOffset: 0,
5158
},
52-
[DeviceModelInternal.T2T1]: {
53-
fontSource: require('../../../../packages/theme/fonts/RobotoMono-Regular.ttf'),
54-
fontSize: 20,
55-
lineWidth: 230,
56-
lineHeight: 25,
57-
pagerOffset: 60,
58-
},
59-
[DeviceModelInternal.T3T1]: {
60-
fontSource: require('../../../../packages/theme/fonts/RobotoMono-Regular.ttf'),
61-
fontSize: 20,
62-
lineWidth: 230,
63-
lineHeight: 25,
64-
pagerOffset: 60,
65-
},
59+
[DeviceModelInternal.T2T1]: smallTouchscreenStyles,
60+
[DeviceModelInternal.T3T1]: smallTouchscreenStyles,
6661
[DeviceModelInternal.T3W1]: {
6762
fontSource: require('../../../../packages/theme/fonts/RobotoMono-Regular.ttf'),
6863
fontSize: 20,
6964
lineWidth: 230,
7065
lineHeight: 25,
7166
pagerOffset: 60,
72-
},
67+
}, // TODO T3W1
7368
[DeviceModelInternal.T2B1]: safe3Styles,
7469
[DeviceModelInternal.T3B1]: safe3Styles,
7570
};

Diff for: ‎suite-native/receive/src/components/DeviceScreenPagination.tsx

+12-5
Original file line numberDiff line numberDiff line change
@@ -63,22 +63,29 @@ const deviceModelToSvg: Record<PaginationCompatibleDeviceModel, PaginationModelM
6363
paginatorPrefixY: 4,
6464
paginatorSuffixX: 182.5,
6565
paginatorSuffixY: 82,
66+
67+
pagerSvg1: require('../../assets/pager1T2T1.svg'),
68+
pagerSvg2: require('../../assets/pager2T2T1.svg'),
69+
pagerX: 260,
70+
pagerY: 30,
71+
paginationSvgWidth: 40,
72+
paginationSvgHeight: 17.5,
6673
},
6774
[DeviceModelInternal.T3W1]: {
68-
paginationPrefixSvg: require('../../assets/addressPaginationPrefixT3W1.svg'),
69-
paginationSuffixSvg: require('../../assets/addressPaginationSuffixT3W1.svg'),
75+
paginationPrefixSvg: require('../../assets/addressPaginationPrefixT2T1.svg'),
76+
paginationSuffixSvg: require('../../assets/addressPaginationPrefixT2T1.svg'),
7077
paginatorPrefixX: 0,
7178
paginatorPrefixY: 4,
7279
paginatorSuffixX: 182.5,
7380
paginatorSuffixY: 82,
7481

75-
pagerSvg1: require('../../assets/pager1T3W1.svg'),
76-
pagerSvg2: require('../../assets/pager2T3W1.svg'),
82+
pagerSvg1: require('../../assets/pager1T2T1.svg'),
83+
pagerSvg2: require('../../assets/pager1T2T1.svg'),
7784
pagerX: 260,
7885
pagerY: 30,
7986
paginationSvgWidth: 40,
8087
paginationSvgHeight: 17.5,
81-
},
88+
}, // TODO T3W1
8289
[DeviceModelInternal.T2B1]: safe3Svg,
8390
[DeviceModelInternal.T3B1]: safe3Svg,
8491
};

0 commit comments

Comments
 (0)