@getpara/evm-wallet-connectors 2.0.0-alpha.33 → 2.0.0-alpha.35

package/dist/providers/EvmExternalWalletContext.js

@@ -92,12 +92,10 @@ function EvmExternalWalletProvider({
     switch (true) {
       case !!externalWallet.providerId:
         {
-          connector = (_a = connectionsRef.current.find(
-            (c) => {
-              var _a2;
-              return ((_a2 = c.connector.paraDetails) == null ? void 0 : _a2.internalId) === externalWallet.providerId;
-            }
-          )) == null ? void 0 : _a.connector;
+          connector = (_a = connectionsRef.current.find((c) => {
+            var _a2;
+            return ((_a2 = c.connector) == null ? void 0 : _a2.name) === externalWallet.providerId;
+          })) == null ? void 0 : _a.connector;
         }
         break;
     }
@@ -303,11 +301,8 @@ function EvmExternalWalletProvider({
     return yield connect(_connector);
   });
   const requestInfo = (providerId) => __async(this, null, function* () {
-    var _a, _b;
-    const connector = connectors.find((c) => {
-      var _a2;
-      return ((_a2 = c.paraDetails) == null ? void 0 : _a2.internalId) === providerId;
-    });
+    var _a;
+    const connector = connectors.find((c) => c.name === providerId);
     if (connector.isAuthorized) isLinkingAccount.current = true;
     try {
       const address = yield connectBase(connector);
@@ -315,13 +310,13 @@ function EvmExternalWalletProvider({
         partnerId: para.partnerId,
         address,
         type: "EVM",
-        providerId: (_a = connector.paraDetails) == null ? void 0 : _a.internalId,
+        providerId: connector.name,
         provider: connector.name,
         ensName,
         ensAvatar
       };
     } catch (e) {
-      throw new Error((_b = e == null ? void 0 : e.message) != null ? _b : e);
+      throw new Error((_a = e == null ? void 0 : e.message) != null ? _a : e);
     }
   });
   const disconnectBase = (providerId) => __async(this, null, function* () {
@@ -329,10 +324,7 @@ function EvmExternalWalletProvider({
     if (!providerId) {
       throw new Error("Provider ID is required to disconnect");
     }
-    const connector = connectors.find((c) => {
-      var _a2;
-      return ((_a2 = c.paraDetails) == null ? void 0 : _a2.internalId) === providerId;
-    });
+    const connector = connectors.find((c) => c.id === providerId);
     isLinkingAccount.current = true;
     try {
       yield connector.disconnect();
@@ -350,32 +342,45 @@ function EvmExternalWalletProvider({
       }
     }
   });
-  const eip6963ids = connectors.filter((c) => isEIP6963Connector(c)).map((c) => c.id);
+  const eip6963Names = connectors.filter((c) => isEIP6963Connector(c)).map((c) => c.name);
   const dedupedConnectors = connectors.map((c) => {
-    var _a, _b, _c;
+    var _a, _b;
     if ((_a = c.paraDetails) == null ? void 0 : _a.isWalletConnectModalConnector) {
       return;
     }
-    if (!isEIP6963Connector(c) && eip6963ids.includes((_b = c.paraDetails) == null ? void 0 : _b.rdns)) {
+    if (!isEIP6963Connector(c) && eip6963Names.includes(c.name)) {
       return;
     }
     if (isEIP6963Connector(c)) {
       const paraMetadata = nonEip6963ConnectorsByRdns[c.id];
       return __spreadProps(__spreadValues({}, c), { paraDetails: paraMetadata });
     }
-    if (((_c = c.paraDetails) == null ? void 0 : _c.id) === "WALLETCONNECT" && walletConnectModalConnector) {
+    if (((_b = c.paraDetails) == null ? void 0 : _b.id) === "WALLETCONNECT" && walletConnectModalConnector) {
       return __spreadProps(__spreadValues({}, c), { walletConnectModalConnector });
     }
     return c;
   }).filter((c) => !!c);
   const wallets = dedupedConnectors.map((c) => {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e, _f, _g;
     if (((_a = c.paraDetails) == null ? void 0 : _a.internalId) === "SAFE" && (typeof window === "undefined" || window.parent === window)) {
       return void 0;
     }
     const connector = __spreadValues(__spreadValues({}, c), c.paraDetails);
     const supportsWalletConnect = connector.type === "walletConnect" || ((_b = connector.paraDetails) == null ? void 0 : _b.internalId) === "WALLETCONNECT" || ((_c = connector.paraDetails) == null ? void 0 : _c.showQrModal);
+    const isInjected = !c.paraDetails && eip6963Names.includes(c.name);
+    if (isInjected && connectors.some((c2) => {
+      var _a2;
+      return ((_a2 = c2.paraDetails) == null ? void 0 : _a2.rdns) === c2.id;
+    })) {
+      return void 0;
+    }
     return __spreadValues(__spreadProps(__spreadValues({}, connector), {
+      // Using name here since that's the only common id across the networks
+      id: connector.name,
+      internalId: (_d = connector.internalId) != null ? _d : connector.name,
+      isExtension: (_e = connector.isExtension) != null ? _e : isInjected,
+      installed: (_f = connector.installed) != null ? _f : isInjected,
+      iconUrl: (_g = connector.iconUrl) != null ? _g : connector.icon,
       connect: () => connect(connector),
       connectMobile: (manual) => connectMobile(connector, manual),
       type: "EVM"
@@ -383,12 +388,11 @@ function EvmExternalWalletProvider({
   }).filter(Boolean);
   const getConnectorInfo = (connector) => {
     const paraDetails = connector.paraDetails;
-    const providerId = paraDetails == null ? void 0 : paraDetails.internalId;
-    const withFullParaAuth = walletsWithFullAuth == null ? void 0 : walletsWithFullAuth.includes(providerId);
+    const withFullParaAuth = walletsWithFullAuth == null ? void 0 : walletsWithFullAuth.includes(paraDetails == null ? void 0 : paraDetails.internalId);
     return {
       type: "EVM",
-      providerId,
-      provider: paraDetails == null ? void 0 : paraDetails.name,
+      providerId: connector.name,
+      provider: connector.name,
       withFullParaAuth
     };
   };
@@ -414,7 +418,7 @@ function EvmExternalWalletProvider({
     return address ? { isPresent: true, isConnected: true, address } : { isPresent: true, isConnected: false };
   }, [connections]);
   const connectParaEmbedded = useCallback(() => __async(this, null, function* () {
-    const paraConnectorInstance = connectors.find((c) => c.id === "para");
+    const paraConnectorInstance = connectors.find((c) => c.id === "Para");
     if (!paraConnectorInstance) {
       return { error: "No para connector instance" };
     }

package/dist/utils/isEIP6963Connector.js

@@ -2,7 +2,7 @@
 import "../chunk-MMUBH76A.js";
 const isEIP6963Connector = (wallet) => {
   var _a;
-  return !!(!wallet.isRainbowKitConnector && ((_a = wallet.icon) == null ? void 0 : _a.startsWith("data:image")) && wallet.uid && wallet.name);
+  return !!(!wallet.isRainbowKitConnector && ((_a = wallet.icon) == null ? void 0 : _a.trim().startsWith("data:image")) && wallet.uid && wallet.name);
 };
 export {
   isEIP6963Connector

package/dist/wallets/connectors/backpack/backpack.js

@@ -13,7 +13,7 @@ const backpackWallet = ({ projectId, walletConnectParameters }) => {
     id: "backpack",
     internalId: "BACKPACK",
     name: "Backpack",
-    rdns: "app.backpack.mobile",
+    rdns: "app.backpack",
     iconUrl: icon,
     installed: isBackpackInjected,
     isExtension: true,

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@getpara/evm-wallet-connectors",
-  "version": "2.0.0-alpha.33",
+  "version": "2.0.0-alpha.35",
   "dependencies": {
     "@coinbase/wallet-sdk": "4.3.0",
-    "@getpara/wagmi-v2-connector": "2.0.0-alpha.33",
-    "@getpara/web-sdk": "2.0.0-alpha.33",
+    "@getpara/wagmi-v2-connector": "2.0.0-alpha.35",
+    "@getpara/web-sdk": "2.0.0-alpha.35",
     "zustand": "^4.5.2",
     "zustand-sync-tabs": "^0.2.2"
   },
   "devDependencies": {
-    "@getpara/react-common": "2.0.0-alpha.33",
+    "@getpara/react-common": "2.0.0-alpha.35",
     "@tanstack/react-query": "^5.74.0",
     "@types/react": "^18.0.31",
     "@types/react-dom": "^18.2.7",
@@ -25,7 +25,7 @@
     "dist",
     "package.json"
   ],
-  "gitHead": "f338306fa30497d2190f8da2ff72ddd8d9d9032f",
+  "gitHead": "abfec8cf9931f7a8469b09b67b5d48eee6f4cfd5",
   "main": "dist/index.js",
   "peerDependencies": {
     "@farcaster/miniapp-wagmi-connector": "^1.0.0",