Skip to content

Commit cecd222

Browse files
cursoragentn3ps
andcommitted
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 6fefc12 commit cecd222

12 files changed

+47
-47
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ import { Hex } from 'viem';
66
import type {
77
TransactionViewModel,
88
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';
9+
} from '~shared/lib/multichain/types';
10+
import { TransactionDetailsModal as LegacyTransactionDetailsModal } from '~ui/pages/confirmations/components/activity';
11+
import { PAY_TRANSACTION_TYPES } from '~ui/pages/confirmations/constants/pay';
12+
import { useTransactionDisplayData } from '~ui/hooks/useTransactionDisplayData';
13+
import { getStatusKey } from '~ui/helpers/utils/transactions.util';
14+
import { formatDateWithYearContext } from '~ui/helpers/utils/util';
1515
import LegacyTransactionListItemDetails from '../../app/transaction-list-item-details';
1616
import TransactionStatusLabel from '../../app/transaction-status-label/transaction-status-label';
17-
import { getSelectedAddress } from '../../../selectors/selectors';
18-
import { formatUnits } from '../../../../shared/lib/unit';
17+
import { getSelectedAddress } from '~ui/selectors/selectors';
18+
import { formatUnits } from '~shared/lib/unit';
1919
import { useGetTitle } from './hooks';
2020

2121
// eslint-disable-next-line no-empty-function

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ 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';
6+
import { useFormatters } from '~ui/hooks/useFormatters';
7+
import type { TransactionViewModel } from '~shared/lib/multichain/types';
8+
import { getCurrentCurrency } from '~ui/ducks/metamask/metamask';
99
import { ChainBadge } from '../../app/chain-badge/chain-badge';
1010
import { getPrimaryAmount } from './helpers';
1111
import { useGetTitle, useFiatAmount } from './hooks';

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,17 @@ 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';
7+
import { useI18nContext } from '~ui/hooks/useI18nContext';
8+
import { useScrollContainer } from '~ui/contexts/scroll-container';
99
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';
10+
import { PENDING_STATUS_HASH } from '~ui/helpers/constants/transactions';
11+
import { selectLocalTransactions } from '~ui/selectors/activity';
12+
import { selectEvmAddress } from '~ui/selectors/accounts';
13+
import { selectCurrentAccountNonEvmTransactions } from '~ui/selectors/multichain-transactions';
14+
import { selectEnabledNetworksAsCaipChainIds } from '~ui/selectors/multichain/networks';
15+
import { useEarliestNonceByChain } from '~ui/hooks/useEarliestNonceByChain';
16+
import type { TransactionViewModel } from '~shared/lib/multichain/types';
17+
import { formatDateWithYearContext } from '~ui/helpers/utils/util';
1818
import AssetListControlBar from '../../app/assets/asset-list/asset-list-control-bar';
1919
import {
2020
mergeAllTransactionsByTime,

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';
3+
import { TransactionGroupCategory } from '~shared/constants/transaction';
44
import TransactionIcon from '../../app/transaction-icon/transaction-icon';
5-
import type { TransactionViewModel } from '../../../../shared/lib/multichain/types';
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import type { TransactionMeta } from '@metamask/transaction-controller';
2-
import { NATIVE_TOKEN_ADDRESS } from '../../../../shared/constants/transaction';
2+
import { NATIVE_TOKEN_ADDRESS } from '~shared/constants/transaction';
33
import type {
44
Token,
55
TransactionGroup,
66
TransactionViewModel,
7-
} from '../../../../shared/lib/multichain/types';
7+
} from '~shared/lib/multichain/types';
88
import {
99
getPrimaryAmount,
1010
calculateFiatFromMarketRates,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import type {
44
TokenAmount,
55
TransactionGroup,
66
TransactionViewModel,
7-
} from '../../../../shared/lib/multichain/types';
8-
import { formatUnits } from '../../../../shared/lib/unit';
7+
} from '~shared/lib/multichain/types';
8+
import { formatUnits } from '~shared/lib/unit';
99

1010
export type FlattenedItem =
1111
| { type: 'date-header'; date: number }

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React from 'react';
22
import { Provider } from 'react-redux';
33
import configureMockStore from 'redux-mock-store';
44
import { renderHook as renderHookBase } from '@testing-library/react-hooks';
5-
import type { TransactionViewModel } from '../../../../shared/lib/multichain/types';
5+
import type { TransactionViewModel } from '~shared/lib/multichain/types';
66
import { useGetTitle } from './hooks';
77

88
jest.mock('../../../hooks/useI18nContext', () => ({

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
import { useCallback, useMemo } from 'react';
22
import { useSelector } from 'react-redux';
33
import { useInfiniteQuery, useQueryClient } from '@tanstack/react-query';
4-
import { useI18nContext } from '../../../hooks/useI18nContext';
4+
import { useI18nContext } from '~ui/hooks/useI18nContext';
55
import type {
66
Token,
77
TransactionViewModel,
8-
} from '../../../../shared/lib/multichain/types';
9-
import { NETWORK_TO_NAME_MAP } from '../../../../shared/constants/network';
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 { SET_APPROVAL_FOR_ALL } from '../../../../shared/constants/transaction';
15-
import { selectEnabledNetworksAsCaipChainIds } from '../../../selectors/multichain/networks';
16-
import { selectRequiredTransactionHashes } from '../../../selectors/transactionController';
17-
import { queries } from '../../../helpers/queries';
18-
import { selectTransactions } from '../../../../shared/lib/multichain/transformations';
8+
} from '~shared/lib/multichain/types';
9+
import { NETWORK_TO_NAME_MAP } from '~shared/constants/network';
10+
import { selectMarketRates } from '~ui/selectors/activity';
11+
import { selectEvmAddress } from '~ui/selectors/accounts';
12+
import { getUseExternalServices } from '~ui/selectors';
13+
import { parseApprovalTransactionData } from '~shared/modules/transaction.utils';
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 { selectTransactions } from '~shared/lib/multichain/transformations';
1919
import { calculateFiatFromMarketRates } from './helpers';
2020

2121
function useTransactionParams() {

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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ import { Text } from '@metamask/design-system-react';
77
import {
88
useMultichainTransactionDisplay,
99
KEYRING_TRANSACTION_STATUS_KEY,
10-
} from '../../../hooks/useMultichainTransactionDisplay';
11-
import { TransactionGroupCategory } from '../../../../shared/constants/transaction';
10+
} from '~ui/hooks/useMultichainTransactionDisplay';
11+
import { TransactionGroupCategory } from '~shared/constants/transaction';
1212
import TransactionIcon from '../../app/transaction-icon/transaction-icon';
1313
import TransactionStatusLabel from '../../app/transaction-status-label/transaction-status-label';
1414
import { formatTimestamp } from '../../app/multichain-transaction-details-modal/helpers';
1515
import { ActivityListItem as LegacyActivityListItem } from '../activity-list-item';
1616
import { ChainBadge } from '../../app/chain-badge/chain-badge';
17-
import { selectBridgeHistoryForAccountGroup } from '../../../ducks/bridge-status/selectors';
17+
import { selectBridgeHistoryForAccountGroup } from '~ui/ducks/bridge-status/selectors';
1818
import LegacyMultichainBridgeListItem from '../../app/multichain-bridge-transaction-list-item/multichain-bridge-transaction-list-item';
1919

2020
type Props = {

0 commit comments

Comments
 (0)