Skip to content

Commit cd2483e

Browse files
cursoragentn3ps
cursoragent
and
n3ps
committed
refactor: use ~shared and ~ui aliases in activity-v2
Convert 47 deep relative imports to aliases across all 12 activity-v2 files. Sibling/parent imports remain relative. Co-authored-by: Francis Nepomuceno <n3ps@users.noreply.github.com>
1 parent 00e6477 commit cd2483e

12 files changed

+65
-68
lines changed

‎ui/components/multichain/activity-v2/activity-details-modal-adapter.tsx‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@ import { useSelector } from 'react-redux';
33
import { TransactionType } from '@metamask/transaction-controller';
44
import { toHex } from '@metamask/controller-utils';
55
import { Hex } from 'viem';
6-
import type {
7-
TransactionViewModel,
8-
TransactionGroup,
9-
} from '../../../../shared/lib/multichain/types';
10-
import { TransactionDetailsModal as LegacyTransactionDetailsModal } from '../../../pages/confirmations/components/activity';
11-
import { PAY_TRANSACTION_TYPES } from '../../../pages/confirmations/constants/pay';
12-
import { useTransactionDisplayData } from '../../../hooks/useTransactionDisplayData';
13-
import { getStatusKey } from '../../../helpers/utils/transactions.util';
14-
import { formatDateWithYearContext } from '../../../helpers/utils/util';
156
import LegacyTransactionListItemDetails from '../../app/transaction-list-item-details';
167
import TransactionStatusLabel from '../../app/transaction-status-label/transaction-status-label';
17-
import { getSelectedAddress } from '../../../selectors/selectors';
18-
import { formatUnits } from '../../../../shared/lib/unit';
19-
import { useBridgeActivityData } from '../../../hooks/bridge/useBridgeActivityData';
208
import { useGetTitle } from './hooks';
219
import { resolveTransactionType } from './helpers';
10+
import type {
11+
TransactionViewModel,
12+
TransactionGroup,
13+
} from '~shared/lib/multichain/types';
14+
import { TransactionDetailsModal as LegacyTransactionDetailsModal } from '~ui/pages/confirmations/components/activity';
15+
import { PAY_TRANSACTION_TYPES } from '~ui/pages/confirmations/constants/pay';
16+
import { useTransactionDisplayData } from '~ui/hooks/useTransactionDisplayData';
17+
import { getStatusKey } from '~ui/helpers/utils/transactions.util';
18+
import { formatDateWithYearContext } from '~ui/helpers/utils/util';
19+
import { getSelectedAddress } from '~ui/selectors/selectors';
20+
import { formatUnits } from '~shared/lib/unit';
21+
import { useBridgeActivityData } from '~ui/hooks/bridge/useBridgeActivityData';
2222

2323
// eslint-disable-next-line no-empty-function
2424
const noop = () => {};

‎ui/components/multichain/activity-v2/activity-list-item.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ import { useSelector } from 'react-redux';
33
import { Box, Text, TextVariant } from '@metamask/design-system-react';
44
import { TransactionStatus } from '@metamask/transaction-controller';
55
import TransactionStatusLabel from '../../app/transaction-status-label/transaction-status-label';
6-
import { useFormatters } from '../../../hooks/useFormatters';
7-
import type { TransactionViewModel } from '../../../../shared/lib/multichain/types';
8-
import { getCurrentCurrency } from '../../../ducks/metamask/metamask';
9-
import { useBridgeActivityData } from '../../../hooks/bridge/useBridgeActivityData';
106
import { ChainBadge } from '../../app/chain-badge/chain-badge';
117
import { getPrimaryAmount } from './helpers';
128
import { useGetTitle, useFiatAmount } from './hooks';
139
import { ActivityTxIcon } from './activity-tx-icon';
10+
import { useFormatters } from '~ui/hooks/useFormatters';
11+
import type { TransactionViewModel } from '~shared/lib/multichain/types';
12+
import { getCurrentCurrency } from '~ui/ducks/metamask/metamask';
13+
import { useBridgeActivityData } from '~ui/hooks/bridge/useBridgeActivityData';
1414

