btc-wallet 0.5.31-beta → 0.5.33-beta

package/dist/core/btcWalletSelectorContext.d.ts

@@ -5,10 +5,10 @@ export declare function BtcWalletSelectorContextProvider({ children, }: {
 }): import("react/jsx-runtime").JSX.Element;
 export declare function useBtcWalletSelector(): {
     login: () => Promise<string | null>;
-    autoConnect: () => Promise<void>;
+    autoConnect: () => Promise<any>;
     logout: () => void;
     account: string;
-    getPublicKey: () => any;
+    getPublicKey: () => Promise<string | undefined>;
     signMessage: (msg: string) => any;
     getContext: () => any;
     getNetwork: () => Promise<"livenet" | "testnet">;

package/dist/index.js

@@ -2792,7 +2792,8 @@ function useBtcWalletSelector() {
   }, [signMessage]);
   (0, import_react11.useEffect)(() => {
     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);
@@ -2841,7 +2842,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");
         });
@@ -2854,9 +2855,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);
       },
@@ -2872,10 +2885,12 @@ function useBtcWalletSelector() {
     getNetwork2,
     switchNetwork,
     sendBitcoin2,
+    connectModalOpen,
     openConnectModal,
-    requestDirectAccount,
     context,
-    disconnect
+    requestDirectAccount,
+    disconnect,
+    getPublicKey
   ]);
   return hook;
 }
@@ -4183,7 +4198,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,
@@ -4606,7 +4628,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 {
@@ -4905,7 +4926,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();