btc-wallet 0.5.58-beta → 0.5.60-beta

package/dist/index.js

@@ -1171,7 +1171,7 @@ var MagicEdenConnector = class extends BaseConnector {
         };
         sendBtcTransaction(sendBtcOptions).catch((e) => reject(e));
       });
-      return result;
+      return (result == null ? void 0 : result.txid) || result;
     });
   }
   disconnect() {
@@ -4461,7 +4461,7 @@ function setupWalletButton({
   }
   const iframe = createIframe({
     iframeUrl: walletUrl || walletConfig[env].walletUrl,
-    iframeStyle: { width: "400px", height: "650px" }
+    iframeStyle: isMobile() ? { width: "calc(100% - 40px)", height: "80%" } : { width: "400px", height: "650px" }
   });
   iframe.addEventListener("mouseenter", () => {
     var _a;
@@ -4472,9 +4472,12 @@ function setupWalletButton({
       }, 0);
     }
   });
+  const isNearWallet = !btcWallet;
+  const openImageUrl = `https://assets.deltatrade.ai/wallet-assets/wallet${isNearWallet ? "-near" : ""}-btn.png`;
+  const closeImageUrl = `https://assets.deltatrade.ai/wallet-assets/wallet${isNearWallet ? "-near" : ""}-btn-active.png`;
   const button = createFloatingButtonWithIframe({
-    openImageUrl: "https://assets.deltatrade.ai/wallet-assets/wallet-btn.png",
-    closeImageUrl: "https://assets.deltatrade.ai/wallet-assets/wallet-btn-active.png",
+    openImageUrl,
+    closeImageUrl,
     iframe
   });
   setupButtonClickHandler(button, iframe, nearWallet, btcWallet);
@@ -4502,15 +4505,20 @@ function createFloatingButtonWithIframe({
     position: "fixed",
     bottom: `${bottom}px`,
     right: `${right}px`,
-    zIndex: "2147483647",
+    zIndex: "100000",
     width: "60px",
     height: "60px",
     cursor: "grab",
     transition: "transform 0.15s ease",
     userSelect: "none",
-    touchAction: "none",
-    pointerEvents: "auto"
+    touchAction: "none"
   });
+  if (isMobile()) {
+    Object.assign(button.style, {
+      width: "40px",
+      height: "40px"
+    });
+  }
   document.body.appendChild(button);
   updateIframePosition(iframe, right, bottom, windowWidth, windowHeight);
   let isDragging = false;
@@ -4518,71 +4526,86 @@ function createFloatingButtonWithIframe({
   let startY = 0;
   let initialRight = 0;
   let initialBottom = 0;
-  let isLongPress = false;
+  let dragStartTime = 0;
+  function startDrag(clientX, clientY) {
+    isDragging = true;
+    startX = clientX;
+    startY = clientY;
+    initialRight = parseInt(button.style.right);
+    initialBottom = parseInt(button.style.bottom);
+    dragStartTime = Date.now();
+    button.style.cursor = "grabbing";
+    button.style.transition = "none";
+  }
+  function toggleWallet() {
+    const isCurrentlyVisible = iframe.style.display === "block";
+    button.style.transform = "scale(0.8)";
+    setTimeout(() => {
+      button.style.transform = "scale(1)";
+    }, 150);
+    const newVisibleState = !isCurrentlyVisible;
+    iframe.style.display = newVisibleState ? "block" : "none";
+    button.src = newVisibleState ? closeImageUrl : openImageUrl;
+    storage4 == null ? void 0 : storage4.set("visible", newVisibleState);
+    setTimeout(() => {
+      if (newVisibleState) {
+        iframe.focus();
+      }
+    }, 0);
+  }
   button.addEventListener(
     "click",
     (e) => {
-      if (isLongPress) {
-        isLongPress = false;
-        return;
+      if (!isDragging) {
+        toggleWallet();
       }
-      handleButtonClick();
       e.preventDefault();
       e.stopPropagation();
     },
     { capture: true }
   );
-  const handleMouseDown = (e) => {
-    startDrag(e.clientX, e.clientY);
-    e.preventDefault();
-    e.stopPropagation();
-  };
-  const handleTouchStart = (e) => {
-    if (e.touches.length === 1) {
-      const touch = e.touches[0];
-      startDrag(touch.clientX, touch.clientY);
+  button.addEventListener(
+    "mousedown",
+    (e) => {
+      startDrag(e.clientX, e.clientY);
       e.preventDefault();
       e.stopPropagation();
-    }
-  };
-  button.addEventListener("mousedown", handleMouseDown, { capture: true });
-  button.addEventListener("touchstart", handleTouchStart, { capture: true });
-  function startDrag(clientX, clientY) {
-    isDragging = true;
-    startX = clientX;
-    startY = clientY;
-    initialRight = parseInt(button.style.right);
-    initialBottom = parseInt(button.style.bottom);
-    button.style.cursor = "grabbing";
-    button.style.transition = "none";
-  }
-  const handleMouseMove = (e) => {
-    if (!isDragging)
-      return;
-    const deltaX = Math.abs(startX - e.clientX);
-    const deltaY = Math.abs(startY - e.clientY);
-    if (deltaX > 5 || deltaY > 5) {
-      isLongPress = true;
-    }
-    moveButton(e.clientX, e.clientY);
-    e.preventDefault();
-    e.stopPropagation();
-  };
-  const handleTouchMove = (e) => {
-    if (!isDragging || e.touches.length !== 1)
-      return;
-    const touch = e.touches[0];
-    const deltaX = Math.abs(startX - touch.clientX);
-    const deltaY = Math.abs(startY - touch.clientY);
-    if (deltaX > 5 || deltaY > 5) {
-      isLongPress = true;
-    }
-    moveButton(touch.clientX, touch.clientY);
-    e.preventDefault();
-    e.stopPropagation();
-  };
-  document.addEventListener("mousemove", handleMouseMove, { capture: true });
-  document.addEventListener("touchmove", handleTouchMove, { 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 }
+  );
   function moveButton(clientX, clientY) {
     const deltaX = startX - clientX;
     const deltaY = startY - clientY;
@@ -4606,23 +4629,40 @@ function createFloatingButtonWithIframe({
     button.style.bottom = `${newBottom}px`;
     updateIframePosition(iframe, newRight, newBottom, windowWidth, windowHeight);
   }
-  const handleMouseUp = (e) => {
-    if (isDragging) {
-      e.preventDefault();
-      e.stopPropagation();
-    }
-    endDrag();
-  };
-  const handleTouchEnd = (e) => {
-    if (isDragging) {
-      e.preventDefault();
-      e.stopPropagation();
-    }
-    endDrag();
-  };
-  document.addEventListener("mouseup", handleMouseUp, { capture: true });
-  document.addEventListener("touchend", handleTouchEnd, { capture: true });
-  document.addEventListener("touchcancel", handleTouchEnd, { 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 endDrag() {
     if (!isDragging)
       return;
@@ -4635,20 +4675,6 @@ function createFloatingButtonWithIframe({
     });
   }
   const handleButtonClick = () => {
-    const isCurrentlyVisible = iframe.style.display === "block";
-    button.style.transform = "scale(0.8)";
-    setTimeout(() => {
-      button.style.transform = "scale(1)";
-    }, 150);
-    const newVisibleState = !isCurrentlyVisible;
-    iframe.style.display = newVisibleState ? "block" : "none";
-    button.src = newVisibleState ? closeImageUrl : openImageUrl;
-    storage4 == null ? void 0 : storage4.set("visible", newVisibleState);
-    setTimeout(() => {
-      if (newVisibleState) {
-        iframe.focus();
-      }
-    }, 0);
   };
   button.onclick = null;
   return button;
@@ -4667,12 +4693,11 @@ function createIframe({
     position: "fixed",
     bottom: "90px",
     right: "20px",
-    zIndex: "2147483646",
+    zIndex: "100000",
     boxShadow: "0 0 10px rgba(0, 0, 0, 0.1)",
     borderRadius: "10px",
     display: isVisible ? "block" : "none",
-    border: "none",
-    pointerEvents: "auto"
+    border: "none"
   }, iframeStyle));
   document.body.appendChild(iframe);
   return iframe;
@@ -5124,12 +5149,20 @@ function setupWalletSelectorModal(selector, options) {
       }
     `;
   }
+  if (group.includes("eth")) {
+    document.head.appendChild(document.createElement("style")).textContent = `
+      #near-wallet-selector-modal .options-list .ethereum-wallets {
+        display: none;
+      }
+    `;
+  }
   const modal = (0, import_ref_modal_ui.setupModal)(selector, options);
   const originalShow = modal.show.bind(modal);
   modal.show = () => __async(this, null, function* () {
-    const chain = group.length > 1 && showChainGroups ? yield openChainModal() : group[0];
-    if (chain === "btc") {
-      const module2 = state.modules.find((module3) => module3.id === "btc-wallet");
+    const chain = group.length > 1 && showChainGroups ? yield openChainModal(group) : group[0];
+    if (["btc", "eth"].includes(chain)) {
+      const moduleId = chain === "btc" ? "btc-wallet" : "ethereum-wallets";
+      const module2 = state.modules.find((module3) => module3.id === moduleId);
       if (module2) {
         const wallet = yield module2.wallet();
         yield wallet.signIn(options);
@@ -5140,15 +5173,20 @@ function setupWalletSelectorModal(selector, options) {
   });
   return modal;
 }
-function openChainModal() {
+var CHAINS = [
+  { id: "btc", name: "Bitcoin" },
+  { id: "eth", name: "Ethereum" },
+  { id: "near", name: "Near" }
+];
+function openChainModal(group) {
   return __async(this, null, function* () {
-    const chains5 = ["btc", "near"];
+    const chains5 = CHAINS.filter((chain) => group.includes(chain.id));
     const content = (resolve, close) => {
       const buttons = `
       <div class="option-list">${chains5.map(
-        (chain) => `<button class="chain-button option-item" data-chain="${chain}">
-        <img src="https://assets.deltatrade.ai/assets/chain/${chain}.svg" alt="${chain}" style="width:32px; height: 32px;" />
-        ${chain.toUpperCase()}
+        (chain) => `<button class="chain-button option-item" data-chain="${chain.id}">
+        <img src="https://assets.deltatrade.ai/assets/chain/${chain.id}.svg" alt="${chain.id}" style="width:32px; height: 32px;" />
+        ${chain.name}
         </button>`
       ).join("")}
       </div>
@@ -5173,10 +5211,15 @@ function openChainModal() {
 }
 function getGroup(state) {
   const hasBtcWallet = state.modules.some((module2) => module2.id === "btc-wallet");
-  const hasNearWallet = state.modules.some((module2) => module2.id !== "btc-wallet");
+  const hasEvmWallet = state.modules.some((module2) => module2.id === "ethereum-wallets");
+  const hasNearWallet = state.modules.some(
+    (module2) => module2.id !== "btc-wallet" && module2.id !== "ethereum-wallets"
+  );
   const group = [];
   if (hasBtcWallet)
     group.push("btc");
+  if (hasEvmWallet)
+    group.push("eth");
   if (hasNearWallet)
     group.push("near");
   return group;
@@ -5184,7 +5227,7 @@ function getGroup(state) {
 
 // src/index.ts
 var getVersion = () => {
-  return "0.5.58-beta";
+  return "0.5.60-beta";
 };
 if (typeof window !== "undefined") {
   window.__BTC_WALLET_VERSION = getVersion();