btc-wallet 0.5.53-beta → 0.5.56-beta

package/esm/index.js

@@ -164,6 +164,51 @@ function isMobile() {
   }
   return false;
 }
+function safeJSONParse(str) {
+  try {
+    return JSON.parse(str);
+  } catch (e) {
+    console.error("safeJSONParse", e);
+    return void 0;
+  }
+}
+function safeJSONStringify(obj) {
+  try {
+    return JSON.stringify(obj);
+  } catch (e) {
+    console.error("safeJSONStringify", e);
+    return void 0;
+  }
+}
+function storageStore(namespace, options) {
+  if (typeof window === "undefined")
+    return;
+  const _namespace = namespace || "SATOSHI_WALLET_DEFAULT";
+  const storage5 = (options == null ? void 0 : options.storage) || (window == null ? void 0 : window.localStorage);
+  const namespaceKey = (key) => {
+    return _namespace + ":" + key;
+  };
+  return {
+    set(key, value) {
+      const _value = safeJSONStringify(value);
+      _value ? storage5.setItem(namespaceKey(key), _value) : storage5.removeItem(namespaceKey(key));
+    },
+    get(key) {
+      const _value = storage5.getItem(namespaceKey(key));
+      return _value ? safeJSONParse(_value) : void 0;
+    },
+    remove(key) {
+      storage5.removeItem(namespaceKey(key));
+    },
+    clearAll: function clearAll() {
+      for (const key in storage5) {
+        if (key.startsWith(namespace + ":")) {
+          storage5.removeItem(key);
+        }
+      }
+    }
+  };
+}
 
 // src/utils/Dialog.ts
 var Dialog = class {
@@ -433,7 +478,7 @@ var MobileWalletConnect = class {
       case "okx":
         return `okx://wallet/dapp/url?dappUrl=${encodeURIComponent(url)}`;
       case "bitget":
-        return `https://bkcode.vip?action=dapp&url=${encodeURIComponent(url)}`;
+        return `bitkeep://bkconnect?action=dapp&url=${encodeURIComponent(url)}`;
       case "xverse":
         return `xverse://browser?url=${encodeURIComponent(url)}`;
       default:
@@ -519,9 +564,13 @@ var InjectedConnector = class extends BaseConnector {
   }
   requestAccounts() {
     return __async(this, null, function* () {
-      if (isMobile() && !this.getProvider()) {
-        MobileWalletConnect.redirectToWallet(this.metadata.id);
-        return [];
+      if (isMobile()) {
+        try {
+          this.getProvider();
+        } catch (error) {
+          yield MobileWalletConnect.redirectToWallet(this.metadata.id);
+          return [];
+        }
       }
       const accounts = yield this.getProviderOrThrow().requestAccounts();
       console.log("network:", yield this.getNetwork());
@@ -706,6 +755,7 @@ import EventEmitter from "events";
 var xverse_default = "data:image/png;base64,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";
 
 // src/connector/xverse.ts
+var storage = storageStore("SATOSHI_WALLET_XVERSE");
 var _network, _event;
 var XverseConnector = class extends BaseConnector {
   constructor() {
@@ -731,7 +781,7 @@ var XverseConnector = class extends BaseConnector {
         walletType
       }));
       console.log("\u{1F680} ~ XverseConnector ~ loadAccounts ~ res:", addresses);
-      localStorage.setItem("btc-connect-xverse-addresses-" + network, JSON.stringify(addresses));
+      storage == null ? void 0 : storage.set(`${network}:addresses`, addresses);
       return addresses;
     });
     __privateGet(this, _event).setMaxListeners(100);
@@ -766,9 +816,9 @@ var XverseConnector = class extends BaseConnector {
   }
   getAddresses() {
     return __async(this, null, function* () {
-      const data = localStorage.getItem("btc-connect-xverse-addresses-" + __privateGet(this, _network));
+      const data = storage == null ? void 0 : storage.get(`${__privateGet(this, _network)}:addresses`);
       if (data) {
-        return JSON.parse(data);
+        return data;
       }
       return [];
     });
@@ -853,8 +903,7 @@ var XverseConnector = class extends BaseConnector {
     });
   }
   disconnect() {
-    localStorage.removeItem("btc-connect-xverse-addresses-Mainnet");
-    localStorage.removeItem("btc-connect-xverse-addresses-Testnet");
+    storage == null ? void 0 : storage.remove(`${__privateGet(this, _network)}:addresses`);
   }
 };
 _network = new WeakMap();
@@ -867,6 +916,7 @@ import EventEmitter2 from "events";
 var magicEden_default = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADYAAAAgCAYAAABZyotbAAADGklEQVR42sVYTW7aQBT+ZsZk0yy8jWoqIxWK1E16A3KDcoLACRqkGKFugE0VAVLgBElOQHqC0BPUm0q0EMVVoWxZNCsYv25MlR/AY2O73xKZefO9ed+b7w0DgFm+ZrquPCdCAYAOwAbQM0btS0SIaa5aJ6AEIhPR49Ge2SxfM6Urb0B4Fowx1nj5o9WMhpTVJ8J7xA3OKsb3VpdNs9YFAaVN30VBbpqr1omogWQwXyxeZDhhexaJqDHNVetho8zyNTNBUgCga9qfQ+5pCnGQuzMbunTlDf4DuOqHYcjtpe7P12k3XjAnPe4MeJC/BCH3+431YZt249KXEPwIANgka1HgnPg0lFm+Zkopv6qU+aasAzQImPSfy+V+N+M05gCghQnrnRw2kfN0pYdPPOlCiObB8MyJXWOqZTnNVesR6EqXUt7cmQ09cWLryE2yVsm/tTOHXLensLyZSt33Q7eQMBpbpznO+dUmB/ME74xR255kTy8BdqywetcYtSqJntjDk5NS3vmRIqKmMWrbALBYLE88f+e3+kmYO1SF2ADRYJAed/6VacbpzoUQRTDmqCTu1+vTQqTEiKhJRDsaYeYIIcpPfz0YnjmC8yMAc4Vyr0deiulxp7ELOSK3vKl1HwzPHCIqKixTCNIllTUWlhwRNdPjztZy1jTNQcQI1DxCkHukq40uRckoM2flKmLpit5Gy2F19RSulEoXuuuiEtuJreCN3+Wwunr2VKBQzq9uW9eJ3GPbyKnoSnUAJRc9v3KO/II2Ru1LIUQGoCsANmO4BlD220iAAdRO37ZPwuxN27X7eOUWaO7aS92fk6+umCMEL4bdVySWKgjUBlDmCMGPdhlbtCRJeQOogl5Il1LWJ1kryPJfhBCDVTISJSal7CsOoDqCPyuUpJTOJGsVjVHbTqwUJ1mrBOAw5jAmgH7SGjtOKI45efvx0JfYcrlvRxKOJfsMx33mrUEQf7bdPeBzMpSYY3z7ZHMAlfXzkJrXU26/QnRVhspdsfKU7EEbvgBQ8Ehe7/r8taXdFzy96WBMj+ycQLbrUm9l5f4C3RupufZdcK8AAAAASUVORK5CYII=";
 
 // src/connector/magicEden.ts
+var storage2 = storageStore("SATOSHI_WALLET_MAGICEDEN");
 var _network2, _event2;
 var MagicEdenConnector = class extends BaseConnector {
   constructor() {
@@ -900,7 +950,7 @@ var MagicEdenConnector = class extends BaseConnector {
         };
         getAddress(getAddressOptions).catch((error) => reject(error));
       });
-      localStorage.setItem("btc-connect-magicEden-addresses-" + network, JSON.stringify(addresses));
+      storage2 == null ? void 0 : storage2.set(`${network}:addresses`, addresses);
       return addresses;
     });
     __privateGet(this, _event2).setMaxListeners(100);
