@tonconnect/ui 2.0.3-beta.0 → 2.0.3-beta.2

package/lib/index.cjs

@@ -10036,18 +10036,26 @@ const WalletsModal = () => {
     return (_a2 = appState.connectRequestParameters) == null ? void 0 : _a2.value;
   });
   const onClose = (closeReason) => {
-    setWalletsModalState({
-      status: "closed",
-      closeReason
-    });
-    setSelectedWalletInfo(null);
-    setInfoTab(false);
+    tonConnectUI.closeModal(closeReason);
   };
   const unsubscribe = connector.onStatusChange((wallet) => {
     if (wallet) {
       onClose("wallet-selected");
     }
   });
+  const onSelectAllWallets = () => {
+    setSelectedTab("all-wallets");
+  };
+  const onSelectUniversal = () => {
+    setSelectedTab("universal");
+  };
+  const clearSelectedWalletInfo = () => {
+    setSelectedWalletInfo(null);
+  };
+  onCleanup(() => {
+    setSelectedWalletInfo(null);
+    setInfoTab(false);
+  });
   onCleanup(unsubscribe);
   return createComponent(StyledModal, {
     get opened() {
@@ -10112,7 +10120,7 @@ const WalletsModal = () => {
                         get additionalRequest() {
                           return additionalRequest();
                         },
-                        onBackClick: () => setSelectedWalletInfo(null)
+                        onBackClick: clearSelectedWalletInfo
                       });
                     }
                   }), createComponent(Match, {
@@ -10131,7 +10139,7 @@ const WalletsModal = () => {
                         get additionalRequest() {
                           return additionalRequest();
                         },
-                        onSelectAllWallets: () => setSelectedTab("all-wallets")
+                        onSelectAllWallets
                       });
                     }
                   }), createComponent(Match, {
@@ -10143,7 +10151,7 @@ const WalletsModal = () => {
                         get walletsList() {
                           return walletsList();
                         },
-                        onBack: () => setSelectedTab("universal"),
+                        onBack: onSelectUniversal,
                         onSelect: setSelectedWalletInfo
                       });
                     }
@@ -10398,6 +10406,7 @@ const SingleWalletModal = () => {
     }
   });
   const connector = useContext(ConnectorContext);
