btc-wallet 0.1.0 → 0.1.2

package/esm/index.js

@@ -2318,7 +2318,6 @@ import { sha256 } from "js-sha256";
 // src/utils/initWalletButton.ts
 function setupWalletButton(network, wallet, originalWallet) {
   if (document.getElementById("satoshi-wallet-button")) {
-    sendInitializeData(wallet, originalWallet);
     return;
   }
   const iframe = createIframe({
@@ -2375,6 +2374,9 @@ function createIframe({
   iframe.id = "satoshi-wallet-iframe";
   iframe.allow = "clipboard-read; clipboard-write";
   iframe.src = iframeUrl;
+  iframe.onclick = () => {
+    iframe.focus();
+  };
   Object.assign(iframe.style, __spreadValues({
     position: "fixed",
     bottom: "90px",
@@ -2387,45 +2389,27 @@ function createIframe({
   document.body.appendChild(iframe);
   return iframe;
 }
-function sendInitializeData(wallet, originalWallet) {
+function setupButtonClickHandler(button, iframe, wallet, originalWallet) {
   return __async(this, null, function* () {
-    var _a, _b;
-    yield delay(1e3);
+    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 iframe = document.getElementById("satoshi-wallet-iframe");
-    if ((iframe == null ? void 0 : iframe.contentWindow) && ((_b = iframe.contentDocument) == null ? void 0 : _b.readyState) === "complete") {
-      iframe.contentWindow.postMessage(
-        {
-          action: "initializeData",
-          success: true,
-          data: {
-            accountId,
-            originalAccountId,
-            originalPublicKey
-          }
-        },
-        { targetOrigin: window.location.origin }
-      );
-    }
-  });
-}
-function setupButtonClickHandler(button, iframe, wallet, originalWallet) {
-  return __async(this, null, function* () {
-    iframe.onload = () => sendInitializeData(wallet, originalWallet);
     const iframeSrc = new URL(iframe.src);
     iframeSrc.searchParams.set("origin", window.location.origin);
+    accountId && iframeSrc.searchParams.set("accountId", accountId);
+    originalAccountId && iframeSrc.searchParams.set("originalAccountId", originalAccountId);
+    originalPublicKey && iframeSrc.searchParams.set("originalPublicKey", originalPublicKey);
     iframe.src = iframeSrc.toString();
     window.addEventListener("message", (event) => __async(this, null, function* () {
-      var _a, _b;
+      var _a2, _b;
       if (event.origin !== iframeSrc.origin)
         return;
       const { action, requestId, data } = event.data;
       if (action === "signAndSendTransaction") {
         try {
           const result = yield wallet.signAndSendTransaction(data);
-          (_a = event.source) == null ? void 0 : _a.postMessage(
+          (_a2 = event.source) == null ? void 0 : _a2.postMessage(
             {
               requestId,
               data,
@@ -2531,11 +2515,8 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
       if (btcContext) {
         clearInterval(inter);
         const context = btcContext.getContext();
-        const accountId = state.getAccount();
-        initWalletButton(options.network.networkId, accountId, wallet);
         context.on("updatePublicKey", (btcPublicKey) => __async(void 0, null, function* () {
           const { nearTempAddress } = yield getNearAccountByBtcPublicKey(btcPublicKey);
-          initWalletButton(options.network.networkId, nearTempAddress, wallet);
           emitter.emit("accountsChanged", {
             accounts: [
               {
@@ -2556,6 +2537,7 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
       }
     }), 500);
   }
+  initWalletButton(options.network.networkId, state.getAccount(), wallet);
   function viewMethod(_02) {
     return __async(this, arguments, function* ({ method, args = {} }) {
       const res = yield provider.query({
@@ -2581,6 +2563,7 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
       state.saveAccount(nearTempAddress);
       state.savePublicKey(nearTempPublicKey);
       state.saveBtcPublicKey(btcPublicKey);
+      initWalletButton(options.network.networkId, nearTempAddress, wallet);
       return {
         nearTempAddress,
         nearTempPublicKey
@@ -2603,7 +2586,6 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
       const btcAccount = yield btcContext.login();
       const btcPublicKey = yield btcContext.getPublicKey();
       const { nearTempAddress, nearTempPublicKey } = yield getNearAccountByBtcPublicKey(btcPublicKey);
-      initWalletButton(options.network.networkId, accountId, wallet);
       return [
         {
           accountId: nearTempAddress,
@@ -2788,16 +2770,16 @@ function toHex(originalString) {
 }
 function initWalletButton(network, accountId, wallet) {
   return __async(this, null, function* () {
-    yield delay(2e3);
+    yield delay(1e3);
     const checkAndSetupWalletButton = () => {
       if (accountId && window.btcContext.account) {
         setupWalletButton(network, wallet, window.btcContext);
       } else {
         removeWalletButton();
+        !window.btcContext.account && setTimeout(() => {
+          checkAndSetupWalletButton();
+        }, 5e3);
       }
-      !window.btcContext.account && setTimeout(() => {
-        checkAndSetupWalletButton();
-      }, 1e4);
     };
     checkAndSetupWalletButton();
   });
@@ -2847,7 +2829,7 @@ function pollTransactionStatuses(network, hashes) {
 
 // src/index.ts
 var getVersion = () => {
-  return "0.1.0";
+  return "0.1.2";
 };
 if (typeof window !== "undefined") {
   window.__PARTICLE_BTC_CONNECT_VERSION = getVersion();