diff --git a/suite-native/accounts/src/components/AccountsList/AccountsListTokenItem.tsx b/suite-native/accounts/src/components/AccountsList/AccountsListTokenItem.tsx index af1539775ab..1c7d4e7645e 100644 --- a/suite-native/accounts/src/components/AccountsList/AccountsListTokenItem.tsx +++ b/suite-native/accounts/src/components/AccountsList/AccountsListTokenItem.tsx @@ -2,8 +2,8 @@ import { useSelector } from 'react-redux'; import { Account, TokenInfoBranded } from '@suite-common/wallet-types'; import { TokenAmountFormatter, TokenToFiatAmountFormatter } from '@suite-native/formatters'; -import { getTokenName, selectAccountTokenSymbol, TokensRootState } from '@suite-native/tokens'; import { CryptoIconWithNetwork } from '@suite-native/icons'; +import { TokensRootState, getTokenName, selectAccountTokenSymbol } from '@suite-native/tokens'; import { AccountsListItemBase } from './AccountsListItemBase'; diff --git a/suite-native/icons/src/CryptoIcon.tsx b/suite-native/icons/src/CryptoIcon.tsx index 9c015b53aa7..97fcaac1847 100644 --- a/suite-native/icons/src/CryptoIcon.tsx +++ b/suite-native/icons/src/CryptoIcon.tsx @@ -2,12 +2,12 @@ import { useMemo } from 'react'; import { Image } from 'expo-image'; -import { cryptoIcons, genericTokenIcon, CryptoIconName } from '@suite-common/icons'; +import { CryptoIconName, cryptoIcons, genericTokenIcon } from '@suite-common/icons'; import { - getCoingeckoId, - isNetworkSymbol, NetworkDisplaySymbol, NetworkSymbol, + getCoingeckoId, + isNetworkSymbol, } from '@suite-common/wallet-config'; import { getContractAddressForNetworkSymbol } from '@suite-common/wallet-utils'; import { getAssetLogoUrl } from '@trezor/asset-utils'; diff --git a/suite-native/icons/src/CryptoIconWithNetwork.tsx b/suite-native/icons/src/CryptoIconWithNetwork.tsx index eed77dd3f45..3c3988bd678 100644 --- a/suite-native/icons/src/CryptoIconWithNetwork.tsx +++ b/suite-native/icons/src/CryptoIconWithNetwork.tsx @@ -1,13 +1,13 @@ -import { prepareNativeStyle, useNativeStyles } from '@trezor/styles'; import { - getNetworkDisplaySymbol, NetworkDisplaySymbol, NetworkSymbol, + getNetworkDisplaySymbol, } from '@suite-common/wallet-config'; import { TokenAddress } from '@suite-common/wallet-types'; import { Box } from '@suite-native/atoms'; +import { prepareNativeStyle, useNativeStyles } from '@trezor/styles'; -import { CryptoIconSize, CryptoIcon, cryptoIconSizes } from './CryptoIcon'; +import { CryptoIcon, CryptoIconSize, cryptoIconSizes } from './CryptoIcon'; import { NetworkIcon } from './NetworkIcon'; export interface CryptoIconWithNetworkProps { diff --git a/suite-native/icons/src/tests/CryptoIconWithNetwork.comp.test.tsx b/suite-native/icons/src/tests/CryptoIconWithNetwork.comp.test.tsx index c3385780584..ab91ffaa590 100644 --- a/suite-native/icons/src/tests/CryptoIconWithNetwork.comp.test.tsx +++ b/suite-native/icons/src/tests/CryptoIconWithNetwork.comp.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import { render } from '@suite-native/test-utils'; import { TokenAddress } from '@suite-common/wallet-types'; +import { render } from '@suite-native/test-utils'; import { CryptoIconWithNetwork } from '../CryptoIconWithNetwork'; diff --git a/suite-native/module-accounts-management/package.json b/suite-native/module-accounts-management/package.json index 08c96bc19f5..2ad84c6dfa1 100644 --- a/suite-native/module-accounts-management/package.json +++ b/suite-native/module-accounts-management/package.json @@ -37,6 +37,7 @@ "@suite-native/tokens": "workspace:*", "@suite-native/transactions": "workspace:*", "@trezor/styles": "workspace:*", + "@trezor/utils": "workspace:*", "jotai": "1.9.1", "react": "18.2.0", "react-native": "0.76.1", diff --git a/suite-native/module-accounts-management/src/components/AccountDetailScreenHeader.tsx b/suite-native/module-accounts-management/src/components/AccountDetailScreenHeader.tsx index 8e04cf22ef2..d0e5717a7eb 100644 --- a/suite-native/module-accounts-management/src/components/AccountDetailScreenHeader.tsx +++ b/suite-native/module-accounts-management/src/components/AccountDetailScreenHeader.tsx @@ -1,6 +1,6 @@ import { useSelector } from 'react-redux'; -import { useNavigation, RouteProp, useRoute } from '@react-navigation/native'; +import { RouteProp, useNavigation, useRoute } from '@react-navigation/native'; import { AccountsRootState, selectAccountNetworkSymbol } from '@suite-common/wallet-core'; import { HStack, IconButton, Text } from '@suite-native/atoms'; diff --git a/suite-native/module-accounts-management/src/components/TokenAccountDetailScreenHeader.tsx b/suite-native/module-accounts-management/src/components/TokenAccountDetailScreenHeader.tsx index 50bcd5fe757..eefa834b4b8 100644 --- a/suite-native/module-accounts-management/src/components/TokenAccountDetailScreenHeader.tsx +++ b/suite-native/module-accounts-management/src/components/TokenAccountDetailScreenHeader.tsx @@ -2,22 +2,22 @@ import { useSelector } from 'react-redux'; import { RouteProp, useRoute } from '@react-navigation/native'; -import { Box, HStack, Text, VStack } from '@suite-native/atoms'; -import { - RootStackParamList, - RootStackRoutes, - ScreenHeader, - GoBackIcon, -} from '@suite-native/navigation'; import { AccountsRootState, selectAccountLabel, selectAccountNetworkSymbol, } from '@suite-common/wallet-core'; +import { TokenAddress } from '@suite-common/wallet-types'; +import { Box, HStack, Text, VStack } from '@suite-native/atoms'; import { CryptoIconWithNetwork } from '@suite-native/icons'; import { useTranslate } from '@suite-native/intl'; -import { selectAccountTokenInfo, TokensRootState } from '@suite-native/tokens'; -import { TokenAddress } from '@suite-common/wallet-types'; +import { + GoBackIcon, + RootStackParamList, + RootStackRoutes, + ScreenHeader, +} from '@suite-native/navigation'; +import { TokensRootState, selectAccountTokenInfo } from '@suite-native/tokens'; type TokenAccountDetailScreenHeaderProps = { accountKey: string; diff --git a/suite-native/module-send/src/components/AccountBalanceScreenHeader.tsx b/suite-native/module-send/src/components/AccountBalanceScreenHeader.tsx index 49c9e7eea71..1834e2fea6b 100644 --- a/suite-native/module-send/src/components/AccountBalanceScreenHeader.tsx +++ b/suite-native/module-send/src/components/AccountBalanceScreenHeader.tsx @@ -1,12 +1,12 @@ import { useSelector } from 'react-redux'; +import { getNetworkDisplaySymbol } from '@suite-common/wallet-config'; import { AccountsRootState, selectAccountByKey } from '@suite-common/wallet-core'; import { AccountKey, TokenAddress } from '@suite-common/wallet-types'; import { Text } from '@suite-native/atoms'; import { Translation } from '@suite-native/intl'; -import { ScreenHeader, GoBackIcon } from '@suite-native/navigation'; -import { selectAccountTokenInfo, TokensRootState } from '@suite-native/tokens'; -import { getNetworkDisplaySymbol } from '@suite-common/wallet-config'; +import { GoBackIcon, ScreenHeader } from '@suite-native/navigation'; +import { TokensRootState, selectAccountTokenInfo } from '@suite-native/tokens'; type AccountBalanceScreenHeaderProps = { accountKey: AccountKey; diff --git a/suite-native/module-send/src/components/TokenOfNetworkAlertContent.tsx b/suite-native/module-send/src/components/TokenOfNetworkAlertContent.tsx index 605ebec7fc9..1283c6bcaec 100644 --- a/suite-native/module-send/src/components/TokenOfNetworkAlertContent.tsx +++ b/suite-native/module-send/src/components/TokenOfNetworkAlertContent.tsx @@ -4,7 +4,7 @@ import { useSelector } from 'react-redux'; import { getNetwork } from '@suite-common/wallet-config'; import { AccountsRootState, selectAccountNetworkSymbol } from '@suite-common/wallet-core'; import { AccountKey, TokenAddress } from '@suite-common/wallet-types'; -import { VStack, AlertBox, Text } from '@suite-native/atoms'; +import { AlertBox, Text, VStack } from '@suite-native/atoms'; import { CryptoIconWithNetwork } from '@suite-native/icons'; import { Translation } from '@suite-native/intl'; import { TokensRootState, selectAccountTokenSymbol } from '@suite-native/tokens'; diff --git a/suite-native/transactions/src/components/TransactionsList/TransactionIcon.tsx b/suite-native/transactions/src/components/TransactionsList/TransactionIcon.tsx index 30ddb07f7e5..04056adf3d4 100644 --- a/suite-native/transactions/src/components/TransactionsList/TransactionIcon.tsx +++ b/suite-native/transactions/src/components/TransactionsList/TransactionIcon.tsx @@ -1,13 +1,13 @@ -import { Box, RoundedIcon } from '@suite-native/atoms'; -import { prepareNativeStyle, useNativeStyles } from '@trezor/styles'; -import { TokenAddress, TransactionType } from '@suite-common/wallet-types'; -import { CryptoIcon, IconName, IconSize } from '@suite-native/icons'; -import { Color } from '@trezor/theme'; import { - getNetworkDisplaySymbol, NetworkDisplaySymbol, NetworkSymbol, + getNetworkDisplaySymbol, } from '@suite-common/wallet-config'; +import { TokenAddress, TransactionType } from '@suite-common/wallet-types'; +import { Box, RoundedIcon } from '@suite-native/atoms'; +import { CryptoIcon, IconName, IconSize } from '@suite-native/icons'; +import { prepareNativeStyle, useNativeStyles } from '@trezor/styles'; +import { Color } from '@trezor/theme'; import { TransactionIconSpinner } from './TransactionIconSpinner'; diff --git a/yarn.lock b/yarn.lock index 4e7d14b48f5..a664a562145 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10612,6 +10612,7 @@ __metadata: "@suite-native/tokens": "workspace:*" "@suite-native/transactions": "workspace:*" "@trezor/styles": "workspace:*" + "@trezor/utils": "workspace:*" jotai: "npm:1.9.1" react: "npm:18.2.0" react-native: "npm:0.76.1"