@rash2x/bridge-widget 0.6.35 → 0.6.36

package/dist/{index-BXp-N4UF.cjs → index-ogZzdWIQ.cjs}

@@ -499,6 +499,7 @@ const useTronWalletConnectStore = zustand.create(
     isConnecting: false,
     connect: null,
     disconnect: null,
+    cancelConnection: null,
     signTransaction: null,
     setAddress: (address) => set2({
       address,
@@ -508,6 +509,7 @@ const useTronWalletConnectStore = zustand.create(
     setActions: (actions) => set2({
       connect: actions.connect,
       disconnect: actions.disconnect,
+      cancelConnection: actions.cancelConnection,
       signTransaction: actions.signTransaction
     }),
     reset: () => set2({
@@ -3785,15 +3787,19 @@ function useBridgeTransaction() {
             txStore.setError("COMPLETION_TRACKING_FAILED");
           }
           console.error("Error tracking completion:", err);
+        }).finally(() => {
+          setIsProcessing(false);
         });
+        return txResult;
       } else {
+        setIsProcessing(false);
         throw new TransactionFailedError(
           chainKey,
           "Transaction hash not received from wallet"
         );
       }
-      return txResult;
     } catch (err) {
+      setIsProcessing(false);
       if (isUserRejection(err)) {
         txStore.setError("TRANSACTION_REJECTED");
         throw new TransactionFailedError(
@@ -3809,8 +3815,6 @@ function useBridgeTransaction() {
       console.log(err);
       txStore.setError("UNKNOWN_ERROR");
       throw err;
-    } finally {
-      setIsProcessing(false);
     }
   };
   return {
@@ -6938,7 +6942,6 @@ const TokenSelectModal = ({
   react.useLayoutEffect(() => {
     const updateHeight = () => {
       const container2 = document.getElementById("token-select-list");
-      console.log("CONTAINER", container2);
       if (!container2) return;
       const height = container2.getBoundingClientRect().height;
       if (height > 0) {
@@ -25915,7 +25918,7 @@ class WalletConnectModal {
   }
   async initUi() {
     if (typeof window !== "undefined") {
-      await Promise.resolve().then(() => require("./index-DJbbVeMD.cjs"));
+      await Promise.resolve().then(() => require("./index-B3GlyTKi.cjs"));
       const modal = document.createElement("wcm-modal");
       document.body.insertAdjacentElement("beforeend", modal);
       OptionsCtrl.setIsUiLoaded(true);
@@ -25960,11 +25963,13 @@ const useThemeStore = zustand.create((set2) => ({
   }
 }));
 const TRON_MAINNET_CHAIN_ID = "tron:0x2b6653dc";
+const CONNECTION_TIMEOUT = 6e4;
 function useTronWalletConnect(projectId) {
   const { address, isConnected, isConnecting } = useTronWalletConnectStore();
   const { setAddress, setIsConnecting, setActions, reset } = useTronWalletConnectStore();
   const providerRef = react.useRef(null);
   const modalRef = react.useRef(null);
+  const abortControllerRef = react.useRef(null);
   const { onClose: closeWalletSelectModal } = useWalletSelectModal();
   const appliedTheme = useThemeStore((state2) => state2.appliedTheme);
   react.useEffect(() => {
@@ -26027,6 +26032,9 @@ function useTronWalletConnect(projectId) {
     };
     initProvider();
     return () => {
+      if (abortControllerRef.current) {
+        abortControllerRef.current.abort();
+      }
       if (providerRef.current) {
         providerRef.current.disconnect();
       }
@@ -26053,9 +26061,14 @@ function useTronWalletConnect(projectId) {
         "WalletConnect not initialized. Please provide a valid project ID."
       );
     }
+    if (abortControllerRef.current) {
+      abortControllerRef.current.abort();
+    }
+    abortControllerRef.current = new AbortController();
+    const abortController = abortControllerRef.current;
     setIsConnecting(true);
     try {
-      const session = await providerRef.current.connect({
+      const connectionPromise = providerRef.current.connect({
         namespaces: {
           tron: {
             methods: ["tron_signTransaction", "tron_signMessage"],
@@ -26064,6 +26077,19 @@ function useTronWalletConnect(projectId) {
           }
         }
       });
+      const timeoutPromise = new Promise((_3, reject) => {
+        const timeoutId = setTimeout(() => {
+          reject(new Error("Connection timeout - please try again"));
+        }, CONNECTION_TIMEOUT);
+        abortController.signal.addEventListener("abort", () => {
+          clearTimeout(timeoutId);
+          reject(new Error("Connection cancelled"));
+        });
+      });
+      const session = await Promise.race([connectionPromise, timeoutPromise]);
+      if (abortController.signal.aborted) {
+        throw new Error("Connection cancelled");
+      }
       if (session) {
         const accounts = session.namespaces?.tron?.accounts || [];
         if (accounts.length > 0) {
@@ -26088,8 +26114,18 @@ function useTronWalletConnect(projectId) {
       throw error;
     } finally {
       setIsConnecting(false);
+      abortControllerRef.current = null;
     }
   }, [setAddress, setIsConnecting]);
+  const cancelConnection = react.useCallback(() => {
+    if (abortControllerRef.current) {
+      abortControllerRef.current.abort();
+      console.log("TRON WalletConnect connection cancelled");
+    }
+    if (modalRef.current) {
+      modalRef.current.closeModal();
+    }
+  }, []);
   const disconnect = react.useCallback(async () => {
     if (!providerRef.current) return;
     try {
@@ -26126,15 +26162,17 @@ function useTronWalletConnect(projectId) {
     setActions({
       connect,
       disconnect,
+      cancelConnection,
       signTransaction
     });
-  }, [connect, disconnect, signTransaction, setActions]);
+  }, [connect, disconnect, cancelConnection, signTransaction, setActions]);
   return {
     address,
     isConnected,
     isConnecting,
     connect,
     disconnect,
+    cancelConnection,
     signTransaction
   };
 }
@@ -26637,4 +26675,4 @@ exports.useSettingsStore = useSettingsStore;
 exports.useSwapModel = useSwapModel;
 exports.useTokensStore = useTokensStore;
 exports.useTransactionStore = useTransactionStore;
-//# sourceMappingURL=index-BXp-N4UF.cjs.map
+//# sourceMappingURL=index-ogZzdWIQ.cjs.map