@getpara/solana-wallet-connectors 2.0.0-alpha.66 → 2.0.0-alpha.67

package/dist/providers/SolanaExternalWalletContext.js

@@ -64,12 +64,13 @@ function SolanaExternalWalletProvider({
     wallets: adapters,
     select: selectWallet,
     disconnect,
+    disconnecting,
     publicKey: solanaAddress,
     wallet,
     connecting,
     signMessage: solanaSignMessage
   } = useWallet();
-  const isLinkingAccount = useRef(false);
+  const disconnectTypeRef = useRef();
   const solanaSignMessageRef = useRef(solanaSignMessage);
   const solanaAddressRef = useRef(solanaAddress);
   const verificationMessage = useRef();
@@ -127,7 +128,7 @@ function SolanaExternalWalletProvider({
   useEffect(() => {
     var _a;
     const storedExternalWallet = para.externalWallets[(_a = solanaAddress == null ? void 0 : solanaAddress.toString()) != null ? _a : ""];
-    if (!!solanaAddress && !storedExternalWallet && !isLinkingAccount.current) {
+    if (!!solanaAddress && !storedExternalWallet && !disconnectTypeRef.current) {
       reset();
     }
   }, []);
@@ -139,7 +140,7 @@ function SolanaExternalWalletProvider({
   }, [solanaAddress]);
   useEffect(() => {
     const storedExternalWallet = Object.values(para.externalWallets || {})[0];
-    if (!connecting && (!wallet || (wallet == null ? void 0 : wallet.adapter.connected)) && (storedExternalWallet == null ? void 0 : storedExternalWallet.type) === "SOLANA" && (storedExternalWallet == null ? void 0 : storedExternalWallet.address) !== (solanaAddress == null ? void 0 : solanaAddress.toString()) && !isLinkingAccount.current) {
+    if (!connecting && (!wallet || (wallet == null ? void 0 : wallet.adapter.connected)) && (storedExternalWallet == null ? void 0 : storedExternalWallet.type) === "SOLANA" && (storedExternalWallet == null ? void 0 : storedExternalWallet.address) !== (solanaAddress == null ? void 0 : solanaAddress.toString()) && !disconnectTypeRef.current) {
       switchWallet(solanaAddress == null ? void 0 : solanaAddress.toString());
     }
   }, [solanaAddress, connecting, wallet]);
@@ -254,7 +255,7 @@ function SolanaExternalWalletProvider({
     var _a, _b;
     const wallet2 = wallets.find((w) => w.id === providerId);
     const adapter = getAdapter((_a = wallet2.name) != null ? _a : "");
-    isLinkingAccount.current = true;
+    disconnectTypeRef.current = "ACCOUNT_LINKING";
     try {
       const address = yield connectBase(adapter);
       const externalWallet = {
@@ -270,7 +271,7 @@ function SolanaExternalWalletProvider({
       throw new Error((_b = e == null ? void 0 : e.message) != null ? _b : e);
     }
   });
-  const disconnectBase = (providerId) => __async(this, null, function* () {
+  const disconnectBase = (_0, ..._1) => __async(this, [_0, ..._1], function* (providerId, { disconnectType } = {}) {
     var _a;
     const wallet2 = wallets.find((w) => w.id === providerId);
     if (!wallet2) {
@@ -280,13 +281,15 @@ function SolanaExternalWalletProvider({
     if (!(adapter == null ? void 0 : adapter.connected)) {
       return;
     }
-    isLinkingAccount.current = true;
+    if (disconnectType) {
+      disconnectTypeRef.current = disconnectType;
+    }
     try {
       yield adapter.disconnect();
     } catch (e) {
       console.error("Error disconnecting Solana wallet:", e);
     } finally {
-      isLinkingAccount.current = false;
+      disconnectTypeRef.current = void 0;
     }
   });
   const getAdapter = (name) => {
@@ -374,6 +377,7 @@ function SolanaExternalWalletProvider({
         () => __spreadValues({
           wallets: walletsWithInjected,
           disconnect,
+          disconnectStatus: disconnecting ? "pending" : "idle",
           signMessage,
           signVerificationMessage,
           requestInfo,
@@ -383,6 +387,7 @@ function SolanaExternalWalletProvider({
         [
           walletsWithInjected,
           disconnect,
+          disconnecting,
           signMessage,
           signVerificationMessage,
           requestInfo,

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@getpara/solana-wallet-connectors",
-  "version": "2.0.0-alpha.66",
+  "version": "2.0.0-alpha.67",
   "dependencies": {
-    "@getpara/react-common": "2.0.0-alpha.66",
-    "@getpara/web-sdk": "2.0.0-alpha.66",
+    "@getpara/react-common": "2.0.0-alpha.67",
+    "@getpara/web-sdk": "2.0.0-alpha.67",
     "bs58": "6.0.0"
   },
   "devDependencies": {
@@ -23,7 +23,7 @@
     "dist",
     "package.json"
   ],
-  "gitHead": "07c8b7b68aa36dec6071e3b3b3a66de2870312c8",
+  "gitHead": "0266cc49e978575fed0b12c9bb0c832651e140eb",
   "main": "dist/index.js",
   "peerDependencies": {
     "@farcaster/mini-app-solana": "^1.0.0",