fix: try fixing X deeplinks by adding $deeplink_path

Author: baptiste-marchand

app/core/AppConstants.ts

@@ -93,6 +93,7 @@ export default {
     },
   },
   MM_UNIVERSAL_LINK_HOST: 'metamask.app.link',
+  MM_UNIVERSAL_LINK_HOST_ALTERNATE: 'metamask-alternate.app.link',
   MM_IO_UNIVERSAL_LINK_HOST: 'link.metamask.io',
   MM_IO_UNIVERSAL_LINK_TEST_HOST: 'link-test.metamask.io',
   MM_DEEP_ITMS_APP_LINK: 'https://metamask.app.link/skAH3BaF99',

app/core/DeeplinkManager/DeeplinkManager.ts

@@ -66,7 +66,10 @@ export class DeeplinkManager {
 
       try {
         const latestParams = await branch.getLatestReferringParams();
-        const deeplink = latestParams?.['+non_branch_link'] as string;
+        const deeplink = latestParams?.$deeplink_path
+          ? `metamask://${latestParams.$deeplink_path}`
+          : (latestParams?.['+non_branch_link'] as string);
+        Logger.log(`getBranchDeeplink - deeplink: ${deeplink}`);
         if (deeplink) {
           handleDeeplink({ uri: deeplink });
         }
@@ -117,12 +120,30 @@ export class DeeplinkManager {
         const branchError = new Error(error);
         Logger.error(branchError, 'Error subscribing to branch.');
       }
-      getBranchDeeplink(opts.uri);
-      //TODO: that async call in the subscribe doesn't look good to me
-      branch.getLatestReferringParams().then((val) => {
-        const deeplink = opts.uri || (val['+non_branch_link'] as string);
-        handleDeeplink({ uri: deeplink });
-      });
+      const uri = opts.uri;
+
+      // If uri is a raw Branch URL (not a resolved deeplink),
+      // try to get routing from Branch params instead
+      const isBranchUrl = uri && /\.(app|test-app)\.link\//.test(uri);
+
+      Logger.log(`Received deeplink: ${uri}, isBranchUrl: ${isBranchUrl}`);
+
+      if (uri && !isBranchUrl) {
+        handleDeeplink({ uri });
+      } else {
+        branch.getLatestReferringParams().then((params) => {
+          Logger.log(
+            `branch.getLatestReferringParams: ${JSON.stringify(params)}`,
+          );
+          const deeplink = params?.$deeplink_path
+            ? `metamask://${params.$deeplink_path}`
+            : (params?.['+non_branch_link'] as string);
+          Logger.log(`branch.subscribe - deeplink: ${deeplink}`);
+          if (deeplink) {
+            handleDeeplink({ uri: deeplink });
+          }
+        });
+      }
     });
   }
 }

app/core/DeeplinkManager/handlers/legacy/handleUniversalLink.ts

@@ -57,6 +57,7 @@ import Logger from '../../../../util/Logger';
 
 const {
   MM_UNIVERSAL_LINK_HOST,
+  MM_UNIVERSAL_LINK_HOST_ALTERNATE,
   MM_IO_UNIVERSAL_LINK_HOST,
   MM_IO_UNIVERSAL_LINK_TEST_HOST,
 } = AppConstants;
@@ -216,6 +217,7 @@ async function handleUniversalLink({
 
   const isSupportedDomain =
     urlObj.hostname === MM_UNIVERSAL_LINK_HOST ||
+    urlObj.hostname === MM_UNIVERSAL_LINK_HOST_ALTERNATE ||
     urlObj.hostname === MM_IO_UNIVERSAL_LINK_HOST ||
     urlObj.hostname === MM_IO_UNIVERSAL_LINK_TEST_HOST;
 

app/core/DeeplinkManager/util/deeplinks/index.ts

@@ -2,6 +2,7 @@ import AppConstants from '../../../AppConstants';
 
 const {
   MM_UNIVERSAL_LINK_HOST,
+  MM_UNIVERSAL_LINK_HOST_ALTERNATE,
   MM_IO_UNIVERSAL_LINK_HOST,
   MM_IO_UNIVERSAL_LINK_TEST_HOST,
 } = AppConstants;
@@ -10,6 +11,7 @@ const METAMASK_HOSTS = [
   ...new Set(
     [
       MM_UNIVERSAL_LINK_HOST || 'link.metamask.io',
+      MM_UNIVERSAL_LINK_HOST_ALTERNATE || 'metamask-alternate.app.link',
       MM_IO_UNIVERSAL_LINK_HOST || 'link.metamask.io',
       MM_IO_UNIVERSAL_LINK_TEST_HOST || 'link-test.metamask.io',
       'metamask.app.link',