1515
type Props = {
1616
transaction: TransactionViewModel;

‎ui/components/multichain/activity-v2/activity-list.tsx‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,7 @@ import { useVirtualizer } from '@tanstack/react-virtual';
44
import { Box, Text } from '@metamask/design-system-react';
55
import type { Transaction } from '@metamask/keyring-api';
66
import { toEvmCaipChainId } from '@metamask/multichain-network-controller';
7-
import { useI18nContext } from '../../../hooks/useI18nContext';
8-
import { useScrollContainer } from '../../../contexts/scroll-container';
97
import { TransactionActivityEmptyState } from '../../app/transaction-activity-empty-state';
10-
import { PENDING_STATUS_HASH } from '../../../helpers/constants/transactions';
11-
import { selectLocalTransactions } from '../../../selectors/activity';
12-
import { selectEvmAddress } from '../../../selectors/accounts';
13-
import { selectCurrentAccountNonEvmTransactions } from '../../../selectors/multichain-transactions';
14-
import { selectEnabledNetworksAsCaipChainIds } from '../../../selectors/multichain/networks';
15-
import { useEarliestNonceByChain } from '../../../hooks/useEarliestNonceByChain';
16-
import type { TransactionViewModel } from '../../../../shared/lib/multichain/types';
17-
import { formatDateWithYearContext } from '../../../helpers/utils/util';
188
import AssetListControlBar from '../../app/assets/asset-list/asset-list-control-bar';
199
import {
2010
mergeAllTransactionsByTime,
@@ -32,6 +22,16 @@ import { LocalActivityListItem } from './local-activity-list-item';
3222
import { NonEvmActivityListItem } from './non-evm-activity-list-item';
3323
import { NonEvmDetailsModal } from './non-evm-details-modal';
3424
import { useTransactionsQuery } from './hooks';
25+
import { useI18nContext } from '~ui/hooks/useI18nContext';
26+
import { useScrollContainer } from '~ui/contexts/scroll-container';
27+
import { PENDING_STATUS_HASH } from '~ui/helpers/constants/transactions';
28+
import { selectLocalTransactions } from '~ui/selectors/activity';
29+
import { selectEvmAddress } from '~ui/selectors/accounts';
30+
import { selectCurrentAccountNonEvmTransactions } from '~ui/selectors/multichain-transactions';
31+
import { selectEnabledNetworksAsCaipChainIds } from '~ui/selectors/multichain/networks';
32+
import { useEarliestNonceByChain } from '~ui/hooks/useEarliestNonceByChain';
33+
import type { TransactionViewModel } from '~shared/lib/multichain/types';
34+
import { formatDateWithYearContext } from '~ui/helpers/utils/util';
3535

3636
const ITEM_HEIGHT = 70;
3737
const HEADER_HEIGHT = 36;

‎ui/components/multichain/activity-v2/activity-tx-icon.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import React from 'react';
22
import { TransactionStatus } from '@metamask/transaction-controller';
3-
import { TransactionGroupCategory } from '../../../../shared/constants/transaction';
43
import TransactionIcon from '../../app/transaction-icon/transaction-icon';
5-
import type { TransactionViewModel } from '../../../../shared/lib/multichain/types';
4+
import { TransactionGroupCategory } from '~shared/constants/transaction';
5+
import type { TransactionViewModel } from '~shared/lib/multichain/types';
66

77
function getIconCategory(tx: TransactionViewModel) {
88
const { transactionCategory } = tx;

‎ui/components/multichain/activity-v2/helpers.test.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,6 @@ import {
22
TransactionType,
33
type TransactionMeta,
44
} from '@metamask/transaction-controller';
5-
import { NATIVE_TOKEN_ADDRESS } from '../../../../shared/constants/transaction';
6-
import type {
7-
Token,
8-
TransactionGroup,
9-
TransactionViewModel,
10-
} from '../../../../shared/lib/multichain/types';
115
import {
126
getPrimaryAmount,
137
calculateFiatFromMarketRates,
@@ -18,6 +12,12 @@ import {
1812
matchesLocalTransaction,
1913
matchesNonEvmTransaction,
2014
} from './helpers';
15+
import { NATIVE_TOKEN_ADDRESS } from '~shared/constants/transaction';
16+
import type {
17+
Token,
18+
TransactionGroup,
19+
TransactionViewModel,
20+
} from '~shared/lib/multichain/types';
2121

2222
const ethToken: Token = {
2323
address: NATIVE_TOKEN_ADDRESS,

‎ui/components/multichain/activity-v2/helpers.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import type {
66
TokenAmount,
77
TransactionGroup,
88
TransactionViewModel,
9-
} from '../../../../shared/lib/multichain/types';
10-
import { NATIVE_TOKEN_ADDRESS } from '../../../../shared/constants/transaction';
11-
import { formatUnits } from '../../../../shared/lib/unit';
9+
} from '~shared/lib/multichain/types';
10+
import { NATIVE_TOKEN_ADDRESS } from '~shared/constants/transaction';
11+
import { formatUnits } from '~shared/lib/unit';
1212

1313
export type AssetScope =
1414
| { kind: 'native'; caipAssetType?: string }

‎ui/components/multichain/activity-v2/hooks.test.tsx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ import {
55
act,
66
renderHook as renderHookBase,
77
} from '@testing-library/react-hooks';
8-
import type { TransactionViewModel } from '../../../../shared/lib/multichain/types';
9-
import { TransactionGroupCategory } from '../../../../shared/constants/transaction';
10-
import * as useBridgeActivityDataHook from '../../../hooks/bridge/useBridgeActivityData';
11-
import { ChainInfo } from '../../../pages/bridge/utils/tx-details';
128
import {
139
useGetTitle,
1410
usePrefetchTransactions,
1511
useTransactionsQuery,
1612
} from './hooks';
13+
import type { TransactionViewModel } from '~shared/lib/multichain/types';
14+
import { TransactionGroupCategory } from '~shared/constants/transaction';
15+
import * as useBridgeActivityDataHook from '~ui/hooks/bridge/useBridgeActivityData';
16+
import { ChainInfo } from '~ui/pages/bridge/utils/tx-details';
1717

1818
const mockUseInfiniteQuery = jest.fn();
1919
const mockUseQueryClient = jest.fn();
@@ -24,13 +24,13 @@ jest.mock('@tanstack/react-query', () => ({
2424
useQueryClient: () => mockUseQueryClient(),
2525
}));
2626

27-
jest.mock('../../../helpers/queries', () => ({
27+
jest.mock('~ui/helpers/queries', () => ({
2828
queries: {
2929
transactions: (...args: unknown[]) => mockQueriesTransactions(...args),
3030
},
3131
}));
3232

33-
jest.mock('../../../hooks/useI18nContext', () => ({
33+
jest.mock('~ui/hooks/useI18nContext', () => ({
3434
useI18nContext: () => (key: string, args?: string[]) =>
3535
args?.length ? `${key}:${args.join(',')}` : key,
3636
}));

‎ui/components/multichain/activity-v2/hooks.ts‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,20 @@ import { useCallback, useMemo } from 'react';
22
import { useSelector } from 'react-redux';
33
import { useInfiniteQuery, useQueryClient } from '@tanstack/react-query';
44
import type { CaipChainId } from '@metamask/utils';
5-
import { useI18nContext } from '../../../hooks/useI18nContext';
6-
import type {
7-
Token,
8-
TransactionViewModel,
9-
} from '../../../../shared/lib/multichain/types';
10-
import { selectMarketRates } from '../../../selectors/activity';
11-
import { selectEvmAddress } from '../../../selectors/accounts';
12-
import { getUseExternalServices } from '../../../selectors';
13-
import { parseApprovalTransactionData } from '../../../../shared/modules/transaction.utils';
14-
import { selectTransactions } from '../../../../shared/lib/multichain/transformations';
15-
import { SET_APPROVAL_FOR_ALL } from '../../../../shared/constants/transaction';
16-
import { selectEnabledNetworksAsCaipChainIds } from '../../../selectors/multichain/networks';
17-
import { selectRequiredTransactionHashes } from '../../../selectors/transactionController';
18-
import { queries } from '../../../helpers/queries';
19-
import { useBridgeActivityData } from '../../../hooks/bridge/useBridgeActivityData';
205
import { calculateFiatFromMarketRates } from './helpers';
216
import type { ActivityListFilter } from './helpers';
7+
import { useI18nContext } from '~ui/hooks/useI18nContext';
8+
import type { Token, TransactionViewModel } from '~shared/lib/multichain/types';
9+
import { selectMarketRates } from '~ui/selectors/activity';
10+
import { selectEvmAddress } from '~ui/selectors/accounts';
11+
import { getUseExternalServices } from '~ui/selectors';
12+
import { parseApprovalTransactionData } from '~shared/modules/transaction.utils';
13+
import { selectTransactions } from '~shared/lib/multichain/transformations';
14+
import { SET_APPROVAL_FOR_ALL } from '~shared/constants/transaction';
15+
import { selectEnabledNetworksAsCaipChainIds } from '~ui/selectors/multichain/networks';
16+
import { selectRequiredTransactionHashes } from '~ui/selectors/transactionController';
17+
import { queries } from '~ui/helpers/queries';
18+
import { useBridgeActivityData } from '~ui/hooks/bridge/useBridgeActivityData';
2219

2320
function useTransactionParams(caipChainId?: CaipChainId) {
2421
const evmAddress = (useSelector(selectEvmAddress) || '').toLowerCase();

‎ui/components/multichain/activity-v2/local-activity-list-item.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import React from 'react';
22
import LegacyTransactionListItem from '../../app/transaction-list-item';
33
import SmartTransactionListItem from '../../app/transaction-list-item/smart-transaction-list-item.component';
4-
import { isTransactionEarliestNonce } from '../../../hooks/useEarliestNonceByChain';
5-
import type { TransactionGroup } from '../../../../shared/lib/multichain/types';
4+
import { isTransactionEarliestNonce } from '~ui/hooks/useEarliestNonceByChain';
5+
import type { TransactionGroup } from '~shared/lib/multichain/types';
66

77
type Props = {
88
transactionGroup: TransactionGroup;

‎ui/components/multichain/activity-v2/non-evm-activity-list-item.tsx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@ import { TransactionType as KeyringTransactionType } from '@metamask/keyring-api
44
import { isCrossChain } from '@metamask/bridge-controller';
55
import { useSelector } from 'react-redux';
66
import { Text } from '@metamask/design-system-react';
7-
import {
8-
useMultichainTransactionDisplay,
9-
KEYRING_TRANSACTION_STATUS_KEY,
10-
} from '../../../hooks/useMultichainTransactionDisplay';
11-
import { TransactionGroupCategory } from '../../../../shared/constants/transaction';
127
import TransactionIcon from '../../app/transaction-icon/transaction-icon';
138
import TransactionStatusLabel from '../../app/transaction-status-label/transaction-status-label';
149
import { formatTimestamp } from '../../app/multichain-transaction-details-modal/helpers';
1510
import { ActivityListItem as LegacyActivityListItem } from '../activity-list-item';
1611
import { ChainBadge } from '../../app/chain-badge/chain-badge';
17-
import { selectBridgeHistoryForAccountGroup } from '../../../ducks/bridge-status/selectors';
1812
import LegacyMultichainBridgeListItem from '../../app/multichain-bridge-transaction-list-item/multichain-bridge-transaction-list-item';
13+
import { selectBridgeHistoryForAccountGroup } from '~ui/ducks/bridge-status/selectors';
14+
import { TransactionGroupCategory } from '~shared/constants/transaction';
15+
import {
16+
useMultichainTransactionDisplay,
17+
KEYRING_TRANSACTION_STATUS_KEY,
18+
} from '~ui/hooks/useMultichainTransactionDisplay';
1919

2020
type Props = {
2121
transaction: Transaction;

0 commit comments

Comments
 (0)