btc-wallet 0.5.31-beta → 0.5.33-beta

package/dist/utils/initWalletButton.d.ts

@@ -1,8 +1,8 @@
 import type { Wallet } from '@near-wallet-selector/core';
 import { type ENV } from '../config';
 interface OriginalWallet {
-    account: string | null;
-    getPublicKey: () => Promise<string>;
+    account: string | undefined;
+    getPublicKey: () => Promise<string | undefined>;
 }
 export declare function setupWalletButton(env: ENV, wallet: Wallet, originalWallet: OriginalWallet): void;
 export declare function removeWalletButton(): void;

package/esm/index.js

@@ -2723,7 +2723,8 @@ function useBtcWalletSelector() {
   }, [signMessage]);
   useEffect6(() => {
     const fn = (account) => {
-      if (account) {
+      console.log("accountsChanged account", account);
+      if (account == null ? void 0 : account.length) {
         getPublicKey().then((res) => {
           publicKey.current = res;
           context.emit("updatePublicKey", res);
@@ -2772,7 +2773,7 @@ function useBtcWalletSelector() {
         return account;
       }),
       autoConnect: () => __async(this, null, function* () {
-        requestDirectAccount(connectorRef.current).catch((e) => {
+        return requestDirectAccount(connectorRef.current).catch((e) => {
           console.error("btcLoginError", e);
           context.emit("btcLoginError");
         });
@@ -2785,9 +2786,21 @@ function useBtcWalletSelector() {
         context.emit("btcLogOut");
       },
       account: accounts == null ? void 0 : accounts[0],
-      getPublicKey: () => {
-        return publicKey.current;
-      },
+      getPublicKey: () => __async(this, null, function* () {
+        const publicKey2 = yield getPublicKey();
+        if (publicKey2)
+          return publicKey2;
+        if (connectModalOpen)
+          return;
+        try {
+          yield requestDirectAccount(connectorRef.current);
+          return yield getPublicKey();
+        } catch (error) {
+          console.error("btcLoginError", error);
+          context.emit("btcLoginError");
+          return;
+        }
+      }),
       signMessage: (msg) => {
         return signMessageFn.current(msg);
       },
@@ -2803,10 +2816,12 @@ function useBtcWalletSelector() {
     getNetwork2,
     switchNetwork,
     sendBitcoin2,
+    connectModalOpen,
     openConnectModal,
-    requestDirectAccount,
     context,
-    disconnect
+    requestDirectAccount,
+    disconnect,
+    getPublicKey
   ]);
   return hook;
 }
@@ -4114,7 +4129,14 @@ function getWithdrawTransaction(_0) {
     env = "mainnet"
   }) {
     const config = getWalletConfig(env);
-    const _btcAddress = btcAddress || getBtcProvider().account;
+    let _btcAddress = btcAddress || getBtcProvider().account;
+    if (!_btcAddress) {
+      yield getBtcProvider().autoConnect();
+      _btcAddress = getBtcProvider().account;
+      if (!_btcAddress) {
+        throw new Error("BTC Account is not available.");
+      }
+    }
     const _csna = csna || (yield getCsnaAccountId(env));
     const { inputs, outputs, isError, errorMsg, fromAmount, gasFee } = yield calculateWithdraw({
       amount,
@@ -4537,7 +4559,6 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
       });
       const context = window.btcContext.getContext();
       context.on("updatePublicKey", (btcPublicKey) => __async(this, null, function* () {
-        console.log("updatePublicKey");
         state_default.clear();
         console.log("updatePublicKey clear");
         try {
@@ -4838,7 +4859,7 @@ function getGroup(state) {
 
 // src/index.ts
 var getVersion = () => {
-  return "0.5.31-beta";
+  return "0.5.33-beta";
 };
 if (typeof window !== "undefined") {
   window.__BTC_WALLET_VERSION = getVersion();