Skip to content

fix: use push navigation for Bridge asset details #26123

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
bfullam merged 1 commit into from
Feb 16, 2026
+31 −13
Merged

fix: use push navigation for Bridge asset details #26123

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
25 changes: 17 additions & 8 deletions app/components/UI/Bridge/components/BridgeTokenSelector/BridgeTokenSelector.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,14 @@ const renderWithReduxProvider = (component: React.ReactElement) =>

const mockSetOptions = jest.fn();
const mockNavigate = jest.fn();
const mockNavigationDispatch = jest.fn();
let mockRouteParams: { type: 'source' | 'dest' } = { type: 'source' };

jest.mock('@react-navigation/native', () => ({
...jest.requireActual('@react-navigation/native'),
useNavigation: () => ({
navigate: mockNavigate,
dispatch: mockNavigationDispatch,
goBack: jest.fn(),
setOptions: mockSetOptions,
}),
Expand Down Expand Up @@ -399,6 +401,7 @@ const resetMocks = () => {
mockSelectedToken = null;
mockFormatAddressToAssetId.mockReturnValue('eip155:1/erc20:0x1234');
mockIsNonEvmChainId.mockReturnValue(false);
mockNavigationDispatch.mockReset();
};

describe('tokenToIncludeAsset', () => {
Expand Down Expand Up @@ -690,15 +693,21 @@ describe('BridgeTokenSelector', () => {
await act(async () => {
fireEvent.press(getByTestId('button-icon-info'));
});
expect(mockNavigate).toHaveBeenCalledWith(
'Asset',
expect(mockNavigationDispatch).toHaveBeenCalledWith(
expect.objectContaining({
symbol: 'USDC',
name: 'USD Coin',
assetId: 'eip155:1/erc20:0x1234567890123456789012345678901234567890',
chainId: '0x1',
decimals: 18,
image: 'https://example.com/token.png',
type: 'PUSH',
payload: expect.objectContaining({
name: 'Asset',
params: expect.objectContaining({
symbol: 'USDC',
name: 'USD Coin',
assetId:
'eip155:1/erc20:0x1234567890123456789012345678901234567890',
chainId: '0x1',
decimals: 18,
image: 'https://example.com/token.png',
}),
}),
}),
);
expect(mockTrackEvent).toHaveBeenCalled();
Expand Down
19 changes: 14 additions & 5 deletions app/components/UI/Bridge/components/BridgeTokenSelector/BridgeTokenSelector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,12 @@ import {
ListRenderItemInfo,
} from 'react-native';
import { SafeAreaView } from 'react-native-safe-area-context';
import { useNavigation, useRoute, RouteProp } from '@react-navigation/native';
import {
useNavigation,
useRoute,
RouteProp,
StackActions,
} from '@react-navigation/native';
import { useSelector, useDispatch } from 'react-redux';
import { strings } from '../../../../../../locales/i18n';
import { getHeaderCompactStandardNavbarOptions } from '../../../../../component-library/components-temp/HeaderCompactStandard';
Expand Down Expand Up @@ -371,10 +376,14 @@ export const BridgeTokenSelector: React.FC = () => {
);
const networkName = chainData?.name ?? '';

navigation.navigate('Asset', {
...item,
source: TokenDetailsSource.Swap,
});
// Use push so we always open details for the tapped token.
// navigate('Asset') can reuse an existing Asset route with stale params.
navigation.dispatch(
StackActions.push('Asset', {
...item,
source: TokenDetailsSource.Swap,
}),
);

Engine.context.BridgeController.trackUnifiedSwapBridgeEvent(
UnifiedSwapBridgeEventName.AssetDetailTooltipClicked,
Expand Down
Loading