@@ -927,10 +977,9 @@ var MagicEdenConnector = class extends BaseConnector {
       if (!this.isReady()) {
         throw new Error(`${this.metadata.name} is not install!`);
       }
-      const data = localStorage.getItem("btc-connect-magicEden-addresses-" + __privateGet(this, _network2));
+      const data = storage2 == null ? void 0 : storage2.get(`${__privateGet(this, _network2)}:addresses`);
       if (data) {
-        const addresses = JSON.parse(data);
-        return addresses.map((item) => item.address);
+        return data.map((item) => item.address);
       } else {
         return [];
       }
@@ -941,10 +990,9 @@ var MagicEdenConnector = class extends BaseConnector {
       if (!this.isReady()) {
         throw new Error(`${this.metadata.name} is not install!`);
       }
-      const data = localStorage.getItem("btc-connect-magicEden-addresses-" + __privateGet(this, _network2));
+      const data = storage2 == null ? void 0 : storage2.get(`${__privateGet(this, _network2)}:addresses`);
       if (data) {
-        const addresses = JSON.parse(data);
-        return addresses[0].publicKey;
+        return data[0].publicKey;
       } else {
         return "";
       }
@@ -1057,8 +1105,7 @@ var MagicEdenConnector = class extends BaseConnector {
     });
   }
   disconnect() {
-    localStorage.removeItem("btc-connect-magicEden-addresses-Mainnet");
-    localStorage.removeItem("btc-connect-magicEden-addresses-Testnet");
+    storage2 == null ? void 0 : storage2.remove(`${__privateGet(this, _network2)}:addresses`);
   }
 };
 _network2 = new WeakMap();
