feat: Bitcoin alignment: networks by darioAnongba · Pull Request #17232 · MetaMask/metamask-mobile

darioAnongba · 2025-07-15T16:48:51Z

Description

Align Bitcoin features with extension: Add networks and account types.

Changelog

CHANGELOG entry:

Related issues

Fixes: https://consensyssoftware.atlassian.net/browse/NWNT-404

Manual testing steps

Use Beta build
Create a Bitcoin account
See Bitcoin network in the network list

Screenshots/Recordings

Before

After

Pre-merge author checklist

I’ve followed MetaMask Contributor Docs and MetaMask Mobile Coding Standards.
I've completed the PR template to the best of my ability
I’ve included tests if applicable
I’ve documented my code using JSDoc format if applicable
I’ve applied the right labels on the PR (see labeling guidelines). Not required for external contributors.

Pre-merge reviewer checklist

I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed).
I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots.

github-actions · 2025-07-15T16:49:00Z

CLA Signature Action: All authors have signed the CLA. You may need to manually re-run the blocking PR check if it doesn't pass in a few minutes.

github-actions · 2025-07-17T15:24:15Z

Bitrise

✅✅✅ pr_smoke_e2e_pipeline passed on Bitrise! ✅✅✅

Commit hash: 4ccb934
Build link: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/67688daa-f206-4b42-abc2-102030ed3c62

Note

You can kick off another pr_smoke_e2e_pipeline on Bitrise by removing and re-applying the Run Smoke E2E label on the pull request

ccharly

