@d13co/use-wallet 4.5.6 → 4.5.8

package/dist/index.d.cts

@@ -579,6 +579,9 @@ interface RainbowKitWalletOptions extends LiquidEvmOptions {
 declare class RainbowKitWallet extends LiquidEvmBaseWallet {
     protected options: RainbowKitWalletOptions;
     private _connecting;
+    private _disconnecting;
+    /** True while disconnect() is running. Used by the bridge to prevent re-entrancy. */
+    get isDisconnecting(): boolean;
     constructor(params: WalletConstructor<WalletId.RAINBOWKIT>);
     static defaultMetadata: {
         name: string;

package/dist/index.d.ts

@@ -579,6 +579,9 @@ interface RainbowKitWalletOptions extends LiquidEvmOptions {
 declare class RainbowKitWallet extends LiquidEvmBaseWallet {
     protected options: RainbowKitWalletOptions;
     private _connecting;
+    private _disconnecting;
+    /** True while disconnect() is running. Used by the bridge to prevent re-entrancy. */
+    get isDisconnecting(): boolean;
     constructor(params: WalletConstructor<WalletId.RAINBOWKIT>);
     static defaultMetadata: {
         name: string;

package/dist/index.js

@@ -8619,7 +8619,8 @@ var LiquidEvmBaseWallet = class extends BaseWallet {
   async ensureAlgorandChain() {
     const provider = await this.getEvmProvider();
     const { ALGORAND_CHAIN_ID_HEX, ALGORAND_EVM_CHAIN_CONFIG } = await import("liquid-accounts-evm");
-    const currentChainId = await provider.request({ method: "eth_chainId" });
+    const rawChainId = await provider.request({ method: "eth_chainId" });
+    const currentChainId = typeof rawChainId === "number" ? "0x" + rawChainId.toString(16) : String(rawChainId);
     if (currentChainId.toLowerCase() === ALGORAND_CHAIN_ID_HEX.toLowerCase()) {
       return;
     }
@@ -8839,22 +8840,25 @@ import {
 } from "liquid-accounts-evm";
 var ICON13 = `data:image/svg+xml;base64,${btoa(`
 <svg width="120" height="120" viewBox="0 0 120 120" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <rect width="120" height="120" rx="24" fill="url(#rk_bg)"/>
-  <path d="M24 86V76.8C24 55.9 40.9 39 61.8 39H66C70.418 39 74 42.582 74 47V86" stroke="#FF4000" stroke-width="8" stroke-linecap="round" fill="none"/>
-  <path d="M36 86V76.8C36 62.3 47.7 50.6 62.2 50.6H64C67.314 50.6 70 53.286 70 56.6V86" stroke="#FF9500" stroke-width="8" stroke-linecap="round" fill="none"/>
-  <path d="M48 86V76.8C48 68.8 54.5 62.3 62.5 62.3H62.7C65.461 62.3 67.7 64.539 67.7 67.3V86" stroke="#00C853" stroke-width="8" stroke-linecap="round" fill="none"/>
-  <path d="M60 86V76.8C60 75 61.5 73.5 63.3 73.5C65.1 73.5 66.6 75 66.6 76.8V86" stroke="#2979FF" stroke-width="8" stroke-linecap="round" fill="none"/>
-  <defs>
-    <linearGradient id="rk_bg" x1="0" y1="0" x2="120" y2="120">
-      <stop stop-color="#1A1B23"/>
-      <stop offset="1" stop-color="#13141B"/>
-    </linearGradient>
-  </defs>
+  <rect width="120" height="120" rx="24" fill="#627EEA"/>
+  <svg x="30" y="11" width="60" height="98" viewBox="420.1 80.7 1079.8 1758.6">
+    <path d="m959.8 80.7-539.7 895.6 539.7-245.3z" fill="white"/>
+    <path d="m959.8 731-539.7 245.3 539.7 319.1z" fill="white" fill-opacity=".602"/>
+    <path d="m1499.6 976.3-539.8-895.6v650.3z" fill="white" fill-opacity=".602"/>
+    <path d="m959.8 1295.4 539.8-319.1-539.8-245.3z" fill="white" fill-opacity=".2"/>
+    <path d="m420.1 1078.7 539.7 760.6v-441.7z" fill="white"/>
+    <path d="m959.8 1397.6v441.7l540.1-760.6z" fill="white" fill-opacity=".602"/>
+  </svg>
 </svg>
 `)}`;
 var RainbowKitWallet = class _RainbowKitWallet extends LiquidEvmBaseWallet {
   options;
   _connecting = false;
+  _disconnecting = false;
+  /** True while disconnect() is running. Used by the bridge to prevent re-entrancy. */
+  get isDisconnecting() {
+    return this._disconnecting;
+  }
   constructor(params) {
     super(params);
     this.options = params.options || {};
@@ -9041,12 +9045,15 @@ var RainbowKitWallet = class _RainbowKitWallet extends LiquidEvmBaseWallet {
     }
   };
   disconnect = async () => {
+    this._disconnecting = true;
     this.logger.info("Disconnecting...");
     try {
       const { disconnect: wagmiDisconnect } = await import("@wagmi/core");
       await wagmiDisconnect(this.wagmiConfig);
     } catch (error) {
       this.logger.warn("wagmi disconnect error:", error.message);
+    } finally {
+      this._disconnecting = false;
     }
     this.evmAddressMap.clear();
     this.updateMetadata(_RainbowKitWallet.defaultMetadata);
@@ -9073,8 +9080,8 @@ var RainbowKitWallet = class _RainbowKitWallet extends LiquidEvmBaseWallet {
     if (account.isConnected && account.address) {
       evmAddresses = account.addresses ? [...account.addresses] : [account.address];
       connectorInfo = _RainbowKitWallet.extractConnectorInfo(account);
-    } else {
-      this.logger.warn("EVM wallet not yet connected, resuming from persisted state");
+    } else if (account.status === "reconnecting") {
+      this.logger.warn("EVM wallet reconnecting, resuming from persisted state");
       evmAddresses = walletState.accounts.map((a) => a.metadata?.evmAddress).filter(Boolean);
       if (evmAddresses.length === 0) {
         this.logger.warn("No persisted EVM addresses, cannot resume");
@@ -9082,6 +9089,10 @@ var RainbowKitWallet = class _RainbowKitWallet extends LiquidEvmBaseWallet {
         return;
       }
       connectorInfo = {};
+    } else {
+      this.logger.warn("EVM wallet reconnect failed (status: disconnected), disconnecting");
+      this.onDisconnect();
+      return;
     }
     if (!connectorInfo.name && walletState.accounts.length > 0) {
       const first = walletState.accounts[0];