@@ -1152,13 +1199,14 @@ var useConnector = () => {
   const { connectors, setConnectorId } = useConnectProvider();
   const connect = useCallback2(
     (connectorId) => __async(void 0, null, function* () {
+      var _a;
       const connector = connectors.find((item) => item.metadata.id === connectorId);
       if (!connector) {
         throw new Error(`connector id ${connectorId} not found`);
       }
       const accounts = yield connector.requestAccounts();
       if (accounts.length > 0) {
-        localStorage.setItem("current-connector-id", connector.metadata.id);
+        (_a = storageStore()) == null ? void 0 : _a.set("current-connector-id", connector.metadata.id);
         setConnectorId(connector.metadata.id);
       }
     }),
@@ -2321,10 +2369,11 @@ var ConnectProvider = ({
     version: ((_c = options.aaOptions.accountContracts[((_b = Object.keys(options.aaOptions.accountContracts)) == null ? void 0 : _b[0]) || "BTC"]) == null ? void 0 : _c[0].version) || "1.0.0"
   });
   const getConnectorId = useCallback7(() => {
+    var _a2;
     if (typeof window === "undefined") {
       return "";
     }
-    const id = localStorage.getItem("current-connector-id");
+    const id = (_a2 = storageStore()) == null ? void 0 : _a2.get("current-connector-id");
     return id != null ? id : "";
   }, []);
   const getConnector = useCallback7(() => {
@@ -2466,7 +2515,8 @@ var ConnectProvider = ({
     }
   }, [connectorId, connectors]);
   const disconnect = useCallback7(() => {
-    localStorage.removeItem("current-connector-id");
+    var _a2;
+    (_a2 = storageStore()) == null ? void 0 : _a2.remove("current-connector-id");
     txConfirmUtils_default.reset();
     if (connector) {
       connector.disconnect();
@@ -2655,7 +2705,9 @@ function BtcWalletSelectorContextProvider({
     new UnisatConnector(),
     new XverseConnector(),
     new OKXConnector(),
-    new BitgetConnector()
+    new BitgetConnector(),
+    new MagicEdenConnector(),
+    new BybitConnector()
   ];
   const walletSelectorContextValue = useMemo6(() => {
     const simpleFn = {};
@@ -3090,36 +3142,37 @@ var STORAGE_KEYS = {
   PUBLIC_KEY: "btc-wallet-publickey",
   BTC_PUBLIC_KEY: "btc-wallet-btc-publickey"
 };
+var storage3 = storageStore("SATOSHI_WALLET_ACCOUNT");
 var state_default = {
   saveAccount(account) {
     if (!account) {
       this.removeAccount();
       return;
     }
-    window.localStorage.setItem(STORAGE_KEYS.ACCOUNT, account);
+    storage3 == null ? void 0 : storage3.set(STORAGE_KEYS.ACCOUNT, account);
   },
   removeAccount() {
-    window.localStorage.removeItem(STORAGE_KEYS.ACCOUNT);
+    storage3 == null ? void 0 : storage3.remove(STORAGE_KEYS.ACCOUNT);
   },
   savePublicKey(publicKey) {
     if (!publicKey) {
       this.removePublicKey();
       return;
     }
-    window.localStorage.setItem(STORAGE_KEYS.PUBLIC_KEY, publicKey);
+    storage3 == null ? void 0 : storage3.set(STORAGE_KEYS.PUBLIC_KEY, publicKey);
   },
   removePublicKey() {
-    window.localStorage.removeItem(STORAGE_KEYS.PUBLIC_KEY);
+    storage3 == null ? void 0 : storage3.remove(STORAGE_KEYS.PUBLIC_KEY);
   },
   saveBtcPublicKey(publicKey) {
     if (!publicKey) {
       this.removeBtcPublicKey();
       return;
     }
-    window.localStorage.setItem(STORAGE_KEYS.BTC_PUBLIC_KEY, publicKey);
+    storage3 == null ? void 0 : storage3.set(STORAGE_KEYS.BTC_PUBLIC_KEY, publicKey);
   },
   removeBtcPublicKey() {
-    window.localStorage.removeItem(STORAGE_KEYS.BTC_PUBLIC_KEY);
+    storage3 == null ? void 0 : storage3.remove(STORAGE_KEYS.BTC_PUBLIC_KEY);
   },
   clear() {
     this.removeAccount();
@@ -3135,13 +3188,13 @@ var state_default = {
     this.savePublicKey(publicKey);
   },
   getAccount() {
-    return window.localStorage.getItem(STORAGE_KEYS.ACCOUNT) || "";
+    return (storage3 == null ? void 0 : storage3.get(STORAGE_KEYS.ACCOUNT)) || "";
   },
   getPublicKey() {
-    return window.localStorage.getItem(STORAGE_KEYS.PUBLIC_KEY) || "";
+    return (storage3 == null ? void 0 : storage3.get(STORAGE_KEYS.PUBLIC_KEY)) || "";
   },
   getBtcPublicKey() {
-    return window.localStorage.getItem(STORAGE_KEYS.BTC_PUBLIC_KEY) || "";
+    return (storage3 == null ? void 0 : storage3.get(STORAGE_KEYS.BTC_PUBLIC_KEY)) || "";
   },
   isValid() {
     const account = this.getAccount();
@@ -3466,7 +3519,8 @@ function calculateGasStrategy(_0) {
   return __async(this, arguments, function* ({
     csna,
     transactions: transactions2,
-    env
+    env,
+    gasStrategy = "auto"
   }) {
     var _a;
     const currentConfig = getWalletConfig(env);
@@ -3498,6 +3552,7 @@ function calculateGasStrategy(_0) {
     const nearAvailableBalance = new Big(nearBalance).minus(transferAmount.near).toNumber();
     console.log("available near balance:", nearAvailableBalance);
     console.log("available gas token balance:", gasTokenBalance);
+    console.log("gas strategy:", gasStrategy);
     const convertTx = yield Promise.all(
       transactions2.map(
         (transaction, index) => convertTransactionToTxHex({
@@ -3509,8 +3564,20 @@ function calculateGasStrategy(_0) {
         })
       )
     );
-    if (nearAvailableBalance > 0.5) {
-      console.log("near balance is enough, get the protocol fee of each transaction");
+    let useNearPayGas = false;
+    let perTxFee;
+    if (gasStrategy === "near") {
+      console.log("Forcing NEAR as gas token based on gasStrategy");
+      useNearPayGas = true;
+    } else if (gasStrategy === "btc") {
+      console.log("Forcing BTC token as gas token based on gasStrategy");
+      useNearPayGas = false;
+    } else if (nearAvailableBalance > 0.5) {
+      console.log("NEAR balance is enough, using NEAR to pay for gas");
+      useNearPayGas = true;
+    }
+    let gasAmount;
+    if (useNearPayGas) {
       const gasTokens = yield nearCallFunction(
         currentConfig.accountContractId,
         "list_gas_token",
@@ -3518,39 +3585,29 @@ function calculateGasStrategy(_0) {
         { network: currentConfig.network }
       );
       console.log("list_gas_token gas tokens:", gasTokens);
-      const perTxFee = Math.max(
-        Number(((_a = gasTokens[currentConfig.btcToken]) == null ? void 0 : _a.per_tx_protocol_fee) || 0),
-        100
-      );
+      const fee = Math.max(Number(((_a = gasTokens[currentConfig.btcToken]) == null ? void 0 : _a.per_tx_protocol_fee) || 0), 100);
+      perTxFee = fee.toString();
       console.log("perTxFee:", perTxFee);
-      const protocolFee = new Big(perTxFee || "0").mul(convertTx.length).toFixed(0);
-      console.log("protocolFee:", protocolFee);
-      const transferTx = yield createGasTokenTransfer({ csna, amount: protocolFee, env });
-      return recalculateGasWithTransfer({
-        csna,
-        transferTx,
-        transactions: convertTx,
-        useNearPayGas: true,
-        perTxFee: perTxFee.toString(),
-        env
-      });
+      gasAmount = new Big(perTxFee || "0").mul(convertTx.length).toFixed(0);
     } else {
-      console.log("near balance is not enough, predict the gas token amount required");
-      const adjustedGas = yield getPredictedGasAmount({
+      gasAmount = yield getPredictedGasAmount({
         accountContractId: currentConfig.accountContractId,
         tokenId: currentConfig.btcToken,
         transactions: convertTx.map((t) => t.txHex),
         env
       });
-      const transferTx = yield createGasTokenTransfer({ csna, amount: adjustedGas, env });
-      return recalculateGasWithTransfer({
-        csna,
-        transferTx,
-        transactions: convertTx,
-        useNearPayGas: false,
-        env
-      });
     }
+    console.log("useNearPayGas:", useNearPayGas);
+    console.log("gasAmount:", gasAmount);
+    const transferTx = yield createGasTokenTransfer({ csna, amount: gasAmount, env });
+    return recalculateGasWithTransfer({
+      csna,
+      transferTx,
+      transactions: convertTx,
+      useNearPayGas,
+      perTxFee,
+      env
+    });
   });
 }
 function createGasTokenTransfer(_0) {
@@ -3837,11 +3894,13 @@ function getCsnaAccountId(env) {
   });
 }
 function checkDepositDisabledAddress() {
-  const data = localStorage.getItem("btc-connect-xverse-addresses-Mainnet");
+  var _a;
+  const data = (_a = storageStore("SATOSHI_WALLET_XVERSE")) == null ? void 0 : _a.get(
+    `Mainnet:addresses`
+  );
   if (!data)
     return;
-  const addresses = JSON.parse(data);
-  const address = addresses == null ? void 0 : addresses[0];
+  const address = data == null ? void 0 : data[0];
   if (address.walletType === "ledger" && !["p2wpkh", "p2sh"].includes(address.addressType)) {
     throw new Error("Ledger is only supported for p2wpkh and p2sh address");
   }
@@ -3878,7 +3937,7 @@ function executeBTCDepositAndAction(_0) {
         throw new Error("Deposit amount or action is required");
       }
       const csna = yield getCsnaAccountId(env);
-      const depositAmount = Number(amount || (action == null ? void 0 : action.amount) || 0);
+      const depositAmount = new Big2(amount || (action == null ? void 0 : action.amount) || 0).round(0, Big2.roundDown).toNumber();
       console.log("depositAmount", depositAmount);
       if (depositAmount <= 0) {
         throw new Error("Invalid deposit amount");
@@ -3982,13 +4041,14 @@ function checkSatoshiWhitelist(btcAccountId, env = "mainnet") {
   return __async(this, null, function* () {
     if (env !== "mainnet")
       return;
-    const hasShownNotice = localStorage.getItem("btc-wallet-private-mainnet-notice");
+    const storage5 = storageStore();
+    const hasShownNotice = storage5 == null ? void 0 : storage5.get("private-mainnet-notice");
     if (!hasShownNotice) {
       Dialog.alert({
         title: "Notice",
         message: "You are currently using Satoshi Private Mainnet. This is a private version for testing. Please try a small amount of assets in Ramp"
       });
-      localStorage.setItem("btc-wallet-private-mainnet-notice", "true");
+      storage5 == null ? void 0 : storage5.set("private-mainnet-notice", "true");
     }
     if (!btcAccountId)
       return;
@@ -4318,7 +4378,13 @@ function uint8ArrayToHex(uint8Array) {
 }
 
 // src/utils/initWalletButton.ts
-function setupWalletButton(env, wallet, originalWallet, walletUrl) {
+var storage4 = storageStore("SATOSHI_WALLET_BUTTON");
+function setupWalletButton({
+  env,
+  nearWallet,
+  btcWallet,
+  walletUrl
+}) {
   console.log(`setupWalletButton ${walletUrl || ""}`);
   if (document.getElementById("satoshi-wallet-button")) {
     return;
@@ -4341,23 +4407,25 @@ function setupWalletButton(env, wallet, originalWallet, walletUrl) {
     closeImageUrl: "https://assets.deltatrade.ai/wallet-assets/wallet-btn-active.png",
     iframe
   });
-  setupButtonClickHandler(button, iframe, wallet, originalWallet);
+  setupButtonClickHandler(button, iframe, nearWallet, btcWallet);
 }
 function createFloatingButtonWithIframe({
   openImageUrl,
   closeImageUrl,
   iframe
 }) {
+  var _a;
   const button = document.createElement("img");
   button.id = "satoshi-wallet-button";
-  const isIframeVisible = localStorage.getItem("btc-wallet-iframe-visible") === "true";
+  const isIframeVisible = (_a = storage4 == null ? void 0 : storage4.get("visible")) != null ? _a : true;
   button.src = isIframeVisible ? closeImageUrl : openImageUrl;
   iframe.style.display = isIframeVisible ? "block" : "none";
   const windowWidth = window.innerWidth;
   const windowHeight = window.innerHeight;
-  const savedPosition = JSON.parse(
-    localStorage.getItem("btc-wallet-button-position") || '{"right": "20px", "bottom": "20px"}'
-  );
+  const savedPosition = (storage4 == null ? void 0 : storage4.get("position")) || {
+    right: "20px",
+    bottom: "20px"
+  };
   const right = Math.min(Math.max(20, parseInt(savedPosition.right)), windowWidth - 80);
   const bottom = Math.min(Math.max(20, parseInt(savedPosition.bottom)), windowHeight - 80);
   Object.assign(button.style, {
@@ -4453,13 +4521,10 @@ function createFloatingButtonWithIframe({
     isDragging = false;
     button.style.cursor = "grab";
     button.style.transition = "transform 0.15s ease";
-    localStorage.setItem(
-      "btc-wallet-button-position",
-      JSON.stringify({
-        right: button.style.right,
-        bottom: button.style.bottom
-      })
-    );
+    storage4 == null ? void 0 : storage4.set("position", {
+      right: button.style.right,
+      bottom: button.style.bottom
+    });
     if (!isDragEvent) {
       handleButtonClick();
     }
@@ -4473,7 +4538,7 @@ function createFloatingButtonWithIframe({
     const newVisibleState = !isCurrentlyVisible;
     iframe.style.display = newVisibleState ? "block" : "none";
     button.src = newVisibleState ? closeImageUrl : openImageUrl;
-    localStorage.setItem("btc-wallet-iframe-visible", String(newVisibleState));
+    storage4 == null ? void 0 : storage4.set("visible", newVisibleState);
     setTimeout(() => {
       if (newVisibleState) {
         iframe.focus();
@@ -4487,11 +4552,12 @@ function createIframe({
   iframeUrl,
   iframeStyle = {}
 }) {
+  var _a;
   const iframe = document.createElement("iframe");
   iframe.id = "satoshi-wallet-iframe";
   iframe.allow = "clipboard-read; clipboard-write";
   iframe.src = iframeUrl;
-  const isVisible = localStorage.getItem("btc-wallet-iframe-visible") === "true";
+  const isVisible = (_a = storage4 == null ? void 0 : storage4.get("visible")) != null ? _a : true;
   Object.assign(iframe.style, __spreadValues({
     position: "fixed",
     bottom: "90px",
@@ -4506,12 +4572,12 @@ function createIframe({
   return iframe;
 }
 var currentMessageHandler = null;
-function setupButtonClickHandler(button, iframe, wallet, originalWallet) {
+function setupButtonClickHandler(button, iframe, nearWallet, btcWallet) {
   return __async(this, null, function* () {
     var _a;
-    const accountId = (_a = yield wallet == null ? void 0 : wallet.getAccounts()) == null ? void 0 : _a[0].accountId;
-    const originalAccountId = originalWallet.account;
-    const originalPublicKey = yield originalWallet.getPublicKey();
+    const accountId = (_a = yield nearWallet == null ? void 0 : nearWallet.getAccounts()) == null ? void 0 : _a[0].accountId;
+    const originalAccountId = btcWallet == null ? void 0 : btcWallet.account;
+    const originalPublicKey = yield btcWallet == null ? void 0 : btcWallet.getPublicKey();
     console.log({ accountId, originalAccountId, originalPublicKey });
     const iframeSrc = new URL(iframe.src);
     iframeSrc.searchParams.set("origin", window.location.origin);
@@ -4520,8 +4586,8 @@ function setupButtonClickHandler(button, iframe, wallet, originalWallet) {
     originalPublicKey && iframeSrc.searchParams.set("originalPublicKey", originalPublicKey);
     iframe.src = iframeSrc.toString();
     const actions = {
-      signAndSendTransaction: wallet.signAndSendTransaction,
-      signAndSendTransactions: wallet.signAndSendTransactions,
+      signAndSendTransaction: nearWallet.signAndSendTransaction,
+      signAndSendTransactions: nearWallet.signAndSendTransactions,
       executeBTCDepositAndAction,
       getWithdrawTransaction
     };
@@ -4566,6 +4632,7 @@ function setupButtonClickHandler(button, iframe, wallet, originalWallet) {
   });
 }
 function removeWalletButton() {
+  console.log("removeWalletButton");
   const button = document.getElementById("satoshi-wallet-button");
   button == null ? void 0 : button.remove();
   const iframe = document.getElementById("satoshi-wallet-iframe");
@@ -4672,10 +4739,14 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
           if (btcPublicKey) {
             yield getNearAccountByBtcPublicKey(btcPublicKey);
             removeWalletButton();
-            setupWalletButton(env, wallet, btcContext, metadata.walletUrl);
+            setupWalletButton({
+              env,
+              nearWallet: wallet,
+              btcWallet: btcContext,
+              walletUrl: metadata.walletUrl
+            });
           }
         } else {
-          removeWalletButton();
           connectionUpdateTimeout = setTimeout(() => {
             handleConnectionUpdate();
           }, 5e3);
@@ -4814,7 +4885,8 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
       const { transferGasTransaction, useNearPayGas, gasLimit } = yield calculateGasStrategy({
         csna,
         transactions: trans,
-        env
+        env,
+        gasStrategy: metadata.gasStrategy
       });
       console.log("transferGasTransaction:", transferGasTransaction);
       console.log("useNearPayGas:", useNearPayGas);
@@ -4886,9 +4958,10 @@ function setupBTCWallet({
   autoConnect = true,
   syncLogOut = true,
   env = "mainnet",
-  walletUrl
+  walletUrl,
+  gasStrategy = "auto"
 } = {}) {
-  console.log("\u26A1\uFE0F BTC Wallet Version:", getVersion(), "env:", env);
+  console.log("\u26A1\uFE0F BTC Wallet Version:", getVersion(), "env:", env, "gasStrategy:", gasStrategy);
   const btcWallet = () => __async(this, null, function* () {
     return {
       id: "btc-wallet",
@@ -4903,7 +4976,8 @@ function setupBTCWallet({
         autoConnect,
         syncLogOut,
         env,
-        walletUrl
+        walletUrl,
+        gasStrategy
       },
       init: BTCWallet
     };
@@ -4915,11 +4989,30 @@ function setupBTCWallet({
 import {
   setupModal as _setupModal
 } from "ref-modal-ui";
+var subscription;
 function setupWalletSelectorModal(selector, options) {
   if (!selector)
     throw new Error("selector is required");
+  const {
+    showChainGroups = true,
+    showWalletUIForNearAccount = true,
+    env = "mainnet",
+    walletUrl
+  } = options;
+  subscription == null ? void 0 : subscription.unsubscribe();
   const state = selector.store.getState();
   const group = getGroup(state);
+  subscription = selector.store.observable.subscribe((state2) => {
+    const walletId = state2.selectedWalletId;
+    console.log("setupWalletSelectorModal walletId", walletId);
+    if (!walletId)
+      removeWalletButton();
+    if (showWalletUIForNearAccount && walletId !== "btc-wallet") {
+      selector.wallet().then((wallet) => {
+        setupWalletButton({ env, nearWallet: wallet, walletUrl });
+      });
+    }
+  });
   if (group.includes("btc")) {
     document.head.appendChild(document.createElement("style")).textContent = `
       #near-wallet-selector-modal .options-list .btc-wallet {
@@ -4930,7 +5023,7 @@ function setupWalletSelectorModal(selector, options) {
   const modal = _setupModal(selector, options);
   const originalShow = modal.show.bind(modal);
   modal.show = () => __async(this, null, function* () {
-    const chain = group.length > 1 ? yield openChainModal() : group[0];
+    const chain = group.length > 1 && showChainGroups ? yield openChainModal() : group[0];
     if (chain === "btc") {
       const module = state.modules.find((module2) => module2.id === "btc-wallet");
       if (module) {
@@ -4968,7 +5061,7 @@ function openChainModal() {
       return div;
     };
     return yield Dialog.openModal({
-      title: "Choose Chain",
+      title: "Choose Wallet",
       titleStyle: "font-size: 18px; font-weight: 600; color: #fff; text-align: center;padding-bottom: 10px;",
       content
     });
@@ -4987,7 +5080,7 @@ function getGroup(state) {
 
 // src/index.ts
 var getVersion = () => {
-  return "0.5.53-beta";
+  return "0.5.56-beta";
 };
 if (typeof window !== "undefined") {
   window.__BTC_WALLET_VERSION = getVersion();