Skip to content

chore(runway): cherry-pick fix: cp-7.60.0 Generate correct blockchain explorer urls on bridge txs #23311

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 26, 2025
+529 −53
Merged

chore(runway): cherry-pick fix: cp-7.60.0 Generate correct blockchain explorer urls on bridge txs #23311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions app/components/UI/Bridge/components/TransactionDetails/BlockExplorersModal.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,11 @@ describe('BlockExplorersModal', () => {
},
{ state: mockState },
);
const etherscanButtons = getAllByText('Etherscan');
expect(etherscanButtons).toHaveLength(2);
const etherscanButton = getAllByText('Etherscan');
expect(etherscanButton).toHaveLength(1);

const optimisticButton = getAllByText('Optimistic');
expect(optimisticButton).toHaveLength(1);
});

it('should handle missing destination chain transaction hash', () => {
Expand Down
19 changes: 10 additions & 9 deletions app/components/UI/Bridge/hooks/useMultichainBlockExplorerTxUrl/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@ import {
formatChainIdToCaip,
isNonEvmChainId,
} from '@metamask/bridge-controller';
import etherscanLink from '@metamask/etherscan-link';
import { useSelector } from 'react-redux';
import {
createProviderConfig,
selectEvmNetworkConfigurationsByChainId,
} from '../../../../../selectors/networkController';
import { useMemo } from 'react';
import { NetworkConfiguration } from '@metamask/network-controller';
import useBlockExplorer from '../../../Swaps/utils/useBlockExplorer';
import useBlockExplorer from '../../../../hooks/useBlockExplorer';
import { getTransactionUrl } from '../../../../../core/Multichain/utils';
import {
getBlockExplorerName,
getNetworkImageSource,
} from '../../../../../util/networks';
import { Hex } from '@metamask/utils';
import { selectNonEvmNetworkConfigurationsByChainId } from '../../../../../selectors/multichainNetworkController';

const useEvmBlockExplorer = useBlockExplorer;
import { getEtherscanBaseUrl } from '../../../../../util/etherscan';

const getProviderConfigForNetwork = (networkConfig: NetworkConfiguration) => {
const rpcEndpoint =
Expand Down Expand Up @@ -66,10 +66,7 @@ export const useMultichainBlockExplorerTxUrl = ({
[evmNetworkConfig],
);

const evmExplorer = useEvmBlockExplorer(
evmNetworkConfigurations,
evmProviderConfig,
);
const blockExplorer = useBlockExplorer();

// Handle undefined cases
if (!chainId || !txHash) {
Expand All @@ -85,7 +82,11 @@ export const useMultichainBlockExplorerTxUrl = ({
explorerTxUrl = getTransactionUrl(txHash, formatChainIdToCaip(chainId));
} else {
// EVM
explorerTxUrl = evmExplorer.tx(txHash);
const baseUrl =
blockExplorer.getEvmBlockExplorerUrl(formatChainIdToHex(chainId)) ??
getEtherscanBaseUrl(evmProviderConfig?.type ?? '');

explorerTxUrl = etherscanLink.createCustomExplorerLink(txHash, baseUrl);
}

// Get network image source
Expand All @@ -97,7 +98,7 @@ export const useMultichainBlockExplorerTxUrl = ({
const explorerName =
isNonEvm && explorerTxUrl
? getBlockExplorerName(explorerTxUrl)
: evmExplorer.name;
: blockExplorer.getBlockExplorerName(formatChainIdToCaip(chainId));

const chainName =
isNonEvm && formattedChainId
Expand Down
Loading
Loading