Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions shared/lib/transactions.utils.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,30 @@ import {
getPostQuoteWithdrawTransactionType,
isPostQuoteWithdrawTransaction,
isPerpsWithdrawTransaction,
isValidTransactionHash,
} from './transactions.utils';

describe('Transactions utils', () => {
describe('isValidTransactionHash', () => {
it('returns true for a valid EVM transaction hash', () => {
expect(
isValidTransactionHash(
'0x8586e162e456a23c1969573a4b79e77912705b474bc5aa0c2a63d56556623ab2',
),
).toBe(true);
});

it('returns false for invalid EVM transaction hashes', () => {
expect(
isValidTransactionHash('48a75190-45ca-11ef-9001-f3886ec2397c'),
).toBe(false);
});

it('returns false for truncated EVM hashes', () => {
expect(isValidTransactionHash('0x1234')).toBe(false);
});
});

describe('isBatchTransaction', () => {
it('returns true when nestedTransactions has items', () => {
const nested: NestedTransactionMetadata[] = [{ to: '0x1', data: '0x' }];
Expand Down
5 changes: 5 additions & 0 deletions shared/lib/transactions.utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ import {
TransactionMeta,
TransactionType,
} from '@metamask/transaction-controller';
import { isStrictHexString } from '@metamask/utils';

export function isValidTransactionHash(hash: string) {
return hash.length === 66 && isStrictHexString(hash);
}

/**
* Determines if a transaction is a batch transaction.
Expand Down
8 changes: 7 additions & 1 deletion ui/pages/details/components/sections.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { NetworkName } from '../../../components/app/transaction/network-name';
import { TransactionStatus } from '../../../components/app/transaction/transaction-status';
import { AccountName } from '../../../components/app/transaction/account-name';
import { TransactionId } from '../../../components/app/transaction/transaction-id';
import { isValidTransactionHash } from '../../../../shared/lib/transactions.utils';
import { Row, Section } from './shared';
import { TokenRow } from './token-row';

Expand Down Expand Up @@ -50,6 +51,11 @@ export function MetadataSection({
const { formatDateTime } = useFormatters();
const accountAddress = item.data.from;
const showAddressRows = Boolean(addressRows?.from && addressRows?.to);
const txId =
item.hash &&
(!item.chainId.startsWith('eip155:') || isValidTransactionHash(item.hash))
? item.hash
: undefined;

return (
<Section>
Expand Down Expand Up @@ -85,7 +91,7 @@ export function MetadataSection({

<Row
label={t('transactionIdLabel')}
value={<TransactionId value={item.hash} />}
value={txId ? <TransactionId value={txId} /> : null}
/>
</Section>
);
Expand Down
12 changes: 9 additions & 3 deletions ui/pages/details/components/shared.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
} from '../../../../shared/constants/multichain/networks';
import { CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP } from '../../../../shared/constants/common';
import { formatBlockExplorerTransactionUrl } from '../../../../shared/lib/multichain/networks';
import { isValidTransactionHash } from '../../../../shared/lib/transactions.utils';

export function getExplorerTxUrl({
chainId,
Expand All @@ -19,7 +20,12 @@ export function getExplorerTxUrl({
txHash: string | undefined;
blockExplorerUrl: string | undefined;
}): string | undefined {
if (!txHash) {
const txId =
txHash && (!chainId.startsWith('eip155:') || isValidTransactionHash(txHash))
? txHash
: undefined;

if (!txId) {
return undefined;
}

Expand All @@ -29,7 +35,7 @@ export function getExplorerTxUrl({
];

if (nonEvmExplorerUrls) {
return formatBlockExplorerTransactionUrl(nonEvmExplorerUrls, txHash);
return formatBlockExplorerTransactionUrl(nonEvmExplorerUrls, txId);
}

const hexChainId = getMaybeHexChainId(chainId);
Expand All @@ -41,7 +47,7 @@ export function getExplorerTxUrl({
return undefined;
}

return `${explorerRoot.replace(/\/$/u, '')}/tx/${txHash}`;
return `${explorerRoot.replace(/\/$/u, '')}/tx/${txId}`;
}

export function useBlockExplorerUrl(
Expand Down
10 changes: 9 additions & 1 deletion ui/pages/details/templates/bridge-details.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import { NetworkName } from '../../../components/app/transaction/network-name';
import { TransactionStatus } from '../../../components/app/transaction/transaction-status';
import { AccountName } from '../../../components/app/transaction/account-name';
import { TransactionId } from '../../../components/app/transaction/transaction-id';
import { isValidTransactionHash } from '../../../../shared/lib/transactions.utils';
import { Footer, Row, Section } from '../components/shared';
import { TokenRow } from '../components/token-row';
import { FeesRows, TotalAmountRow } from '../components/amounts-section';
Expand Down Expand Up @@ -90,6 +91,13 @@ export function BridgeDetails({
);

const sourceTxHash = item.hash;
const txId =
sourceTxHash &&
(!sourceChainId.startsWith('eip155:') ||
isValidTransactionHash(sourceTxHash))
? sourceTxHash
: undefined;

const { destTxHash, destinationAccountAddress, fromAddress } = useSelector(
(state) => {
const bridgeHistoryItem = sourceTxHash
Expand Down Expand Up @@ -191,7 +199,7 @@ export function BridgeDetails({
/>
<Row
label={t('transactionIdLabel')}
value={<TransactionId value={sourceTxHash} />}
value={txId ? <TransactionId value={txId} /> : null}

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Point of interest

/>
</Section>

Expand Down
Loading