diff --git a/packages/device-utils/src/firmwareUtils.ts b/packages/device-utils/src/firmwareUtils.ts index d56c89e81d..3a579f8db9 100644 --- a/packages/device-utils/src/firmwareUtils.ts +++ b/packages/device-utils/src/firmwareUtils.ts @@ -20,13 +20,3 @@ export const getFirmwareVersion = (device?: PartialDevice) => { export const hasBitcoinOnlyFirmware = (device?: PartialDevice) => device?.firmwareType === FirmwareType.BitcoinOnly; - -/** - * @deprecated This method should not be part of device-utils - */ -export const getFirmwareType = (device?: PartialDevice) => { - if (isDeviceInBootloaderMode(device)) { - return ''; - } - return isBitcoinOnlyFirmware(device) ? 'Bitcoin-only' : 'Universal'; -}; diff --git a/packages/suite/src/actions/firmware/__tests__/firmwareActions.test.ts b/packages/suite/src/actions/firmware/__tests__/firmwareActions.test.ts index 0aaf39c502..ba51f68427 100644 --- a/packages/suite/src/actions/firmware/__tests__/firmwareActions.test.ts +++ b/packages/suite/src/actions/firmware/__tests__/firmwareActions.test.ts @@ -37,7 +37,7 @@ jest.mock('@trezor/connect', () => { return Promise.resolve(fixture.mocks.connect); }; - const { PROTO, DeviceModelInternal } = jest.requireActual('@trezor/connect'); + const { PROTO, DeviceModelInternal, FirmwareType } = jest.requireActual('@trezor/connect'); return { __esModule: true, // this property makes it work @@ -60,6 +60,7 @@ jest.mock('@trezor/connect', () => { }, PROTO, DeviceModelInternal, + FirmwareType, }; }); diff --git a/packages/suite/src/components/firmware/FirmwareOffer.tsx b/packages/suite/src/components/firmware/FirmwareOffer.tsx index e5a9500bd7..8b6d91ba88 100644 --- a/packages/suite/src/components/firmware/FirmwareOffer.tsx +++ b/packages/suite/src/components/firmware/FirmwareOffer.tsx @@ -4,10 +4,11 @@ import styled from 'styled-components'; import { FirmwareChangelog } from 'src/components/firmware'; import { Icon, Tooltip, variables } from '@trezor/components'; import { Translation } from 'src/components/suite'; -import { getFirmwareType, getFirmwareVersion } from '@trezor/device-utils'; +import { getFirmwareVersion } from '@trezor/device-utils'; import { getFwUpdateVersion, parseFirmwareChangelog } from 'src/utils/suite/device'; import { useFirmware, useTranslation, useSelector } from 'src/hooks/suite'; import { AcquiredDevice, FirmwareType } from 'src/types/suite'; +import { getFirmwareType } from 'src/utils/firmware'; const FwVersionWrapper = styled.div` display: flex; diff --git a/packages/suite/src/utils/firmware/index.ts b/packages/suite/src/utils/firmware/index.ts index 772274179b..037488d125 100644 --- a/packages/suite/src/utils/firmware/index.ts +++ b/packages/suite/src/utils/firmware/index.ts @@ -5,7 +5,12 @@ import { isDeviceInBootloaderMode, } from '@trezor/device-utils'; -import type { AppState, TrezorDevice, ExtendedMessageDescriptor } from 'src/types/suite'; +import { + type AppState, + type TrezorDevice, + type ExtendedMessageDescriptor, + FirmwareType, +} from 'src/types/suite'; import { DeviceModelInternal } from '@trezor/connect'; export const getFormattedFingerprint = (fingerprint: string) => @@ -114,16 +119,6 @@ export const validateFirmware = ( } }; -export const getSuiteFwTypeFromDevice = (device?: TrezorDevice) => { - if (isDeviceInBootloaderMode(device)) { - return ''; - } - - return hasBitcoinOnlyFirmware(device) - ? SuiteFirmwareType.BitcoinOnly - : SuiteFirmwareType.Universal; -}; - export const getSuiteFwType = (firmwareType?: FirmwareType) => firmwareType === FirmwareType.BitcoinOnly ? SuiteFirmwareType.BitcoinOnly diff --git a/packages/suite/src/views/onboarding/steps/Firmware.tsx b/packages/suite/src/views/onboarding/steps/Firmware.tsx index eece546da3..b8bbe51ab8 100644 --- a/packages/suite/src/views/onboarding/steps/Firmware.tsx +++ b/packages/suite/src/views/onboarding/steps/Firmware.tsx @@ -10,9 +10,10 @@ import { } from 'src/components/firmware'; import { useSelector, useFirmware, useOnboarding } from 'src/hooks/suite'; import { TrezorDevice } from 'src/types/suite'; -import { getFirmwareType, getFirmwareVersion } from '@trezor/device-utils'; +import { getFirmwareVersion } from '@trezor/device-utils'; import { DeviceTutorial } from 'src/components/firmware/DeviceTutorial'; import { selectOnboardingTutorialStatus } from 'src/reducers/onboarding/onboardingReducer'; +import { getFirmwareType } from 'src/utils/firmware'; const FirmwareStep = () => { const device = useSelector(state => state.suite.device); diff --git a/packages/suite/src/views/settings/device/FirmwareTypeChange.tsx b/packages/suite/src/views/settings/device/FirmwareTypeChange.tsx index 74c8c78c35..5f0463a651 100644 --- a/packages/suite/src/views/settings/device/FirmwareTypeChange.tsx +++ b/packages/suite/src/views/settings/device/FirmwareTypeChange.tsx @@ -10,6 +10,7 @@ import { useAnchor } from 'src/hooks/suite/useAnchor'; import { SettingsAnchor } from 'src/constants/suite/anchors'; import { getFirmwareVersion, hasBitcoinOnlyFirmware } from '@trezor/device-utils'; import { HELP_FIRMWARE_TYPE } from '@trezor/urls'; +import { getFirmwareType } from 'src/utils/firmware'; const Version = styled.div` span {