@getpara/solana-wallet-connectors 2.22.0 → 2.24.0

package/dist/providers/SolanaExternalWalletContext.js

@@ -49,6 +49,13 @@ import {
 import bs58 from "bs58";
 import { externalHooks } from "./externalHooks.js";
 import { farcasterWallet } from "../wallets/connectors/index.js";
+const CONNECT_EVENT_TIMEOUT_MS = 3e4;
+const isInSolanaWalletDappBrowser = () => {
+  var _a, _b;
+  if (typeof window === "undefined") return false;
+  const w = window;
+  return !!((_a = w == null ? void 0 : w.phantom) == null ? void 0 : _a.solana) || !!(w == null ? void 0 : w.solflare) || !!(w == null ? void 0 : w.backpack) || !!(w == null ? void 0 : w.glowSolana) || !!((_b = w == null ? void 0 : w.ethereum) == null ? void 0 : _b.isMetaMask);
+};
 const SolanaExternalWalletContext = createContext(__spreadProps(__spreadValues({}, defaultSolanaExternalWallet), {
   farcasterStatus: void 0
 }));
@@ -199,7 +206,7 @@ function SolanaExternalWalletProvider({
       throw new Error("Adapter not found.");
     }
     const wallet2 = getWallet(adapter.name);
-    if (wallet2 == null ? void 0 : wallet2.getQrUri) {
+    if ((wallet2 == null ? void 0 : wallet2.getQrUri) && !isInSolanaWalletDappBrowser()) {
       const qrUri = yield wallet2.getQrUri();
       if (qrUri) {
         window.dispatchEvent(new CustomEvent("PARA_WALLETCONNECT_URI_READY", { detail: qrUri }));
@@ -214,24 +221,29 @@ function SolanaExternalWalletProvider({
       if (adapter.publicKey) {
         address = adapter.publicKey.toString();
       } else {
-        yield new Promise((resolve, reject) => {
-          adapter.once("connect", () => __async(this, null, function* () {
-            try {
-              address = adapter.publicKey.toString();
-              resolve();
-            } catch (err) {
+        yield Promise.race([
+          new Promise((resolve, reject) => {
+            adapter.once("connect", () => __async(this, null, function* () {
+              try {
+                address = adapter.publicKey.toString();
+                resolve();
+              } catch (err) {
+                reject(err);
+              }
+            }));
+            adapter.once("error", (err) => {
+              error = (err == null ? void 0 : err.message) || "An unknown error occurred";
               reject(err);
-            }
-          }));
-          adapter.once("error", (err) => {
-            error = (err == null ? void 0 : err.message) || "An unknown error occurred";
-            reject(err);
-          });
-          adapter.once("disconnect", () => {
-            error = "Disconnected before connect event";
-            reject(new Error(error));
-          });
-        });
+            });
+            adapter.once("disconnect", () => {
+              error = "Disconnected before connect event";
+              reject(new Error(error));
+            });
+          }),
+          new Promise(
+            (_, reject) => setTimeout(() => reject(new Error("Connection timed out")), CONNECT_EVENT_TIMEOUT_MS)
+          )
+        ]);
       }
       return address;
     } catch (e) {
@@ -269,7 +281,7 @@ function SolanaExternalWalletProvider({
   };
   const connect = (adapter) => __async(this, null, function* () {
     var _a;
-    if (isIosAndRedirectable()) {
+    if (isIosAndRedirectable() && !isInSolanaWalletDappBrowser()) {
       return;
     }
     if (isAndroid() && (adapter == null ? void 0 : adapter.name) === "Mobile Wallet Adapter") {
@@ -291,6 +303,10 @@ function SolanaExternalWalletProvider({
           error = "Connection request rejected";
           break;
         }
+        case "Connection timed out": {
+          error = "Connection timed out. Please try again.";
+          break;
+        }
         default: {
           console.error("Solana connection error:", err.message);
           error = "An unknown error occurred";

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@getpara/solana-wallet-connectors",
-  "version": "2.22.0",
+  "version": "2.24.0",
   "dependencies": {
-    "@getpara/react-common": "2.22.0",
-    "@getpara/web-sdk": "2.22.0",
+    "@getpara/react-common": "2.24.0",
+    "@getpara/web-sdk": "2.24.0",
     "bs58": "^6.0.0"
   },
   "devDependencies": {
@@ -23,7 +23,7 @@
     "dist",
     "package.json"
   ],
-  "gitHead": "7191b8c823ec592eb1da16c9a085f8e69c6bf377",
+  "gitHead": "3ea729c9a5e550c2053c5fff07d1ca7d8a8f9ce9",
   "main": "dist/index.js",
   "peerDependencies": {
     "@farcaster/mini-app-solana": "^1.0.5",