@getpara/evm-wallet-connectors 2.0.0-alpha.40 → 2.0.0-alpha.42

package/dist/providers/EvmExternalWalletContext.js

@@ -77,14 +77,18 @@ function EvmExternalWalletProvider({
   const switchAccount = useCallback(
     (connectorName) => {
       var _a;
-      const connector = (_a = connections.find((c) => c.connector.name === connectorName)) == null ? void 0 : _a.connector;
+      const connector = (_a = connectionsRef.current.find((c) => {
+        var _a2;
+        const paraDetails = (_a2 = c.connector) == null ? void 0 : _a2.paraDetails;
+        return [paraDetails == null ? void 0 : paraDetails.name, paraDetails == null ? void 0 : paraDetails.id, paraDetails == null ? void 0 : paraDetails.internalId].includes(connectorName);
+      })) == null ? void 0 : _a.connector;
       if (!connector) {
         console.warn(`connector not found: ${connectorName}`);
         return;
       }
       wagmiSwitchAccount({ connector });
     },
-    [connections, wagmiSwitchAccount]
+    [wagmiSwitchAccount]
   );
   const findConnectorAndAccount = (externalWallet) => {
     var _a;
@@ -139,9 +143,11 @@ function EvmExternalWalletProvider({
     yield para.logout();
   });
   const signMessage = (_0) => __async(this, [_0], function* ({ message, externalWallet }) {
+    var _a;
     let signOpts = {};
     if (externalWallet) {
       signOpts = findConnectorAndAccount(externalWallet);
+      yield switchAccount((_a = externalWallet.providerId) != null ? _a : "");
     }
     try {
       const address = signOpts.account ? typeof signOpts.account === "string" ? signOpts.account : signOpts.account.getAddress() : wagmiAddress;
@@ -269,7 +275,7 @@ function EvmExternalWalletProvider({
           authState = yield login(__spreadValues({
             address
           }, loginInfo));
-          verificationMessage.current = authState.stage === "verify" ? authState.signatureVerificationMessage : void 0;
+          verificationMessage.current = authState.signatureVerificationMessage;
         } catch (err) {
           address = void 0;
           error = err;
@@ -300,23 +306,35 @@ function EvmExternalWalletProvider({
     const _connector = connector.walletConnectModalConnector && _isMobile ? connector.walletConnectModalConnector : connector;
     return yield connect(_connector);
   });
+  const findConnector = (providerId) => {
+    return connectorsRef.current.find(
+      (w) => {
+        var _a, _b, _c;
+        return [(_a = w == null ? void 0 : w.paraDetails) == null ? void 0 : _a.name, (_b = w == null ? void 0 : w.paraDetails) == null ? void 0 : _b.id, (_c = w == null ? void 0 : w.paraDetails) == null ? void 0 : _c.internalId].includes(providerId);
+      }
+    );
+  };
   const requestInfo = (providerId) => __async(this, null, function* () {
-    var _a;
-    const connector = connectors.find((c) => c.name === providerId);
-    if (connector.isAuthorized) isLinkingAccount.current = true;
+    var _a, _b, _c;
+    const connector = findConnector(providerId);
+    isLinkingAccount.current = true;
     try {
       const address = yield connectBase(connector);
+      const providerId2 = (_b = (_a = wallets.find((w) => {
+        var _a2, _b2;
+        return (w == null ? void 0 : w.name) === ((_b2 = (_a2 = connector == null ? void 0 : connector.paraDetails) == null ? void 0 : _a2.name) != null ? _b2 : "");
+      })) == null ? void 0 : _a.name) != null ? _b : connector == null ? void 0 : connector.name;
       return {
         partnerId: para.partnerId,
         address,
         type: "EVM",
-        providerId: connector.name,
-        provider: connector.name,
+        providerId: providerId2,
+        provider: providerId2,
         ensName,
         ensAvatar
       };
     } catch (e) {
-      throw new Error((_a = e == null ? void 0 : e.message) != null ? _a : e);
+      throw new Error((_c = e == null ? void 0 : e.message) != null ? _c : e);
     }
   });
   const disconnectBase = (providerId) => __async(this, null, function* () {
@@ -324,10 +342,10 @@ function EvmExternalWalletProvider({
     if (!providerId) {
       throw new Error("Provider ID is required to disconnect");
     }
-    const connector = connectors.find((c) => c.id === providerId);
+    const connector = findConnector(providerId);
     isLinkingAccount.current = true;
     try {
-      yield connector.disconnect();
+      yield connector == null ? void 0 : connector.disconnect();
     } catch (e) {
       throw new Error((_a = e == null ? void 0 : e.message) != null ? _a : e);
     }

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@getpara/evm-wallet-connectors",
-  "version": "2.0.0-alpha.40",
+  "version": "2.0.0-alpha.42",
   "dependencies": {
     "@coinbase/wallet-sdk": "4.3.0",
-    "@getpara/wagmi-v2-connector": "2.0.0-alpha.40",
-    "@getpara/web-sdk": "2.0.0-alpha.40",
+    "@getpara/wagmi-v2-connector": "2.0.0-alpha.42",
+    "@getpara/web-sdk": "2.0.0-alpha.42",
     "zustand": "^4.5.2",
     "zustand-sync-tabs": "^0.2.2"
   },
   "devDependencies": {
-    "@getpara/react-common": "2.0.0-alpha.40",
+    "@getpara/react-common": "2.0.0-alpha.42",
     "@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": "2506044cd3ed127774fb7d537ae850b43acfe8b7",
+  "gitHead": "6f44dc050550a1f567088c81b3ae06c7f1f8ebcb",
   "main": "dist/index.js",
   "peerDependencies": {
     "@farcaster/miniapp-wagmi-connector": "^1.0.0",