diff --git a/packages/components/src/components/DotIndicator/DotIndicator.tsx b/packages/components/src/components/DotIndicator/DotIndicator.tsx index 3f6291455e5..70d4b4ae4d7 100644 --- a/packages/components/src/components/DotIndicator/DotIndicator.tsx +++ b/packages/components/src/components/DotIndicator/DotIndicator.tsx @@ -1,6 +1,6 @@ import styled from 'styled-components'; -import { spacingsPx, spacings } from '@trezor/theme'; +import { spacings, spacingsPx } from '@trezor/theme'; import { Box } from '../Box/Box'; diff --git a/packages/suite-desktop-core/e2e/tests/coin-market/buy-coins.test.ts b/packages/suite-desktop-core/e2e/tests/coin-market/buy-coins.test.ts index 781380f9a5b..fb9dc3d5578 100644 --- a/packages/suite-desktop-core/e2e/tests/coin-market/buy-coins.test.ts +++ b/packages/suite-desktop-core/e2e/tests/coin-market/buy-coins.test.ts @@ -1,10 +1,10 @@ -import { capitalizeFirstLetter } from '@trezor/utils'; import { localizeNumber } from '@suite-common/wallet-utils'; +import { capitalizeFirstLetter } from '@trezor/utils'; import { buyQuotes, buyTrade, invityEndpoint } from '../../fixtures/invity'; import expectedWatchRequestPayload from '../../fixtures/invity/buy/watch-request.json'; import { formatAddress } from '../../support/common'; -import { test, expect } from '../../support/fixtures'; +import { expect, test } from '../../support/fixtures'; const mockedFiatAmount = buyQuotes[0].fiatStringAmount; // 1234, The mocked quotes are for a fixed input amount const mockedCryptoAmount = buyQuotes[0].receiveStringAmount; diff --git a/packages/suite-desktop-core/e2e/tests/wallet/send-doge.test.ts b/packages/suite-desktop-core/e2e/tests/wallet/send-doge.test.ts index cb67dcff4b6..d951cfce484 100644 --- a/packages/suite-desktop-core/e2e/tests/wallet/send-doge.test.ts +++ b/packages/suite-desktop-core/e2e/tests/wallet/send-doge.test.ts @@ -1,7 +1,7 @@ import { localizeNumber } from '@suite-common/wallet-utils'; -import { test, expect } from '../../support/fixtures'; import { formatAddress } from '../../support/common'; +import { expect, test } from '../../support/fixtures'; test.describe('Doge Send', { tag: ['@group=wallet', '@snapshot'] }, () => { test.use({ diff --git a/packages/suite/src/components/suite/modals/ReduxModal/ConfirmValueModal/ConfirmValueModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/ConfirmValueModal/ConfirmValueModal.tsx index c1018a35114..a76de4bf0e8 100644 --- a/packages/suite/src/components/suite/modals/ReduxModal/ConfirmValueModal/ConfirmValueModal.tsx +++ b/packages/suite/src/components/suite/modals/ReduxModal/ConfirmValueModal/ConfirmValueModal.tsx @@ -1,27 +1,27 @@ -import { useEffect, ReactNode } from 'react'; +import { ReactNode, useEffect } from 'react'; import { notificationsActions } from '@suite-common/toast-notifications'; +import { selectSelectedDevice, selectSelectedDeviceLabelOrName } from '@suite-common/wallet-core'; +import { Account } from '@suite-common/wallet-types'; import { - Tooltip, - NewModal, Banner, + Card, + Column, + NewModal, NewModalProps, Paragraph, - Column, - Card, Row, + Tooltip, } from '@trezor/components'; import { copyToClipboard } from '@trezor/dom-utils'; -import { selectSelectedDevice, selectSelectedDeviceLabelOrName } from '@suite-common/wallet-core'; -import { Account } from '@suite-common/wallet-types'; -import { palette, spacings } from '@trezor/theme'; import { ConfirmOnDevice } from '@trezor/product-components'; +import { palette, spacings } from '@trezor/theme'; -import { selectIsActionAbortable } from 'src/reducers/suite/suiteReducer'; +import { MODAL } from 'src/actions/suite/constants'; +import { Translation } from 'src/components/suite'; import { QrCode } from 'src/components/suite/QrCode'; import { useDispatch, useSelector } from 'src/hooks/suite'; -import { Translation } from 'src/components/suite'; -import { MODAL } from 'src/actions/suite/constants'; +import { selectIsActionAbortable } from 'src/reducers/suite/suiteReducer'; import { ThunkAction } from 'src/types/suite'; import { diff --git a/packages/suite/src/components/suite/modals/ReduxModal/ConfirmXpubModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/ConfirmXpubModal.tsx index 9874dd541af..b02ec9c09f4 100644 --- a/packages/suite/src/components/suite/modals/ReduxModal/ConfirmXpubModal.tsx +++ b/packages/suite/src/components/suite/modals/ReduxModal/ConfirmXpubModal.tsx @@ -1,12 +1,12 @@ +import { getNetwork } from '@suite-common/wallet-config'; import { selectSelectedDevice } from '@suite-common/wallet-core'; import { convertTaprootXpub } from '@trezor/utils'; -import { getNetwork } from '@suite-common/wallet-config'; -import { Translation } from 'src/components/suite'; import { showXpub } from 'src/actions/wallet/publicKeyActions'; -import { selectSelectedAccount } from 'src/reducers/wallet/selectedAccountReducer'; -import { selectLabelingDataForSelectedAccount } from 'src/reducers/suite/metadataReducer'; +import { Translation } from 'src/components/suite'; import { useSelector } from 'src/hooks/suite'; +import { selectLabelingDataForSelectedAccount } from 'src/reducers/suite/metadataReducer'; +import { selectSelectedAccount } from 'src/reducers/wallet/selectedAccountReducer'; import { ConfirmValueModal, ConfirmValueModalProps } from './ConfirmValueModal/ConfirmValueModal'; import { ConfirmActionModal } from './DeviceContextModal/ConfirmActionModal'; diff --git a/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewDetails.tsx b/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewDetails.tsx index 075fb58dfa5..ca2b45d3fd5 100644 --- a/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewDetails.tsx +++ b/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewDetails.tsx @@ -1,7 +1,7 @@ import styled from 'styled-components'; -import { Card, Column, Text, InfoItem } from '@trezor/components'; import { GeneralPrecomposedTransactionFinal } from '@suite-common/wallet-types'; +import { Card, Column, InfoItem, Text } from '@trezor/components'; import { spacings } from '@trezor/theme'; import { Translation } from 'src/components/suite'; diff --git a/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewModalContent.tsx b/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewModalContent.tsx index 3bbf9fd17d1..b31dc03fe68 100644 --- a/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewModalContent.tsx +++ b/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewModalContent.tsx @@ -1,37 +1,37 @@ import { useState } from 'react'; -import { analytics, EventType } from '@trezor/suite-analytics'; -import { NewModal } from '@trezor/components'; -import { Deferred } from '@trezor/utils'; +import { notificationsActions } from '@suite-common/toast-notifications'; import { DeviceRootState, - selectSelectedDevice, + SendState, + StakeState, selectPrecomposedSendForm, + selectSelectedDevice, selectSendFormReviewButtonRequestsCount, selectStakePrecomposedForm, - StakeState, - SendState, } from '@suite-common/wallet-core'; -import { notificationsActions } from '@suite-common/toast-notifications'; import { FormState, StakeFormState } from '@suite-common/wallet-types'; import { constructTransactionReviewOutputs, - isRbfTransaction, getTxStakeNameByDataHex, + isRbfTransaction, } from '@suite-common/wallet-utils'; -import { ConfirmOnDevice } from '@trezor/product-components'; +import { NewModal } from '@trezor/components'; import { copyToClipboard, download } from '@trezor/dom-utils'; +import { ConfirmOnDevice } from '@trezor/product-components'; +import { EventType, analytics } from '@trezor/suite-analytics'; +import { Deferred } from '@trezor/utils'; +import { Translation } from 'src/components/suite'; import { useDispatch, useSelector } from 'src/hooks/suite'; import { selectIsActionAbortable } from 'src/reducers/suite/suiteReducer'; -import { getTransactionReviewModalActionText } from 'src/utils/suite/transactionReview'; -import { Translation } from 'src/components/suite'; import { selectAccountIncludingChosenInTrading } from 'src/reducers/wallet/selectedAccountReducer'; +import { getTransactionReviewModalActionText } from 'src/utils/suite/transactionReview'; +import { TransactionReviewDetails } from './TransactionReviewDetails'; import { TransactionReviewOutputList } from './TransactionReviewOutputList/TransactionReviewOutputList'; -import { ConfirmActionModal } from '../DeviceContextModal/ConfirmActionModal'; import { TransactionReviewSummary } from './TransactionReviewSummary'; -import { TransactionReviewDetails } from './TransactionReviewDetails'; +import { ConfirmActionModal } from '../DeviceContextModal/ConfirmActionModal'; const isStakeState = (state: SendState | StakeState): state is StakeState => 'data' in state; diff --git a/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewOutput.tsx b/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewOutput.tsx index f938f533b92..d38f43eb8cf 100644 --- a/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewOutput.tsx +++ b/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewOutput.tsx @@ -1,20 +1,20 @@ import { ReactNode } from 'react'; -import { BigNumber } from '@trezor/utils/src/bigNumber'; -import { isTestnet } from '@suite-common/wallet-utils'; +import { TranslationKey } from '@suite-common/intl-types'; +import { NetworkSymbol, NetworkType, getNetworkDisplaySymbol } from '@suite-common/wallet-config'; import { BTC_LOCKTIME_VALUE } from '@suite-common/wallet-constants'; -import { getNetworkDisplaySymbol, NetworkSymbol, NetworkType } from '@suite-common/wallet-config'; import { ReviewOutput, StakeType } from '@suite-common/wallet-types'; -import { TranslationKey } from '@suite-common/intl-types'; +import { isTestnet } from '@suite-common/wallet-utils'; +import { BigNumber } from '@trezor/utils/src/bigNumber'; -import type { Account } from 'src/types/wallet'; -import { useTranslation } from 'src/hooks/suite'; import { Translation } from 'src/components/suite'; +import { useTranslation } from 'src/hooks/suite'; +import type { Account } from 'src/types/wallet'; import { + OutputElementLine, TransactionReviewOutputElement, TransactionReviewOutputElementProps, - OutputElementLine, } from './TransactionReviewOutputElement'; const getFeeLabel = (networkType: NetworkType) => { diff --git a/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewOutputElement.tsx b/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewOutputElement.tsx index 827f6986b8f..a62e9be8c9e 100644 --- a/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewOutputElement.tsx +++ b/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewOutputElement.tsx @@ -2,25 +2,25 @@ import { ReactNode } from 'react'; import styled from 'styled-components'; +import { NetworkSymbol } from '@suite-common/wallet-config'; +import { TokenAddress } from '@suite-common/wallet-types'; +import { formatAmount, formatNetworkAmount } from '@suite-common/wallet-utils'; import { - H4, - Column, - Row, - InfoItem, - Text, Card, + Column, Divider, - Icon, DotIndicator, + H4, + Icon, + InfoItem, + Row, + Text, } from '@trezor/components'; import { TokenInfo } from '@trezor/connect'; -import { formatNetworkAmount, formatAmount } from '@suite-common/wallet-utils'; import { spacings } from '@trezor/theme'; -import { NetworkSymbol } from '@suite-common/wallet-config'; -import { TokenAddress } from '@suite-common/wallet-types'; +import { Address, FiatValue, FormattedCryptoAmount, Translation } from 'src/components/suite'; import { Account } from 'src/types/wallet'; -import { FiatValue, FormattedCryptoAmount, Translation, Address } from 'src/components/suite'; const getCardanoFingerprint = ( tokens: Account['tokens'], diff --git a/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewOutputList.tsx b/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewOutputList.tsx index b9f46c9bb7f..b665d40cb01 100644 --- a/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewOutputList.tsx +++ b/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewOutputList.tsx @@ -2,17 +2,17 @@ import { useEffect, useRef } from 'react'; import styled from 'styled-components'; -import { Banner, Column, H4, Text } from '@trezor/components'; import type { GeneralPrecomposedTransactionFinal } from '@suite-common/wallet-types'; import { ReviewOutput, StakeType } from '@suite-common/wallet-types'; +import { Banner, Column, H4, Text } from '@trezor/components'; import { spacings, spacingsPx } from '@trezor/theme'; -import type { Account } from 'src/types/wallet'; import { Translation } from 'src/components/suite'; +import type { Account } from 'src/types/wallet'; -import { TransactionReviewTotalOutput } from './TransactionReviewTotalOutput'; import { TransactionReviewOutput } from './TransactionReviewOutput'; import type { TransactionReviewOutputElementProps } from './TransactionReviewOutputElement'; +import { TransactionReviewTotalOutput } from './TransactionReviewTotalOutput'; export type TransactionReviewOutputListProps = { account: Account; diff --git a/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewTotalOutput.tsx b/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewTotalOutput.tsx index 8ff598498f4..eb52948d726 100644 --- a/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewTotalOutput.tsx +++ b/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewTotalOutput.tsx @@ -1,21 +1,21 @@ -import { BigNumber } from '@trezor/utils/src/bigNumber'; +import { NetworkType } from '@suite-common/wallet-config'; +import { selectSelectedDevice } from '@suite-common/wallet-core'; +import { Account, GeneralPrecomposedTransactionFinal, StakeType } from '@suite-common/wallet-types'; import { - isTestnet, - getIsUpdatedSendFlow, getIsUpdatedEthereumSendFlow, + getIsUpdatedSendFlow, + isTestnet, } from '@suite-common/wallet-utils'; -import { selectSelectedDevice } from '@suite-common/wallet-core'; -import { Account, GeneralPrecomposedTransactionFinal, StakeType } from '@suite-common/wallet-types'; import { BulletListItemState } from '@trezor/components'; -import { NetworkType } from '@suite-common/wallet-config'; +import { BigNumber } from '@trezor/utils/src/bigNumber'; -import { TrezorDevice } from 'src/types/suite'; import { Translation } from 'src/components/suite/Translation'; import { useSelector } from 'src/hooks/suite/useSelector'; +import { TrezorDevice } from 'src/types/suite'; import { - TransactionReviewOutputElement, OutputElementLine, + TransactionReviewOutputElement, } from './TransactionReviewOutputElement'; const getLines = ( diff --git a/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewSummary.tsx b/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewSummary.tsx index c1d50ace9d4..f7e1bd8b484 100644 --- a/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewSummary.tsx +++ b/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewSummary.tsx @@ -1,15 +1,15 @@ -import { getFeeUnits, getFee } from '@suite-common/wallet-utils'; -import { Box, IconButton, Note, Row, Text } from '@trezor/components'; import { formatDuration } from '@suite-common/suite-utils'; import { NetworkType, networks } from '@suite-common/wallet-config'; import { FeeInfo, GeneralPrecomposedTransactionFinal, StakeType } from '@suite-common/wallet-types'; +import { getFee, getFeeUnits } from '@suite-common/wallet-utils'; +import { Box, IconButton, Note, Row, Text } from '@trezor/components'; import { CoinLogo } from '@trezor/product-components'; import { spacings } from '@trezor/theme'; -import { Translation, AccountLabel } from 'src/components/suite'; -import { Account } from 'src/types/wallet'; +import { AccountLabel, Translation } from 'src/components/suite'; import { useSelector } from 'src/hooks/suite/useSelector'; import { selectLabelingDataForSelectedAccount } from 'src/reducers/suite/metadataReducer'; +import { Account } from 'src/types/wallet'; const getEstimatedTime = ( networkType: NetworkType,