Skip to content

Commit 355dce3

Browse files
feat(nami): accept trezor safe 5 device (#1478)
1 parent d17e330 commit 355dce3

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

packages/nami/src/ui/app/hw/connect-hw.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import React from 'react';
55

66
import { ChevronRightIcon } from '@chakra-ui/icons';
77
import { Box, Button, Icon, Image, Text, useColorMode } from '@chakra-ui/react';
8+
import { ledgerUSBVendorId } from '@ledgerhq/devices';
89
import { MdUsb } from 'react-icons/md';
910

1011
import LedgerLogo from '../../../assets/img/ledgerLogo.svg';
@@ -20,9 +21,9 @@ interface ConnectHWProps {
2021
onConfirm: (data: Readonly<Wallet.HardwareWalletConnection>) => void;
2122
}
2223

23-
const MANUFACTURER: Record<string, string> = {
24-
ledger: 'Ledger',
25-
trezor: 'SatoshiLabs',
24+
const VENDOR_IDS: Record<string, number[]> = {
25+
ledger: [ledgerUSBVendorId],
26+
trezor: [0x53_4c, 0x12_09], // Model T HID 0x534c and others 0x1209 - taken from https://github.com/vacuumlabs/trezor-suite/blob/develop/packages/transport/src/constants.ts#L13-L21
2627
};
2728

2829
export const ConnectHW = ({ onConfirm }: ConnectHWProps): ReactElement => {
@@ -41,7 +42,7 @@ export const ConnectHW = ({ onConfirm }: ConnectHWProps): ReactElement => {
4142
const device = await navigator.usb.requestDevice({
4243
filters: [],
4344
});
44-
if (device.manufacturerName !== MANUFACTURER[selected]) {
45+
if (!VENDOR_IDS[selected].includes(device.vendorId)) {
4546
setError(
4647
`Device is not a ${selected === HW.ledger ? 'Ledger' : 'Trezor'}`,
4748
);

0 commit comments

Comments
 (0)