Skip to content
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

Handle network changes for incoming deeplink and qr code requests. #3650

Merged
merged 13 commits into from
Feb 8, 2022
Merged

Handle network changes for incoming deeplink and qr code requests. #3650

Changes from 4 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
94573f7
Add support for main and test networks on Send requests.
Fatxx Jan 19, 2022
2fb1c88
Improve comment description
Fatxx Jan 19, 2022
c459c4a
Merge branch 'develop' into fix/requesting-token-doesnt-respect-network
Fatxx Jan 26, 2022
be585c9
Merge branch 'main' into fix/requesting-token-doesnt-respect-network
Fatxx Jan 26, 2022
f557064
Merge branch 'main' into fix/requesting-token-doesnt-respect-network
Fatxx Feb 1, 2022
bedd3ee
Merge branch 'main' into fix/requesting-token-doesnt-respect-network
Fatxx Feb 2, 2022
468094e
Improve network switch handling on Send requests received.
Fatxx Feb 4, 2022
c249f0c
Merge branch 'main' into fix/requesting-token-doesnt-respect-network
Fatxx Feb 4, 2022
33b3411
Wrap handleEthereumUrl actions with networkSwitch handler
Fatxx Feb 4, 2022
fb7de44
Add undefined check
Fatxx Feb 7, 2022
614f149
Improved copy
Fatxx Feb 8, 2022
ffd1a58
Add check to see if network is the same
Fatxx Feb 8, 2022
7872016
Merge branch 'main' into fix/requesting-token-doesnt-respect-network
Fatxx Feb 8, 2022
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
24 changes: 24 additions & 0 deletions app/components/Views/Send/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import { MAINNET } from '../../../constants/network';
import BigNumber from 'bignumber.js';
import { WalletDevice } from '@metamask/controllers/';
import { getTokenList } from '../../../reducers/tokens';
import { getNetworkTypeById } from '../../../util/networks';

const REVIEW = 'review';
const EDIT = 'edit';
Expand Down Expand Up @@ -352,8 +353,31 @@ class Send extends PureComponent {
* @param switchToChainId - Corresponding chain id for new network
*/
handleNetworkSwitch = (switchToChainId) => {
try {
const networkType = getNetworkTypeById(switchToChainId);
if (networkType) {
const { NetworkController, CurrencyRateController } = Engine.context;
CurrencyRateController.setNativeCurrency('ETH');
NetworkController.setProviderType(networkType);
this.props.showAlert({
isVisible: true,
autodismiss: 5000,
content: 'clipboard-alert',
data: { msg: strings('send.warn_network_change') + networkType },
});
return;
}
} catch (e) {
/**
* If we can't get the network type we don't need to throw an error,
* since it can still be a custom RPC network
*/
}

const { frequentRpcList } = this.props;

const rpc = frequentRpcList.find(({ chainId }) => chainId === switchToChainId);

if (rpc) {
const { rpcUrl, chainId, ticker, nickname } = rpc;
const { NetworkController, CurrencyRateController } = Engine.context;
Expand Down