+  const tonConnectUI = useContext(TonConnectUiContext);
   const [infoTab, setInfoTab] = createSignal(false);
   const additionalRequestLoading = () => {
     var _a2;
@@ -10411,11 +10420,7 @@ const SingleWalletModal = () => {
     return (_a2 = appState.connectRequestParameters) == null ? void 0 : _a2.value;
   });
   const onClose = (closeReason) => {
-    setSingleWalletModalState({
-      status: "closed",
-      closeReason
-    });
-    setInfoTab(false);
+    tonConnectUI.closeSingleWalletModal(closeReason);
   };
   const unsubscribe = connector.onStatusChange((wallet) => {
     if (wallet) {
@@ -10423,6 +10428,9 @@ const SingleWalletModal = () => {
     }
   });
   onCleanup(unsubscribe);
+  onCleanup(() => {
+    setInfoTab(false);
+  });
   return createComponent(StyledModal, {
     get opened() {
       return getSingleWalletModalIsOpened();
@@ -10572,8 +10580,10 @@ class WalletsModalManager {
     __publicField(this, "connector");
     __publicField(this, "setConnectRequestParametersCallback");
     __publicField(this, "consumers", []);
+    __publicField(this, "tracker");
     __publicField(this, "state", walletsModalState());
     this.connector = options.connector;
+    this.tracker = options.tracker;
     this.setConnectRequestParametersCallback = options.setConnectRequestParametersCallback;
     createEffect(() => {
       const state = walletsModalState();
@@ -10583,6 +10593,7 @@ class WalletsModalManager {
   }
   open() {
     return __async(this, null, function* () {
+      this.tracker.trackConnectionStarted();
       const walletsList = yield this.connector.getWallets();
       const embeddedWallet = walletsList.find(sdk.isWalletInfoCurrentlyEmbedded);
       if (embeddedWallet) {
@@ -10592,8 +10603,11 @@ class WalletsModalManager {
       }
     });
   }
-  close() {
-    widgetController.closeWalletsModal("action-cancelled");
+  close(reason = "action-cancelled") {
+    if (reason === "action-cancelled") {
+      this.tracker.trackConnectionError("Connection was cancelled");
+    }
+    widgetController.closeWalletsModal(reason);
   }
   onStateChange(onChange) {
     this.consumers.push(onChange);
@@ -10653,8 +10667,10 @@ class SingleWalletModalManager {
     __publicField(this, "connector");
     __publicField(this, "setConnectRequestParametersCallback");
     __publicField(this, "consumers", []);
+    __publicField(this, "tracker");
     __publicField(this, "state", singleWalletModalState());
     this.connector = options.connector;
+    this.tracker = options.tracker;
     this.setConnectRequestParametersCallback = options.setConnectRequestParametersCallback;
     createEffect(() => {
       const state = singleWalletModalState();
@@ -10664,6 +10680,7 @@ class SingleWalletModalManager {
   }
   open(wallet) {
     return __async(this, null, function* () {
+      this.tracker.trackConnectionStarted();
       const fetchedWalletsList = yield this.connector.getWallets();
       const walletsList = applyWalletsListConfiguration(
         fetchedWalletsList,
@@ -10680,10 +10697,15 @@ class SingleWalletModalManager {
       if (isExternalWalletExist) {
         return this.openSingleWalletModal(externalWallet);
       }
-      throw new TonConnectUIError(`Trying to open modal window with unknown wallet "${wallet}".`);
+      const error = `Trying to open modal window with unknown wallet "${wallet}".`;
+      this.tracker.trackConnectionError(error);
+      throw new TonConnectUIError(error);
     });
   }
-  close() {
+  close(reason = "action-cancelled") {
+    if (reason === "action-cancelled") {
+      this.tracker.trackConnectionError("Connection was cancelled");
+    }
     widgetController.closeSingleWalletModal("action-cancelled");
   }
   onStateChange(onChange) {
@@ -10722,181 +10744,86 @@ class SingleWalletModalManager {
     });
   }
 }
-function createConnnectionInfo(wallet) {
-  var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2;
-  let authType = null;
-  if ((_a2 = wallet == null ? void 0 : wallet.connectItems) == null ? void 0 : _a2.tonProof) {
-    authType = "proof" in wallet.connectItems.tonProof ? "ton_proof" : null;
-  } else if (wallet == null ? void 0 : wallet.connectItems) {
-    authType = "ton_addr";
-  }
-  return {
-    address: (_c2 = (_b2 = wallet == null ? void 0 : wallet.account) == null ? void 0 : _b2.address) != null ? _c2 : null,
-    chainId: (_e2 = (_d2 = wallet == null ? void 0 : wallet.account) == null ? void 0 : _d2.chain) != null ? _e2 : null,
-    provider: (_f2 = wallet == null ? void 0 : wallet.provider) != null ? _f2 : null,
-    walletType: (_g2 = wallet == null ? void 0 : wallet.device.appName) != null ? _g2 : null,
-    walletVersion: (_h2 = wallet == null ? void 0 : wallet.device.appVersion) != null ? _h2 : null,
-    authType
-  };
-}
-function createConnectionStartedEvent() {
-  return {
-    type: "connection-started"
-  };
-}
-function createConnectionCompletedEvent(wallet) {
-  return {
-    type: "connection-completed",
-    connectionInfo: createConnnectionInfo(wallet)
-  };
-}
-function createConnectionErrorEvent(reason) {
-  return {
-    type: "connection-error",
-    reason
-  };
-}
-function createConnectionRestoringStartedEvent() {
-  return {
-    type: "connection-restoring-started"
-  };
-}
-function createConnectionRestoringCompletedEvent(wallet) {
-  return {
-    type: "connection-restoring-completed",
-    connectionInfo: createConnnectionInfo(wallet)
-  };
-}
-function createConnectionRestoringErrorEvent(reason) {
-  return {
-    type: "connection-restoring-error",
-    reason
-  };
-}
-function createTransactionInfo(transaction) {
-  var _a2, _b2;
-  return {
-    validUntil: (_a2 = transaction.validUntil) != null ? _a2 : null,
-    from: (_b2 = transaction.from) != null ? _b2 : null,
-    messages: transaction.messages.map((message) => {
-      var _a3, _b3;
-      return {
-        address: (_a3 = message.address) != null ? _a3 : null,
-        amount: (_b3 = message.amount) != null ? _b3 : null
-      };
-    })
-  };
-}
-function createTransactionSentForSignatureEvent(wallet, transaction) {
-  return {
-    type: "transaction-sent-for-signature",
-    connectionInfo: createConnnectionInfo(wallet),
-    transactionInfo: createTransactionInfo(transaction)
-  };
-}
-function createTransactionSignedEvent(wallet, transaction, signedTransaction) {
-  return {
-    type: "transaction-signed",
-    connectionInfo: createConnnectionInfo(wallet),
-    transactionInfo: createTransactionInfo(transaction),
-    signedTransaction: signedTransaction.boc
-  };
-}
-function createTransactionSigningFailedEvent(wallet, transaction, reason) {
-  return {
-    type: "transaction-signing-failed",
-    connectionInfo: createConnnectionInfo(wallet),
-    transactionInfo: createTransactionInfo(transaction),
-    reason
-  };
-}
-function createDisconnectionEvent(wallet, scope) {
-  return {
-    type: "disconnection",
-    connectionInfo: createConnnectionInfo(wallet),
-    scope
-  };
-}
-class TonConnectTracker {
-  constructor() {
+class TonConnectUITracker {
+  constructor(eventDispatcher) {
     __publicField(this, "eventPrefix", "ton-connect-ui-");
-    __publicField(this, "window", getWindow$1());
+    __publicField(this, "eventDispatcher");
+    this.eventDispatcher = eventDispatcher != null ? eventDispatcher : new sdk.BrowserEventDispatcher();
   }
   dispatchUserActionEvent(eventDetails) {
     var _a2;
     try {
       const eventName = `${this.eventPrefix}${eventDetails.type}`;
-      const event = new CustomEvent(eventName, { detail: eventDetails });
-      (_a2 = this.window) == null ? void 0 : _a2.dispatchEvent(event);
+      (_a2 = this.eventDispatcher) == null ? void 0 : _a2.dispatchEvent(eventName, eventDetails).catch();
     } catch (e2) {
     }
   }
   trackConnectionStarted(...args) {
     try {
-      const event = createConnectionStartedEvent(...args);
+      const event = sdk.createConnectionStartedEvent(...args);
       this.dispatchUserActionEvent(event);
     } catch (e2) {
     }
   }
   trackConnectionCompleted(...args) {
     try {
-      const event = createConnectionCompletedEvent(...args);
+      const event = sdk.createConnectionCompletedEvent(...args);
       this.dispatchUserActionEvent(event);
     } catch (e2) {
     }
   }
   trackConnectionError(...args) {
     try {
-      const event = createConnectionErrorEvent(...args);
+      const event = sdk.createConnectionErrorEvent(...args);
       this.dispatchUserActionEvent(event);
     } catch (e2) {
     }
   }
   trackConnectionRestoringStarted(...args) {
     try {
-      const event = createConnectionRestoringStartedEvent(...args);
+      const event = sdk.createConnectionRestoringStartedEvent(...args);
       this.dispatchUserActionEvent(event);
     } catch (e2) {
     }
   }
   trackConnectionRestoringCompleted(...args) {
     try {
-      const event = createConnectionRestoringCompletedEvent(...args);
+      const event = sdk.createConnectionRestoringCompletedEvent(...args);
       this.dispatchUserActionEvent(event);
     } catch (e2) {
     }
   }
   trackConnectionRestoringError(...args) {
     try {
-      const event = createConnectionRestoringErrorEvent(...args);
+      const event = sdk.createConnectionRestoringErrorEvent(...args);
       this.dispatchUserActionEvent(event);
     } catch (e2) {
     }
   }
   trackDisconnection(...args) {
     try {
-      const event = createDisconnectionEvent(...args);
+      const event = sdk.createDisconnectionEvent(...args);
       this.dispatchUserActionEvent(event);
     } catch (e2) {
     }
   }
   trackTransactionSentForSignature(...args) {
     try {
-      const event = createTransactionSentForSignatureEvent(...args);
+      const event = sdk.createTransactionSentForSignatureEvent(...args);
       this.dispatchUserActionEvent(event);
     } catch (e2) {
     }
   }
   trackTransactionSigned(...args) {
     try {
-      const event = createTransactionSignedEvent(...args);
+      const event = sdk.createTransactionSignedEvent(...args);
       this.dispatchUserActionEvent(event);
     } catch (e2) {
     }
   }
   trackTransactionSigningFailed(...args) {
     try {
-      const event = createTransactionSigningFailedEvent(...args);
+      const event = sdk.createTransactionSigningFailedEvent(...args);
       this.dispatchUserActionEvent(event);
     } catch (e2) {
     }
@@ -10906,7 +10833,7 @@ class TonConnectUI {
   constructor(options) {
     __publicField(this, "walletInfoStorage", new WalletInfoStorage());
     __publicField(this, "preferredWalletStorage", new PreferredWalletStorage());
-    __publicField(this, "tracker", new TonConnectTracker());
+    __publicField(this, "tracker");
     __publicField(this, "walletInfo", null);
     __publicField(this, "systemThemeChangeUnsubscribe", null);
     __publicField(this, "actionsConfiguration");
@@ -10920,20 +10847,26 @@ class TonConnectUI {
     if (options && "connector" in options && options.connector) {
       this.connector = options.connector;
     } else if (options && "manifestUrl" in options && options.manifestUrl) {
-      this.connector = new sdk.TonConnect({ manifestUrl: options.manifestUrl });
+      this.connector = new sdk.TonConnect({
+        manifestUrl: options.manifestUrl,
+        eventDispatcher: options == null ? void 0 : options.eventDispatcher
+      });
     } else {
       throw new TonConnectUIError(
         "You have to specify a `manifestUrl` or a `connector` in the options."
       );
     }
+    this.tracker = new TonConnectUITracker(options == null ? void 0 : options.eventDispatcher);
     this.modal = new WalletsModalManager({
       connector: this.connector,
+      tracker: this.tracker,
       setConnectRequestParametersCallback: (callback) => {
         this.connectRequestParametersCallback = callback;
       }
     });
     this.singleWalletModal = new SingleWalletModalManager({
       connector: this.connector,
+      tracker: this.tracker,
       setConnectRequestParametersCallback: (callback) => {
         this.connectRequestParametersCallback = callback;
       }
@@ -11048,13 +10981,11 @@ class TonConnectUI {
   }
   openModal() {
     return __async(this, null, function* () {
-      this.tracker.trackConnectionStarted();
       return this.modal.open();
     });
   }
-  closeModal() {
-    this.tracker.trackConnectionError("Connection was cancelled");
-    this.modal.close();
+  closeModal(reason) {
+    this.modal.close(reason);
   }
   onModalStateChange(onChange) {
     return this.modal.onStateChange(onChange);
@@ -11064,13 +10995,11 @@ class TonConnectUI {
   }
   openSingleWalletModal(wallet) {
     return __async(this, null, function* () {
-      this.tracker.trackConnectionStarted();
       return this.singleWalletModal.open(wallet);
     });
   }
-  closeSingleWalletModal() {
-    this.tracker.trackConnectionError("Connection was cancelled");
-    this.singleWalletModal.close();
+  closeSingleWalletModal(closeReason) {
+    this.singleWalletModal.close(closeReason);
   }
   onSingleWalletModalStateChange(onChange) {
     return this.singleWalletModal.onStateChange(onChange);
@@ -11170,7 +11099,6 @@ class TonConnectUI {
         });
         return result;
       } catch (e2) {
-        this.tracker.trackTransactionSigningFailed(this.wallet, tx, e2.message);
         widgetController.setAction({
           name: "transaction-canceled",
           showNotification: notifications2.includes("error"),
@@ -11277,6 +11205,7 @@ class TonConnectUI {
       return new Promise((resolve, reject) => {
         const { transaction, signal } = options;
         if (signal.aborted) {
+          this.tracker.trackTransactionSigningFailed(this.wallet, transaction, "Transaction was cancelled");
           return reject(new TonConnectUIError("Transaction was not sent"));
         }
         const onTransactionHandler = (transaction2) => __async(this, null, function* () {
@@ -11285,14 +11214,18 @@ class TonConnectUI {
         const onErrorsHandler = (reason) => {
           reject(reason);
         };
-        this.connector.sendTransaction(transaction, { onRequestSent, signal }).then((result) => onTransactionHandler(result)).catch((reason) => onErrorsHandler(reason));
-        signal.addEventListener(
-          "abort",
-          () => {
-            reject(new TonConnectUIError("Transaction was not sent"));
-          },
-          { once: true }
-        );
+        const onCanceledHandler = () => {
+          this.tracker.trackTransactionSigningFailed(this.wallet, transaction, "Transaction was cancelled");
+          reject(new TonConnectUIError("Transaction was not sent"));
+        };
+        signal.addEventListener("abort", onCanceledHandler, { once: true });
+        this.connector.sendTransaction(transaction, { onRequestSent, signal }).then((result) => {
+          signal.removeEventListener("abort", onCanceledHandler);
+          return onTransactionHandler(result);
+        }).catch((reason) => {
+          signal.removeEventListener("abort", onCanceledHandler);
+          return onErrorsHandler(reason);
+        });
       });
     });
   }