btc-wallet 0.5.63-beta → 0.5.65-beta

package/dist/utils/initWalletButton.d.ts

@@ -5,11 +5,18 @@ interface setupWalletButtonOptions {
     nearWallet: Wallet;
     btcWallet?: OriginalWallet;
     walletUrl?: string;
+    draggable?: boolean;
+    initialPosition?: {
+        right: string;
+        bottom: string;
+    };
+    buttonSize?: string;
+    mobileButtonSize?: string;
 }
 interface OriginalWallet {
     account: string | undefined;
     getPublicKey: () => Promise<string | undefined>;
 }
-export declare function setupWalletButton({ env, nearWallet, btcWallet, walletUrl, }: setupWalletButtonOptions): void;
+export declare function setupWalletButton({ env, nearWallet, btcWallet, walletUrl, draggable, initialPosition, buttonSize, mobileButtonSize, }: setupWalletButtonOptions): void;
 export declare function removeWalletButton(): void;
 export {};

package/esm/index.js

@@ -2501,6 +2501,8 @@ var ConnectProvider = ({
   }, [connector, requestAccount]);
   useEffect5(() => {
     const onAccountChange = (accounts2) => {
+      if (!accounts2.length)
+        return;
       setAccounts(accounts2);
     };
     connector == null ? void 0 : connector.on("accountsChanged", onAccountChange);
@@ -2812,16 +2814,13 @@ function useBtcWalletSelector() {
     const connectWallet = (useModal = false) => __async(this, null, function* () {
       if (connectModalOpen)
         return null;
-      const account = accounts == null ? void 0 : accounts[0];
-      if (account)
-        return account;
       try {
         if (useModal) {
           openConnectModal == null ? void 0 : openConnectModal();
         } else {
           yield requestDirectAccount(connectorRef.current);
         }
-        const account2 = yield retryOperation(
+        const account = yield retryOperation(
           () => window.btcContext.account,
           (res) => !!res,
           {
@@ -2829,7 +2828,7 @@ function useBtcWalletSelector() {
             delayMs: 1e3
           }
         );
-        return account2 || null;
+        return account || null;
       } catch (error) {
         console.error("btcLoginError", error);
         context.emit("btcLoginError");
@@ -4379,11 +4378,16 @@ function uint8ArrayToHex(uint8Array) {
 
 // src/utils/initWalletButton.ts
 var storage4 = storageStore("SATOSHI_WALLET_BUTTON");
+var minimumMargin = 10;
 function setupWalletButton({
   env,
   nearWallet,
   btcWallet,
-  walletUrl
+  walletUrl,
+  draggable = true,
+  initialPosition,
+  buttonSize,
+  mobileButtonSize
 }) {
   if (document.getElementById("satoshi-wallet-button")) {
     return;
@@ -4407,14 +4411,22 @@ function setupWalletButton({
   const button = createFloatingButtonWithIframe({
     openImageUrl,
     closeImageUrl,
-    iframe
+    iframe,
+    draggable,
+    initialPosition,
+    buttonSize,
+    mobileButtonSize
   });
   setupButtonClickHandler(button, iframe, nearWallet, btcWallet);
 }
 function createFloatingButtonWithIframe({
   openImageUrl,
   closeImageUrl,
-  iframe
+  iframe,
+  draggable,
+  initialPosition,
+  buttonSize,
+  mobileButtonSize
 }) {
   const button = document.createElement("img");
   button.id = "satoshi-wallet-button";
@@ -4423,32 +4435,49 @@ function createFloatingButtonWithIframe({
   iframe.style.display = isIframeVisible ? "block" : "none";
   const windowWidth = window.innerWidth;
   const windowHeight = window.innerHeight;
-  const savedPosition = (storage4 == null ? void 0 : storage4.get("position")) || {
+  const savedPosition = storage4 == null ? void 0 : storage4.get("position");
+  const currentInitialPosition = initialPosition || savedPosition || {
     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);
+  const tempButtonSize = buttonSize || "60px";
+  const tempMobileButtonSize = mobileButtonSize || buttonSize || "40px";
+  const actualButtonSize = isMobile() ? parseInt(tempMobileButtonSize) : parseInt(tempButtonSize);
+  const right = Math.min(
+    Math.max(minimumMargin, parseInt(currentInitialPosition.right)),
+    windowWidth - actualButtonSize - minimumMargin
+  );
+  const bottom = Math.min(
+    Math.max(minimumMargin, parseInt(currentInitialPosition.bottom)),
+    windowHeight - actualButtonSize - minimumMargin
+  );
   Object.assign(button.style, {
     position: "fixed",
     bottom: `${bottom}px`,
     right: `${right}px`,
     zIndex: "100000",
-    width: "60px",
-    height: "60px",
-    cursor: "grab",
+    width: buttonSize || "60px",
+    height: buttonSize || "60px",
+    cursor: draggable ? "grab" : "pointer",
     transition: "transform 0.15s ease",
     userSelect: "none",
     touchAction: "none"
   });
   if (isMobile()) {
     Object.assign(button.style, {
-      width: "40px",
-      height: "40px"
+      width: mobileButtonSize || buttonSize || "40px",
+      height: mobileButtonSize || buttonSize || "40px"
     });
   }
   document.body.appendChild(button);
-  updateIframePosition(iframe, right, bottom, windowWidth, windowHeight);
+  updateIframePosition(
+    iframe,
+    right,
+    bottom,
+    windowWidth,
+    windowHeight,
+    parseInt(button.style.width)
+  );
   let isDragging = false;
   let startX = 0;
   let startY = 0;
@@ -4456,6 +4485,8 @@ function createFloatingButtonWithIframe({
   let initialBottom = 0;
   let dragStartTime = 0;
   function startDrag(clientX, clientY) {
+    if (!draggable)
+      return;
     isDragging = true;
     startX = clientX;
     startY = clientY;
@@ -4484,7 +4515,7 @@ function createFloatingButtonWithIframe({
   button.addEventListener(
     "click",
     (e) => {
-      if (!isDragging) {
+      if (!isDragging || !draggable) {
         toggleWallet();
       }
       e.preventDefault();
@@ -4492,107 +4523,117 @@ function createFloatingButtonWithIframe({
     },
     { capture: true }
   );
-  button.addEventListener(
-    "mousedown",
-    (e) => {
-      startDrag(e.clientX, e.clientY);
-      e.preventDefault();
-      e.stopPropagation();
-    },
-    { capture: true }
-  );
-  button.addEventListener(
-    "touchstart",
-    (e) => {
-      if (e.touches.length === 1) {
-        const touch = e.touches[0];
-        startDrag(touch.clientX, touch.clientY);
+  if (draggable) {
+    button.addEventListener(
+      "mousedown",
+      (e) => {
+        startDrag(e.clientX, e.clientY);
         e.preventDefault();
         e.stopPropagation();
-      }
-    },
-    { capture: true }
-  );
-  document.addEventListener(
-    "mousemove",
-    (e) => {
-      if (!isDragging)
-        return;
-      moveButton(e.clientX, e.clientY);
-      e.preventDefault();
-    },
-    { capture: true }
-  );
-  document.addEventListener(
-    "touchmove",
-    (e) => {
-      if (!isDragging || e.touches.length !== 1)
-        return;
-      const touch = e.touches[0];
-      moveButton(touch.clientX, touch.clientY);
-      e.preventDefault();
-    },
-    { capture: true }
-  );
+      },
+      { capture: true }
+    );
+    button.addEventListener(
+      "touchstart",
+      (e) => {
+        if (e.touches.length === 1) {
+          const touch = e.touches[0];
+          startDrag(touch.clientX, touch.clientY);
+          e.preventDefault();
+          e.stopPropagation();
+        }
+      },
+      { capture: true }
+    );
+    document.addEventListener(
+      "mousemove",
+      (e) => {
+        if (!isDragging)
+          return;
+        moveButton(e.clientX, e.clientY);
+        e.preventDefault();
+      },
+      { capture: true }
+    );
+    document.addEventListener(
+      "touchmove",
+      (e) => {
+        if (!isDragging || e.touches.length !== 1)
+          return;
+        const touch = e.touches[0];
+        moveButton(touch.clientX, touch.clientY);
+        e.preventDefault();
+      },
+      { capture: true }
+    );
+    document.addEventListener(
+      "mouseup",
+      (e) => {
+        if (isDragging) {
+          e.preventDefault();
+          e.stopPropagation();
+        }
+        endDrag();
+      },
+      { capture: true }
+    );
+    document.addEventListener(
+      "touchend",
+      (e) => {
+        if (isDragging) {
+          e.preventDefault();
+          e.stopPropagation();
+        }
+        endDrag();
+        const dragEndTime = Date.now();
+        const dragDuration = dragEndTime - dragStartTime;
+        if (dragDuration < 200 && Math.abs(parseInt(button.style.right) - initialRight) < 5 && Math.abs(parseInt(button.style.bottom) - initialBottom) < 5) {
+          toggleWallet();
+        }
+      },
+      { capture: true }
+    );
+    document.addEventListener(
+      "touchcancel",
+      () => {
+        endDrag();
+      },
+      { capture: true }
+    );
+  }
   function moveButton(clientX, clientY) {
     const deltaX = startX - clientX;
     const deltaY = startY - clientY;
     let newRight = initialRight + deltaX;
     let newBottom = initialBottom + deltaY;
-    newRight = Math.min(Math.max(20, newRight), windowWidth - 80);
-    newBottom = Math.min(Math.max(20, newBottom), windowHeight - 80);
-    const snapThreshold = 20;
-    const buttonLeft = windowWidth - newRight - 60;
+    const currentButtonSize = parseInt(button.style.width);
+    newRight = Math.min(
+      Math.max(minimumMargin, newRight),
+      windowWidth - currentButtonSize - minimumMargin
+    );
+    newBottom = Math.min(
+      Math.max(minimumMargin, newBottom),
+      windowHeight - currentButtonSize - minimumMargin
+    );
+    const snapThreshold = minimumMargin;
+    const buttonLeft = windowWidth - newRight - currentButtonSize;
     if (buttonLeft < snapThreshold) {
-      newRight = windowWidth - 80;
-    } else if (buttonLeft > windowWidth - snapThreshold - 60) {
-      newRight = 20;
+      newRight = windowWidth - currentButtonSize - minimumMargin;
+    } else if (newRight < snapThreshold) {
+      newRight = minimumMargin;
     }
-    if (newBottom < snapThreshold) {
-      newBottom = 20;
-    } else if (newBottom > windowHeight - snapThreshold - 60) {
-      newBottom = windowHeight - 80;
+    const buttonTop = windowHeight - newBottom - currentButtonSize;
+    if (buttonTop < snapThreshold) {
+      newBottom = windowHeight - currentButtonSize - minimumMargin;
+    } else if (newBottom < snapThreshold) {
+      newBottom = minimumMargin;
     }
     button.style.right = `${newRight}px`;
     button.style.bottom = `${newBottom}px`;
-    updateIframePosition(iframe, newRight, newBottom, windowWidth, windowHeight);
+    updateIframePosition(iframe, newRight, newBottom, windowWidth, windowHeight, currentButtonSize);
   }
-  document.addEventListener(
-    "mouseup",
-    (e) => {
-      if (isDragging) {
-        e.preventDefault();
-        e.stopPropagation();
-      }
-      endDrag();
-    },
-    { capture: true }
-  );
-  document.addEventListener(
-    "touchend",
-    (e) => {
-      if (isDragging) {
-        e.preventDefault();
-        e.stopPropagation();
-      }
-      endDrag();
-      const dragEndTime = Date.now();
-      const dragDuration = dragEndTime - dragStartTime;
-      if (dragDuration < 200 && Math.abs(parseInt(button.style.right) - initialRight) < 5 && Math.abs(parseInt(button.style.bottom) - initialBottom) < 5) {
-        toggleWallet();
-      }
-    },
-    { capture: true }
-  );
-  document.addEventListener(
-    "touchcancel",
-    () => {
-      endDrag();
-    },
-    { capture: true }
-  );
   function endDrag() {
-    if (!isDragging)
+    if (!isDragging || !draggable)
       return;
     isDragging = false;
     button.style.cursor = "grab";
@@ -4602,8 +4643,6 @@ function createFloatingButtonWithIframe({
       bottom: button.style.bottom
     });
   }
-  const handleButtonClick = () => {
-  };
   button.onclick = null;
   return button;
 }
@@ -4696,16 +4735,16 @@ function removeWalletButton() {
   const iframe = document.getElementById("satoshi-wallet-iframe");
   iframe == null ? void 0 : iframe.remove();
 }
-function updateIframePosition(iframe, buttonRight, buttonBottom, windowWidth, windowHeight) {
+function updateIframePosition(iframe, buttonRight, buttonBottom, windowWidth, windowHeight, buttonSize) {
   const iframeWidth = parseInt(iframe.style.width);
   const iframeHeight = parseInt(iframe.style.height);
   let iframeRight = buttonRight;
-  let iframeBottom = buttonBottom + 70;
-  if (iframeRight + iframeWidth > windowWidth - 20) {
-    iframeRight = Math.max(20, windowWidth - iframeWidth - 20);
+  let iframeBottom = buttonBottom + buttonSize + 10;
+  if (iframeRight + iframeWidth > windowWidth - minimumMargin) {
+    iframeRight = Math.max(minimumMargin, windowWidth - iframeWidth - minimumMargin);
   }
-  if (iframeBottom + iframeHeight > windowHeight - 20) {
-    iframeBottom = Math.max(20, buttonBottom - iframeHeight - 10);
+  if (iframeBottom + iframeHeight > windowHeight - minimumMargin) {
+    iframeBottom = Math.max(minimumMargin, buttonBottom - iframeHeight - 10);
   }
   iframe.style.right = `${iframeRight}px`;
   iframe.style.bottom = `${iframeBottom}px`;
@@ -5055,7 +5094,11 @@ function setupWalletSelectorModal(selector, options) {
     showChainGroups = true,
     showWalletUIForNearAccount = true,
     env = "mainnet",
-    walletUrl
+    walletUrl,
+    draggable = true,
+    initialPosition = { right: "20px", bottom: "20px" },
+    buttonSize = "60px",
+    mobileButtonSize = "40px"
   } = options;
   subscription == null ? void 0 : subscription.unsubscribe();
   const state = selector.store.getState();
@@ -5067,7 +5110,15 @@ function setupWalletSelectorModal(selector, options) {
       removeWalletButton();
     if (showWalletUIForNearAccount && walletId !== "btc-wallet") {
       selector.wallet().then((wallet) => {
-        setupWalletButton({ env, nearWallet: wallet, walletUrl });
+        setupWalletButton({
+          env,
+          nearWallet: wallet,
+          walletUrl,
+          draggable,
+          initialPosition,
+          buttonSize,
+          mobileButtonSize
+        });
       });
     }
   });
@@ -5159,7 +5210,7 @@ function getGroup(state) {
 
 // src/index.ts
 var getVersion = () => {
-  return "0.5.63-beta";
+  return "0.5.65-beta";
 };
 if (typeof window !== "undefined") {
   window.__BTC_WALLET_VERSION = getVersion();