Code LGTM for accounts owned files (haven't tested though):

app/core/SnapKeyring/MultichainWalletSnapClient.test.ts
app/core/SnapKeyring/MultichainWalletSnapClient.ts
app/core/SnapKeyring/utils/getMultichainAccountName.test.ts
app/core/SnapKeyring/utils/getMultichainAccountName.ts

Could you also update the "Manual steps" section, so other would know how to test that during RC validation, thanks! 😄

codecov-commenter · 2025-07-21T13:18:09Z

Codecov Report

Attention: Patch coverage is 89.85507% with 7 lines in your changes missing coverage. Please review.

Project coverage is 73.75%. Comparing base (9d8183d) to head (da022d2).

Files with missing lines	Patch %	Lines
...ents/Views/AddAccountActions/AddAccountActions.tsx	75.00%	1 Missing and 1 partial ⚠️
...mponents/Views/NetworkSelector/NetworkSelector.tsx	80.00%	1 Missing and 1 partial ⚠️
...onents/UI/Tokens/TokenList/TokenListItem/index.tsx	0.00%	1 Missing ⚠️
...nTransactionsView/MultichainTransactionsFooter.tsx	50.00%	1 Missing ⚠️
...ainTransactionsView/MultichainTransactionsView.tsx	80.00%	0 Missing and 1 partial ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main   #17232      +/-   ##
==========================================
- Coverage   73.75%   73.75%   -0.01%     
==========================================
  Files        2846     2846              
  Lines       63622    63629       +7     
  Branches    10390    10393       +3     
==========================================
+ Hits        46926    46929       +3     
- Misses      13668    13672       +4     
  Partials     3028     3028

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

cursor

Bug: Chain ID Mismatch Causes Transaction URL Errors

The ActivityView component passes an incorrect chainId to MultichainTransactionsView when a non-EVM account is selected. The currentChainId is obtained using selectChainId, which returns an EVM chain ID (e.g., "0x1"). However, MultichainTransactionsView expects a CAIP chain ID format (e.g., "eip155:1") for non-EVM transactions. This mismatch results in incorrect block explorer URLs for transactions on non-EVM networks (e.g., Bitcoin, Solana) and can lead to parsing errors.

app/components/Views/ActivityView/index.js#L108-L218

metamask-mobile/app/components/Views/ActivityView/index.js

Lines 108 to 218 in 16a7004

    
           ); 
        
           const currentChainId = useSelector(selectChainId); 
        
           const isAllNetworks = useSelector(selectIsAllNetworks); 
        
           const isPopularNetwork = useSelector(selectIsPopularNetwork); 
        
           const isEvmSelected = useSelector(selectIsEvmNetworkSelected); 
        
           const networkName = useSelector(selectNetworkName); 
        
           const hasOrders = useSelector((state) => getHasOrders(state) || false); 
        
           const accountsByChainId = useSelector(selectAccountsByChainId); 
        
           const tabViewRef = useRef(); 
        
           const params = useParams(); 
        
           const isTestnetOrNotPopularNetwork = 
        
             isTestNet(currentChainId) || !isPopularNetwork; 
        
           const openAccountSelector = useCallback(() => { 
        
             navigation.navigate(Routes.MODAL.ROOT_MODAL_FLOW, { 
        
               screen: Routes.SHEET.ACCOUNT_SELECTOR, 
        
             }); 
        
             // Track Event: "Opened Acount Switcher" 
        
             trackEvent( 
        
               createEventBuilder(MetaMetricsEvents.BROWSER_OPEN_ACCOUNT_SWITCH) 
        
                 .addProperties({ 
        
                   number_of_accounts: Object.keys( 
        
                     accountsByChainId[selectedAddress] ?? {}, 
        
                   ).length, 
        
                 }) 
        
                 .build(), 
        
             ); 
        
           }, [ 
        
             navigation, 
        
             accountsByChainId, 
        
             selectedAddress, 
        
             trackEvent, 
        
             createEventBuilder, 
        
           ]); 
        
           const showFilterControls = () => { 
        
             navigation.navigate(...createTokenBottomSheetFilterNavDetails({})); 
        
           }; 
        
           useEffect( 
        
             () => { 
        
               const title = 
        
                 hasOrders ?? false ? 'activity_view.title' : 'transactions_view.title'; 
        
               navigation.setOptions( 
        
                 getTransactionsNavbarOptions( 
        
                   title, 
        
                   colors, 
        
                   navigation, 
        
                   selectedAddress, 
        
                   openAccountSelector, 
        
                 ), 
        
               ); 
        
             }, 
        
             /* eslint-disable-next-line */ 
        
             [navigation, hasOrders, colors, selectedAddress, openAccountSelector], 
        
           ); 
        
           const renderTabBar = () => (hasOrders ? <TabBar /> : <View />); 
        
           useFocusEffect( 
        
             useCallback(() => { 
        
               if (hasOrders && params.redirectToOrders) { 
        
                 navigation.setParams({ redirectToOrders: false }); 
        
                 tabViewRef.current?.goToPage(1); 
        
               } 
        
             }, [hasOrders, navigation, params.redirectToOrders]), 
        
           ); 
        
           return ( 
        
             <ErrorBoundary navigation={navigation} view="ActivityView"> 
        
               <View style={[styles.header, { marginTop: insets.top }]}> 
        
                 <Text 
        
                   style={styles.title} 
        
                   variant={DEFAULT_HEADERBASE_TITLE_TEXTVARIANT} 
        
                 > 
        
                   {strings('transactions_view.title')} 
        
                 </Text> 
        
               </View> 
        
               <View style={styles.wrapper}> 
        
                 <View style={styles.controlButtonOuterWrapper}> 
        
                   <ButtonBase 
        
                     testID={WalletViewSelectorsIDs.TOKEN_NETWORK_FILTER} 
        
                     label={ 
        
                       <Text numberOfLines={1} style={styles.titleText}> 
        
                         {isAllNetworks && isPopularNetwork && isEvmSelected 
        
                           ? strings('wallet.popular_networks') 
        
                           : networkName ?? strings('wallet.current_network')} 
        
                       </Text> 
        
                     } 
        
                     isDisabled={isTestnetOrNotPopularNetwork} 
        
                     onPress={isEvmSelected ? showFilterControls : () => null} 
        
                     endIconName={isEvmSelected ? IconName.ArrowDown : undefined} 
        
                     style={ 
        
                       isTestNet(currentChainId) || !isPopularNetwork 
        
                         ? styles.controlButtonDisabled 
        
                         : styles.controlButton 
        
                     } 
        
                     disabled={isTestNet(currentChainId) || !isPopularNetwork} 
        
                   /> 
        
                 </View> 
        
                 <ScrollableTabView 
        
                   ref={tabViewRef} 
        
                   renderTabBar={renderTabBar} 
        
                   locked={!hasOrders} 
        
                 > 
        
                   {selectedAddress && isNonEvmAddress(selectedAddress) ? ( 
        
                     <MultichainTransactionsView 
        
                       tabLabel={strings('transactions_view.title')} 
        
                       chainId={currentChainId} 
        
                     />

Fix in Cursor • Fix in Web

Was this report helpful? Give feedback by reacting with 👍 or 👎

sonarqubecloud · 2025-07-21T16:27:53Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
90.3% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

first pass

f9ca82a

darioAnongba self-assigned this Jul 15, 2025

metamaskbot added the team-networks Networks team label Jul 15, 2025

darioAnongba added 2 commits July 16, 2025 11:48

Merge branch 'main' into feat/bitcoin-alignment

08977fb

yarn.lock

0c5be3c

darioAnongba added the No QA Needed Apply this label when your PR does not need any QA effort. label Jul 16, 2025

darioAnongba added 20 commits July 16, 2025 17:47

format

834cfd6

unit

45ca03a

rebase

59d149e

lint

f0a4a9b

snapshot

de5969f

Merge branch 'main' into feat/bitcoin-alignment

b06e937

feature flags

d7c13e1

snapshot

29970d9

snapshots

465e56b

tickers

01a022d

revert perps

45302f3

unit

4a918d6

initial state

6196bbf

revert asset changes

2aa484f

lint

0c1f63c

remove perps

1a38274

snapshots

a517eb4

more snapshots

5b89ef9

more snapshots

c1bbba5

rebase

4ccb934

darioAnongba added the Run Smoke E2E label Jul 17, 2025

metamaskbot added the bitrise-result-ready label Jul 17, 2025

github-actions Bot removed the bitrise-result-ready label Jul 17, 2025

Daniel-Cross previously approved these changes Jul 18, 2025

View reviewed changes

gambinish previously approved these changes Jul 18, 2025

View reviewed changes

ccharly previously approved these changes Jul 21, 2025

View reviewed changes

rebase

da022d2

darioAnongba dismissed stale reviews from ccharly, gambinish, and Daniel-Cross via da022d2 July 21, 2025 13:01

This comment was marked as outdated.

Sign in to view

darioAnongba requested review from Daniel-Cross, ccharly and gambinish July 21, 2025 13:14

ccharly previously approved these changes Jul 21, 2025

View reviewed changes

gambinish previously approved these changes Jul 21, 2025

View reviewed changes

rebase

16a7004

darioAnongba dismissed stale reviews from gambinish and ccharly via 16a7004 July 21, 2025 15:01

cursor Bot reviewed Jul 21, 2025

View reviewed changes

gambinish approved these changes Jul 21, 2025

View reviewed changes

ccharly approved these changes Jul 21, 2025

View reviewed changes

vinnyhoward approved these changes Jul 21, 2025

View reviewed changes

darioAnongba added this pull request to the merge queue Jul 21, 2025

Merged via the queue into main with commit 2737a7d Jul 21, 2025
87 of 100 checks passed

darioAnongba deleted the feat/bitcoin-alignment branch July 21, 2025 20:13

github-actions Bot locked and limited conversation to collaborators Jul 21, 2025

metamaskbot added the release-7.53.0 Issue or pull request that will be included in release 7.53.0 label Jul 21, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

feat: Bitcoin alignment: networks#17232

feat: Bitcoin alignment: networks#17232
darioAnongba merged 27 commits into
mainfrom
feat/bitcoin-alignment

darioAnongba commented Jul 15, 2025 •

edited

Loading

Uh oh!

github-actions Bot commented Jul 15, 2025

Uh oh!

github-actions Bot commented Jul 17, 2025 •

edited by metamaskbot

Loading

Uh oh!

ccharly left a comment

Uh oh!

This comment was marked as outdated.

Uh oh!

codecov-commenter commented Jul 21, 2025

Uh oh!

cursor Bot left a comment

Uh oh!

sonarqubecloud Bot commented Jul 21, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

	);
	const currentChainId = useSelector(selectChainId);
	const isAllNetworks = useSelector(selectIsAllNetworks);
	const isPopularNetwork = useSelector(selectIsPopularNetwork);
	const isEvmSelected = useSelector(selectIsEvmNetworkSelected);
	const networkName = useSelector(selectNetworkName);
	const hasOrders = useSelector((state) => getHasOrders(state) \|\| false);
	const accountsByChainId = useSelector(selectAccountsByChainId);
	const tabViewRef = useRef();
	const params = useParams();

	const isTestnetOrNotPopularNetwork =
	isTestNet(currentChainId) \|\| !isPopularNetwork;

	const openAccountSelector = useCallback(() => {
	navigation.navigate(Routes.MODAL.ROOT_MODAL_FLOW, {
	screen: Routes.SHEET.ACCOUNT_SELECTOR,
	});
	// Track Event: "Opened Acount Switcher"
	trackEvent(
	createEventBuilder(MetaMetricsEvents.BROWSER_OPEN_ACCOUNT_SWITCH)
	.addProperties({
	number_of_accounts: Object.keys(
	accountsByChainId[selectedAddress] ?? {},
	).length,
	})
	.build(),
	);
	}, [
	navigation,
	accountsByChainId,
	selectedAddress,
	trackEvent,
	createEventBuilder,
	]);

	const showFilterControls = () => {
	navigation.navigate(...createTokenBottomSheetFilterNavDetails({}));
	};

	useEffect(
	() => {
	const title =
	hasOrders ?? false ? 'activity_view.title' : 'transactions_view.title';
	navigation.setOptions(
	getTransactionsNavbarOptions(
	title,
	colors,
	navigation,
	selectedAddress,
	openAccountSelector,
	),
	);
	},
	/* eslint-disable-next-line */
	[navigation, hasOrders, colors, selectedAddress, openAccountSelector],
	);

	const renderTabBar = () => (hasOrders ? <TabBar /> : <View />);

	useFocusEffect(
	useCallback(() => {
	if (hasOrders && params.redirectToOrders) {
	navigation.setParams({ redirectToOrders: false });
	tabViewRef.current?.goToPage(1);
	}
	}, [hasOrders, navigation, params.redirectToOrders]),
	);

	return (
	<ErrorBoundary navigation={navigation} view="ActivityView">
	<View style={[styles.header, { marginTop: insets.top }]}>
	<Text
	style={styles.title}
	variant={DEFAULT_HEADERBASE_TITLE_TEXTVARIANT}
	>
	{strings('transactions_view.title')}
	</Text>
	</View>
	<View style={styles.wrapper}>
	<View style={styles.controlButtonOuterWrapper}>
	<ButtonBase
	testID={WalletViewSelectorsIDs.TOKEN_NETWORK_FILTER}
	label={
	<Text numberOfLines={1} style={styles.titleText}>
	{isAllNetworks && isPopularNetwork && isEvmSelected
	? strings('wallet.popular_networks')
	: networkName ?? strings('wallet.current_network')}
	</Text>
	}
	isDisabled={isTestnetOrNotPopularNetwork}
	onPress={isEvmSelected ? showFilterControls : () => null}
	endIconName={isEvmSelected ? IconName.ArrowDown : undefined}
	style={
	isTestNet(currentChainId) \|\| !isPopularNetwork
	? styles.controlButtonDisabled
	: styles.controlButton
	}
	disabled={isTestNet(currentChainId) \|\| !isPopularNetwork}
	/>
	</View>
	<ScrollableTabView
	ref={tabViewRef}
	renderTabBar={renderTabBar}
	locked={!hasOrders}
	>
	{selectedAddress && isNonEvmAddress(selectedAddress) ? (
	<MultichainTransactionsView
	tabLabel={strings('transactions_view.title')}
	chainId={currentChainId}
	/>

Uh oh!

Conversation

darioAnongba commented Jul 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Changelog

Related issues

Manual testing steps

Screenshots/Recordings

Before

After

Pre-merge author checklist

Pre-merge reviewer checklist

Uh oh!

github-actions Bot commented Jul 15, 2025

Uh oh!

github-actions Bot commented Jul 17, 2025 • edited by metamaskbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Bitrise

Uh oh!

ccharly left a comment

Choose a reason for hiding this comment

Uh oh!

This comment was marked as outdated.

Uh oh!

codecov-commenter commented Jul 21, 2025

Codecov Report

Uh oh!

cursor Bot left a comment

Choose a reason for hiding this comment

Bug: Chain ID Mismatch Causes Transaction URL Errors

Uh oh!

sonarqubecloud Bot commented Jul 21, 2025

Quality Gate passed

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

darioAnongba commented Jul 15, 2025 •

edited

Loading

github-actions Bot commented Jul 17, 2025 •

edited by metamaskbot

Loading