btc-wallet 0.5.59-beta → 0.5.61-beta

package/esm/index.js

@@ -1101,7 +1101,7 @@ var MagicEdenConnector = class extends BaseConnector {
         };
         sendBtcTransaction(sendBtcOptions).catch((e) => reject(e));
       });
-      return result;
+      return (result == null ? void 0 : result.txid) || result;
     });
   }
   disconnect() {
@@ -4402,9 +4402,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);
@@ -5078,12 +5081,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 = _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 module = state.modules.find((module2) => module2.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 module = state.modules.find((module2) => module2.id === moduleId);
       if (module) {
         const wallet = yield module.wallet();
         yield wallet.signIn(options);
@@ -5094,15 +5105,23 @@ function setupWalletSelectorModal(selector, options) {
   });
   return modal;
 }
-function openChainModal() {
+var CHAINS = [
+  { id: "btc", name: "Bitcoin", description: "MPC Mapping" },
+  { id: "eth", name: "Ethereum", description: "EVM address as Near Account" },
+  { id: "near", name: "Near", description: "Near Account" }
+];
+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;" />
+          <div style="display: flex; flex-direction: column; text-align: left;">
+            <div style="font-size: 16px; font-weight: bold;">${chain.name}</div>
+            <div style="font-size: 12px; opacity:0.5;">${chain.description}</div>
+          </div>
         </button>`
       ).join("")}
       </div>
@@ -5127,10 +5146,15 @@ function openChainModal() {
 }
 function getGroup(state) {
   const hasBtcWallet = state.modules.some((module) => module.id === "btc-wallet");
-  const hasNearWallet = state.modules.some((module) => module.id !== "btc-wallet");
+  const hasEvmWallet = state.modules.some((module) => module.id === "ethereum-wallets");
+  const hasNearWallet = state.modules.some(
+    (module) => module.id !== "btc-wallet" && module.id !== "ethereum-wallets"
+  );
   const group = [];
   if (hasBtcWallet)
     group.push("btc");
+  if (hasEvmWallet)
+    group.push("eth");
   if (hasNearWallet)
     group.push("near");
   return group;
@@ -5138,7 +5162,7 @@ function getGroup(state) {
 
 // src/index.ts
 var getVersion = () => {
-  return "0.5.59-beta";
+  return "0.5.61-beta";
 };
 if (typeof window !== "undefined") {
   window.__BTC_WALLET_VERSION = getVersion();