Skip to content

Commit

Permalink
Additional fixes for double tab opened with metamask://dapp/ schema (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
andreahaku authored May 25, 2022
1 parent f038c72 commit fc971dc
Showing 1 changed file with 5 additions and 11 deletions.
16 changes: 5 additions & 11 deletions app/core/DeeplinkManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -208,9 +208,10 @@ class DeeplinkManager {
`${PROTOCOLS.DAPP}/${PROTOCOLS.HTTPS}://`,
`${PROTOCOLS.DAPP}/`,
)
.replace(`${PROTOCOLS.DAPP}/${PROTOCOLS.HTTP}://`, `${PROTOCOLS.DAPP}/`)
.replace(
`${PROTOCOLS.DAPP}/${PROTOCOLS.HTTP}://`,
`${PROTOCOLS.DAPP}/`,
`${PROTOCOLS.METAMASK}://${PROTOCOLS.DAPP}/`,
`${PROTOCOLS.DAPP}://`,
),
);
let params;
Expand Down Expand Up @@ -322,6 +323,7 @@ class DeeplinkManager {
// For ex. go to settings
case PROTOCOLS.METAMASK:
handled();

if (url.startsWith('metamask://wc')) {
const cleanUrlObj = new URL(urlObj.query.replace('?uri=', ''));
const href = cleanUrlObj.href;
Expand All @@ -334,16 +336,8 @@ class DeeplinkManager {
params?.autosign,
origin,
);
} else if (url.startsWith('metamask://dapp/')) {
try {
this._handleBrowserUrl(
urlObj.href.split('metamask://dapp/')[1],
browserCallBack,
);
} catch (e) {
if (e) Alert.alert(strings('deeplink.invalid'), e.toString());
}
}

break;
default:
return false;
Expand Down

0 comments on commit fc971dc

Please sign in to comment.