Handle network changes for incoming deeplink and qr code requests.

app/components/Nav/App/index.js

@@ -118,6 +118,9 @@ const App = ({ userLoggedIn }) => {
 	const dispatch = useDispatch();
 	const triggerCheckedAuth = () => dispatch(checkedAuth('onboarding'));
 	const triggerSetCurrentRoute = (route) => dispatch(setCurrentRoute(route));
+	const frequentRpcList = useSelector(
+		(state) => state?.engine?.backgroundState?.PreferencesController?.frequentRpcList
+	);
 
 	const handleDeeplink = useCallback(({ error, params, uri }) => {
 		if (error) {
@@ -155,16 +158,19 @@ const App = ({ userLoggedIn }) => {
 
 	useEffect(() => {
 		SharedDeeplinkManager.init({
-			navigate: (routeName, opts) => {
-				const params = { name: routeName, params: opts };
-				navigator.current?.dispatch?.(CommonActions.navigate(params));
+			navigation: {
+				navigate: (routeName, opts) => {
+					const params = { name: routeName, params: opts };
+					navigator.current?.dispatch?.(CommonActions.navigate(params));
+				},
 			},
+			frequentRpcList,
+			dispatch,
 		});
 
 		unsubscribeFromBranch.current = branchSubscriber.subscribe();
-
 		return () => unsubscribeFromBranch.current?.();
-	}, [branchSubscriber]);
+	}, [branchSubscriber, frequentRpcList, dispatch]);
 
 	useEffect(() => {
 		const initAnalytics = async () => {

app/components/UI/ReceiveRequest/index.js

@@ -242,7 +242,7 @@ class ReceiveRequest extends PureComponent {
 									}}
 								>
 									<QRCode
-										value={`ethereum:${this.props.selectedAddress}`}
+										value={`ethereum:${this.props.selectedAddress}@${this.props.network}`}
 										size={Dimensions.get('window').width / 2}
 									/>
 								</TouchableOpacity>

app/components/Views/Send/index.js

@@ -110,10 +110,6 @@ class Send extends PureComponent {
 		/* dApp transaction modal visible or not
 		*/
 		dappTransactionModalVisible: PropTypes.bool,
-		/**
-		 * A list of custom RPCs to provide the user
-		 */
-		frequentRpcList: PropTypes.array,
 		/**
 		 * List of tokens from TokenListController
 		 */
@@ -260,9 +256,6 @@ class Send extends PureComponent {
 		parameters = null,
 	}) => {
 		const { addressBook, network, identities, selectedAddress } = this.props;
-		if (chain_id) {
-			this.handleNetworkSwitch(chain_id);
-		}
 
 		let newTxMeta = {};
 		switch (action) {
@@ -346,28 +339,6 @@ class Send extends PureComponent {
 		this.mounted && this.setState({ ready: true, transactionKey: Date.now() });
 	};
 
-	/**
-	 * Method in charge of changing network if is needed
-	 *
-	 * @param switchToChainId - Corresponding chain id for new network
-	 */
-	handleNetworkSwitch = (switchToChainId) => {
-		const { frequentRpcList } = this.props;
-		const rpc = frequentRpcList.find(({ chainId }) => chainId === switchToChainId);
-		if (rpc) {
-			const { rpcUrl, chainId, ticker, nickname } = rpc;
-			const { NetworkController, CurrencyRateController } = Engine.context;
-			CurrencyRateController.setNativeCurrency(ticker);
-			NetworkController.setRpcTarget(rpcUrl, chainId, ticker, nickname);
-			this.props.showAlert({
-				isVisible: true,
-				autodismiss: 5000,
-				content: 'clipboard-alert',
-				data: { msg: strings('send.warn_network_change') + nickname },
-			});
-		}
-	};
-
 	/**
 	 * Retrieves ERC20 asset information (symbol and decimals) to be used with deeplinks
 	 *

app/core/DeeplinkManager.js

@@ -11,11 +11,14 @@ import { generateApproveData } from '../util/transactions';
 import { strings } from '../../locales/i18n';
 import { getNetworkTypeById } from '../util/networks';
 import { WalletDevice } from '@metamask/controllers/';
+import { showAlert } from '../actions/alert';
 
 class DeeplinkManager {
-	constructor(_navigation) {
-		this.navigation = _navigation;
+	constructor({ navigation, frequentRpcList, dispatch }) {
+		this.navigation = navigation;
 		this.pendingDeeplink = null;
+		this.frequentRpcList = frequentRpcList;
+		this.dispatch = dispatch;
 	}
 
 	setDeeplink = (url) => (this.pendingDeeplink = url);
@@ -24,6 +27,52 @@ class DeeplinkManager {
 
 	expireDeeplink = () => (this.pendingDeeplink = null);
 
+	/**
+	 * Method in charge of changing network if is needed
+	 *
+	 * @param switchToChainId - Corresponding chain id for new network
+	 */
+	handleNetworkSwitch = (switchToChainId) => {
+		const { NetworkController, CurrencyRateController } = Engine.context;
+
+		// If current network is the same as the one we want to switch to, do nothing
+		if (NetworkController?.state?.provider?.chainId === switchToChainId) {
+			return;
+		}
+
+		const rpc = this.frequentRpcList.find(({ chainId }) => chainId === switchToChainId);
+
+		if (rpc) {
+			const { rpcUrl, chainId, ticker, nickname } = rpc;
+			CurrencyRateController.setNativeCurrency(ticker);
+			NetworkController.setRpcTarget(rpcUrl, chainId, ticker, nickname);
+			this.dispatch(
+				showAlert({
+					isVisible: true,
+					autodismiss: 5000,
+					content: 'clipboard-alert',
+					data: { msg: strings('send.warn_network_change') + nickname },
+				})
+			);
+			return;
+		}
+
+		const networkType = getNetworkTypeById(switchToChainId);
+
+		if (networkType) {
+			CurrencyRateController.setNativeCurrency('ETH');
+			NetworkController.setProviderType(networkType);
+			this.dispatch(
+				showAlert({
+					isVisible: true,
+					autodismiss: 5000,
+					content: 'clipboard-alert',
+					data: { msg: strings('send.warn_network_change') + networkType },
+				})
+			);
+		}
+	};
+
 	async handleEthereumUrl(url, origin) {
 		let ethUrl = '';
 		try {
@@ -33,45 +82,49 @@ class DeeplinkManager {
 			return;
 		}
 
-		const functionName = ethUrl.function_name;
-		if (!functionName) {
-			const txMeta = { ...ethUrl, source: url };
-			if (ethUrl.parameters?.value) {
+		try {
+			// Validate and switch network before performing any other action
+			this.handleNetworkSwitch(ethUrl.chain_id);
+			const functionName = ethUrl.function_name;
+			if (!functionName) {
+				const txMeta = { ...ethUrl, source: url };
+				if (ethUrl.parameters?.value) {
+					this.navigation.navigate('SendView', {
+						screen: 'Send',
+						params: { txMeta: { ...txMeta, action: 'send-eth' } },
+					});
+				} else {
+					this.navigation.navigate('SendFlowView', { screen: 'SendTo', params: { txMeta } });
+				}
+			} else if (functionName === 'transfer') {
+				const txMeta = { ...ethUrl, source: url };
 				this.navigation.navigate('SendView', {
 					screen: 'Send',
-					params: { txMeta: { ...txMeta, action: 'send-eth' } },
+					params: { txMeta: { ...txMeta, action: 'send-token' } },
 				});
-			} else {
-				this.navigation.navigate('SendFlowView', { screen: 'SendTo', params: { txMeta } });
+			} else if (functionName === 'approve') {
+				// add approve transaction
+				const {
+					parameters: { address, uint256 },
+					target_address,
+				} = ethUrl;
+				const { TransactionController, PreferencesController } = Engine.context;
+				const txParams = {};
+				txParams.to = `${target_address}`;
+				txParams.from = `${PreferencesController.state.selectedAddress}`;
+				txParams.value = '0x0';
+				const uint256Number = Number(uint256);
+				if (Number.isNaN(uint256Number)) throw new Error('The parameter uint256 should be a number');
+				if (!Number.isInteger(uint256Number)) throw new Error('The parameter uint256 should be an integer');
+				const value = uint256Number.toString(16);
+				txParams.data = generateApproveData({ spender: address, value });
+				TransactionController.addTransaction(txParams, origin, WalletDevice.MM_MOBILE);
 			}
-		} else if (functionName === 'transfer') {
-			const txMeta = { ...ethUrl, source: url };
-			this.navigation.navigate('SendView', {
-				screen: 'Send',
-				params: { txMeta: { ...txMeta, action: 'send-token' } },
-			});
-		} else if (functionName === 'approve') {
-			// add approve transaction
-			const {
-				parameters: { address, uint256 },
-				target_address,
-				chain_id,
-			} = ethUrl;
-			const { TransactionController, PreferencesController, NetworkController } = Engine.context;
-			if (chain_id) {
-				const newNetworkType = getNetworkTypeById(chain_id);
-				NetworkController.setProviderType(newNetworkType);
-			}
-			const txParams = {};
-			txParams.to = `${target_address}`;
-			txParams.from = `${PreferencesController.state.selectedAddress}`;
-			txParams.value = '0x0';
-			const uint256Number = Number(uint256);
-			if (Number.isNaN(uint256Number)) throw new Error('The parameter uint256 should be a number');
-			if (!Number.isInteger(uint256Number)) throw new Error('The parameter uint256 should be an integer');
-			const value = uint256Number.toString(16);
-			txParams.data = generateApproveData({ spender: address, value });
-			TransactionController.addTransaction(txParams, origin, WalletDevice.MM_MOBILE);
+		} catch (e) {
+			Alert.alert(
+				strings('send.network_not_found_title'),
+				strings('send.network_not_found_description', { chain_id: ethUrl.chain_id })
+			);
 		}
 	}
 
@@ -202,8 +255,8 @@ class DeeplinkManager {
 let instance = null;
 
 const SharedDeeplinkManager = {
-	init: (navigation) => {
-		instance = new DeeplinkManager(navigation);
+	init: ({ navigation, frequentRpcList, dispatch }) => {
+		instance = new DeeplinkManager({ navigation, frequentRpcList, dispatch });
 	},
 	parse: (url, args) => instance.parse(url, args),
 	setDeeplink: (url) => instance.setDeeplink(url),

ios/MetaMask.xcodeproj/project.pbxproj

@@ -961,7 +961,6 @@
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -1004,7 +1003,6 @@
 				COPY_PHASE_STRIP = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;

locales/languages/en.json

@@ -261,7 +261,9 @@
 		"warn_network_change": "Network changed to ",
 		"send_to": "Send to",
 		"amount": "Amount",
-		"confirm": "Confirm"
+		"confirm": "Confirm",
+		"network_not_found_title": "Network not found",
+		"network_not_found_description": "Network with chain id {{chain_id}} not found in your wallet. Please add the network first."
 	},
 	"deposit": {
 		"title": "Deposit"