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

Defaults to current network if chain id not specified in QR codes #3929

Merged
merged 8 commits into from
Apr 28, 2022
Merged

Defaults to current network if chain id not specified in QR codes #3929

Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
49d5692
Default to chain id 1 if not specified
Fatxx Mar 21, 2022
504baa2
Reuse variable instead
Fatxx Mar 21, 2022
a93eac4
Use current network as default instead
Fatxx Mar 22, 2022
197e570
Merge branch 'main' into bugfix/default-to-mainnet-on-deeplinks-qrcodes
Mar 23, 2022
c83094e
Merge branch 'main' into bugfix/default-to-mainnet-on-deeplinks-qrcodes
Mar 23, 2022
c7a2673
Merge branch 'main' into bugfix/default-to-mainnet-on-deeplinks-qrcodes
cortisiko Mar 25, 2022
b31473a
Merge branch 'main' into bugfix/default-to-mainnet-on-deeplinks-qrcodes
Fatxx Apr 21, 2022
75a95b5
Merge branch 'main' into bugfix/default-to-mainnet-on-deeplinks-qrcodes
Fatxx Apr 28, 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
11 changes: 9 additions & 2 deletions app/core/DeeplinkManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,13 @@ class DeeplinkManager {
_handleNetworkSwitch = (switchToChainId) => {
const { NetworkController, CurrencyRateController } = Engine.context;

// If not specified, use the current network
if (!switchToChainId) {
return;
}

// If current network is the same as the one we want to switch to, do nothing
if (NetworkController?.state?.provider?.chainId === switchToChainId) {
if (NetworkController?.state?.provider?.chainId === String(switchToChainId)) {
return;
}

Expand Down Expand Up @@ -117,7 +122,9 @@ class DeeplinkManager {
const txMeta = { ...ethUrl, source: url };

try {
// Validate and switch network before performing any other action
/**
* Validate and switch network before performing any other action
*/
this._handleNetworkSwitch(ethUrl.chain_id);

switch (ethUrl.function_name) {
Expand Down