Skip to content

chore(runway): cherry-pick fix: cp-7.45.0 use correct default etherscan link on tx details #15351

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
NicolasMassart merged 2 commits into from
May 16, 2025
Merged

chore(runway): cherry-pick fix: cp-7.45.0 use correct default etherscan link on tx details #15351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a105450
chore(runway): cherry-pick fix: cp-7.45.0 use correct default ethersc…
Prithpal-Sooriya Apr 24, 2025
b6730f7
fix faulty merge
NicolasMassart May 15, 2025
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
204 changes: 113 additions & 91 deletions app/components/UI/TransactionElement/TransactionDetails/index.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { MOCK_ACCOUNTS_CONTROLLER_STATE } from '../../../../util/test/accountsCo
import renderWithProvider from '../../../../util/test/renderWithProvider';
import { createStackNavigator } from '@react-navigation/stack';
import { mockNetworkState } from '../../../../util/test/network';
import type { NetworkState } from '@metamask/network-controller';

const Stack = createStackNavigator();
const mockEthQuery = {
Expand Down Expand Up @@ -55,13 +56,6 @@ const initialState = {
...backgroundState,
AccountsController: MOCK_ACCOUNTS_CONTROLLER_STATE,
},
// NetworkController: {
// ...mockNetworkState({
// chainId: '0x89',
// id: 'Polygon',
// nickname: 'Polygon',
// }),
// },
SmartTransactionsController: {
smartTransactionsState: {
liveness: 'live',
Expand Down Expand Up @@ -219,112 +213,140 @@ describe('TransactionDetails', () => {
expect(toJSON()).toMatchSnapshot();
});

it('should view transaction details on etherscan', () => {
const arrangeBlockExplorerTest = () => {
jest.mocked(query).mockResolvedValueOnce(123).mockResolvedValueOnce({
timestamp: 1234,
l1Fee: '0x1',
});

const { getByText } = renderComponent({
state: {
...initialState,
engine: {
...initialState.engine,
backgroundState: {
...initialState.engine.backgroundState,
NetworkController: {
'0x1': {
chainId: '0x1',
blockExplorerUrls: [],
rpcEndpoints: [
{
rpcUrl: 'https://mainnet.infura.io/v3/123',
chainId: '0x1',
nickname: 'Mainnet',
ticker: 'ETH',
},
],
defaultRpcEndpointIndex: 0,
name: 'Mainnet',
nativeCurrency: 'ETH',
},
const mockState = {
...initialState,
engine: {
...initialState.engine,
backgroundState: {
...initialState.engine.backgroundState,
NetworkController: {
'0x1': {
chainId: '0x1',
blockExplorerUrls: [],
rpcEndpoints: [
{
rpcUrl: 'https://mainnet.infura.io/v3/123',
chainId: '0x1',
nickname: 'Mainnet',
ticker: 'ETH',
},
],
defaultRpcEndpointIndex: 0,
name: 'Mainnet',
nativeCurrency: 'ETH',
},
},
} as unknown as NetworkState,
},
},
hash: '0x3',
txParams: {
multiLayerL1FeeTotal: '0x1',
};

const mockProps = {
networkId: '0x1',
};

return {
mockState,
mockProps,
};
};

const arrangeActAssertBlockExplorerTest = (props: {
buttonText: string;
expectedUrl: string;
overrideMocks?: (
mocks: ReturnType<typeof arrangeBlockExplorerTest>,
) => void;
}) => {
// Arrange
const mocks = arrangeBlockExplorerTest();
props.overrideMocks?.(mocks);

const { getByText } = renderComponent({
state: mocks.mockState,
networkId: mocks.mockProps.networkId,
});

fireEvent.press(getByText(props.buttonText));

expect(navigationMock.push).toHaveBeenCalledWith('Webview', {
params: expect.objectContaining({ url: props.expectedUrl }),
screen: 'SimpleWebview',
});
};

it('should view transaction details on etherscan', () => {
arrangeActAssertBlockExplorerTest({
overrideMocks: (mocks) => {
mocks.mockState.engine.backgroundState.NetworkController =
mockNetworkState({
chainId: '0x1',
id: 'mainnet',
nickname: 'Ethereum Mainnet',
ticker: 'ETH',
});
mocks.mockProps.networkId = '0x1';
},
buttonText: 'VIEW ON Etherscan',
expectedUrl: 'https://etherscan.io/tx/0x3',
});
const etherscanButton = getByText('VIEW ON Etherscan');
expect(etherscanButton).toBeDefined();
fireEvent.press(etherscanButton);
expect(navigationMock.push).toHaveBeenCalled();
});

it('should display explorer link for linea mainnet', () => {
jest.mocked(query).mockResolvedValueOnce(123).mockResolvedValueOnce({
timestamp: 1234,
l1Fee: '0x1',
});

const { getByText } = renderComponent({
state: {
...initialState,
engine: {
...initialState.engine,
backgroundState: {
...initialState.engine.backgroundState,
NetworkController: {
...mockNetworkState({
chainId: '0xe708',
id: 'linea',
nickname: 'Linea Mainnet',
ticker: 'ETH',
}),
},
},
},
arrangeActAssertBlockExplorerTest({
overrideMocks: (mocks) => {
mocks.mockState.engine.backgroundState.NetworkController =
mockNetworkState({
chainId: '0xe708',
id: 'linea',
nickname: 'Linea Mainnet',
ticker: 'ETH',
});
mocks.mockProps.networkId = '0xe708';
},
networkId: '0xe708',
buttonText: 'VIEW ON Lineascan',
expectedUrl: 'https://lineascan.build/tx/0x3',
});
const etherscanButton = getByText('VIEW ON Lineascan');
expect(etherscanButton).toBeDefined();
fireEvent.press(etherscanButton);
expect(navigationMock.push).toHaveBeenCalled();
});

it('should display explorer link for sepolia mainnet', () => {
jest.mocked(query).mockResolvedValueOnce(123).mockResolvedValueOnce({
timestamp: 1234,
l1Fee: '0x1',
arrangeActAssertBlockExplorerTest({
overrideMocks: (mocks) => {
mocks.mockState.engine.backgroundState.NetworkController =
mockNetworkState({
chainId: '0xaa36a7',
id: 'sepolia',
nickname: 'Sepolia Mainnet',
ticker: 'ETH',
});
mocks.mockProps.networkId = '0xaa36a7';
},
buttonText: 'VIEW ON Sepolia',
expectedUrl: 'https://sepolia.etherscan.io/tx/0x3',
});
});

const { getByText } = renderComponent({
state: {
...initialState,
engine: {
...initialState.engine,
backgroundState: {
...initialState.engine.backgroundState,
NetworkController: {
...mockNetworkState({
chainId: '0xaa36a7',
id: 'sepolia',
nickname: 'Sepolia Mainnet',
ticker: 'ETH',
}),
},
},
},
it('should display explorer link for custom network', () => {
arrangeActAssertBlockExplorerTest({
overrideMocks: (mocks) => {
mocks.mockState.engine.backgroundState.NetworkController =
mockNetworkState({
chainId: '0x1337',
id: '123-123-123',
nickname: 'My Custom Network',
ticker: 'FOO',
blockExplorerUrl: 'https://custom-block-explorer.net',
});
mocks.mockProps.networkId = '0x1337';
},
networkId: '0xaa36a7',
buttonText: 'VIEW ON Custom-block-explorer',
expectedUrl: 'https://custom-block-explorer.net/tx/0x3',
});
const etherscanButton = getByText('VIEW ON Sepolia');
expect(etherscanButton).toBeDefined();
fireEvent.press(etherscanButton);
expect(navigationMock.push).toHaveBeenCalled();
});

it('should render speed up and cancel buttons', async () => {
Expand Down
2 changes: 1 addition & 1 deletion app/components/Views/confirmations/legacy/SendFlow/SendTo/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ class SendFlow extends PureComponent {

safeChecksumAddress = (address) => {
try {
return toChecksumAddress(address);
return safeToChecksumAddress(address);
} catch (error) {
return address;
}
Expand Down
2 changes: 1 addition & 1 deletion app/constants/urls.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export const MM_ETHERSCAN_URL = 'https://etherscamdb.info/domain/meta-mask.com';
export const LINEA_GOERLI_BLOCK_EXPLORER = 'https://goerli.lineascan.build';
export const LINEA_SEPOLIA_BLOCK_EXPLORER = 'https://sepolia.lineascan.build';
export const LINEA_MAINNET_BLOCK_EXPLORER = 'https://lineascan.build';
export const MAINNET_BLOCK_EXPLORER = 'https://etherscan.com';
export const MAINNET_BLOCK_EXPLORER = 'https://etherscan.io';
export const SEPOLIA_BLOCK_EXPLORER = 'https://sepolia.etherscan.io';

// Rpcs
Expand Down
Loading