@getpara/solana-wallet-connectors 3.0.0 → 3.2.0

package/dist/providers/SolanaExternalWalletContext.js

@@ -86,6 +86,7 @@ function SolanaExternalWalletProvider({
   const solanaAddressRef = useRef(solanaAddress == null ? void 0 : solanaAddress.toString());
   const disconnectRef = useRef(disconnect);
   const walletRef = useRef(wallet);
+  const lastConnectedAdapterRef = useRef(void 0);
   useEffect(() => {
     walletRef.current = wallet;
   }, [wallet]);
@@ -109,13 +110,14 @@ function SolanaExternalWalletProvider({
         interface: {
           disconnect: () => __async(this, null, function* () {
             yield disconnectRef.current();
+            lastConnectedAdapterRef.current = void 0;
           }),
           getAddress: () => __async(this, null, function* () {
             var _a;
             return (_a = solanaAddressRef.current) == null ? void 0 : _a.toString();
           }),
           signMessage: (_0) => __async(this, [_0], function* ({ message }) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d;
             const resolveSignFn = () => {
               var _a2;
               if (solanaSignMessageRef.current) return solanaSignMessageRef.current;
@@ -124,17 +126,24 @@ function SolanaExternalWalletProvider({
               if (adapter && typeof adapter.signMessage === "function") {
                 return adapter.signMessage.bind(adapter);
               }
+              const lastConnected = lastConnectedAdapterRef.current;
+              if (lastConnected && typeof lastConnected.signMessage === "function") {
+                return lastConnected.signMessage.bind(lastConnected);
+              }
               return void 0;
             };
             const snapshotState = () => {
-              var _a2, _b2, _c2, _d, _e, _f, _g, _h;
+              var _a2, _b2, _c2, _d2, _e, _f, _g, _h, _i, _j, _k;
               return {
                 adapterName: (_b2 = (_a2 = walletRef.current) == null ? void 0 : _a2.adapter) == null ? void 0 : _b2.name,
-                adapterConnected: (_d = (_c2 = walletRef.current) == null ? void 0 : _c2.adapter) == null ? void 0 : _d.connected,
+                adapterConnected: (_d2 = (_c2 = walletRef.current) == null ? void 0 : _c2.adapter) == null ? void 0 : _d2.connected,
                 adapterHasPublicKey: !!((_f = (_e = walletRef.current) == null ? void 0 : _e.adapter) == null ? void 0 : _f.publicKey),
                 hasRefSignMessage: !!solanaSignMessageRef.current,
                 hasClosureSignMessage: !!solanaSignMessage,
-                hasAdapterSignMessage: typeof ((_h = (_g = walletRef.current) == null ? void 0 : _g.adapter) == null ? void 0 : _h.signMessage) === "function"
+                hasAdapterSignMessage: typeof ((_h = (_g = walletRef.current) == null ? void 0 : _g.adapter) == null ? void 0 : _h.signMessage) === "function",
+                lastConnectedAdapterName: (_i = lastConnectedAdapterRef.current) == null ? void 0 : _i.name,
+                lastConnectedAdapterConnected: (_j = lastConnectedAdapterRef.current) == null ? void 0 : _j.connected,
+                hasLastConnectedAdapterSignMessage: typeof ((_k = lastConnectedAdapterRef.current) == null ? void 0 : _k.signMessage) === "function"
               };
             };
             const waitForSignFn = () => __async(this, null, function* () {
@@ -152,7 +161,7 @@ function SolanaExternalWalletProvider({
             try {
               let fn = yield waitForSignFn();
               if (!fn) {
-                const adapter = (_a = walletRef.current) == null ? void 0 : _a.adapter;
+                const adapter = (_b = (_a = walletRef.current) == null ? void 0 : _a.adapter) != null ? _b : lastConnectedAdapterRef.current;
                 if (adapter) {
                   const stateBefore = snapshotState();
                   console.warn(
@@ -180,11 +189,11 @@ function SolanaExternalWalletProvider({
               };
             } catch (e) {
               console.error(e);
-              if ((_b = e == null ? void 0 : e.message) == null ? void 0 : _b.includes("User rejected the request")) {
+              if ((_c = e == null ? void 0 : e.message) == null ? void 0 : _c.includes("User rejected the request")) {
                 throw new Error("Signature request rejected");
               }
               console.error("Solana signature error:", e == null ? void 0 : e.message, snapshotState());
-              throw new Error(`Solana signMessage failed: ${(_c = e == null ? void 0 : e.message) != null ? _c : "unknown"}`);
+              throw new Error(`Solana signMessage failed: ${(_d = e == null ? void 0 : e.message) != null ? _d : "unknown"}`);
             }
           }),
           watchDisconnection: (callback) => {
@@ -309,6 +318,7 @@ function SolanaExternalWalletProvider({
           )
         ]);
       }
+      lastConnectedAdapterRef.current = adapter;
       return address;
     } catch (e) {
       console.error(e);

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@getpara/solana-wallet-connectors",
-  "version": "3.0.0",
+  "version": "3.2.0",
   "dependencies": {
-    "@getpara/react-common": "3.0.0",
-    "@getpara/web-sdk": "3.0.0",
+    "@getpara/react-common": "3.2.0",
+    "@getpara/web-sdk": "3.2.0",
     "bs58": "^6.0.0"
   },
   "devDependencies": {
@@ -23,7 +23,7 @@
     "dist",
     "package.json"
   ],
-  "gitHead": "e6c42e42adfcfadb0114b1ac65ba5203e6274712",
+  "gitHead": "096152f48e9d9a64fdb192588315c64d33d15a1b",
   "main": "dist/index.js",
   "peerDependencies": {
     "@farcaster/mini-app-solana": "^1.0.5",