@rainlanguage/ui-components 0.0.1-alpha.74 → 0.0.1-alpha.76

package/dist/stores/transactionStore.d.ts

@@ -20,7 +20,7 @@ export declare enum TransactionStatus {
 export declare enum TransactionErrorMessage {
     BAD_CALLLDATA = "Bad calldata.",
     DEPLOY_FAILED = "Lock transaction failed.",
-    TIMEOUT = "The subgraph took too long to respond. Please check the transaction link.",
+    TIMEOUT = "The subgraph took too long to respond.",
     APPROVAL_FAILED = "Approval transaction failed.",
     USER_REJECTED_APPROVAL = "User rejected approval transaction.",
     USER_REJECTED_TRANSACTION = "User rejected the transaction.",

package/dist/stores/transactionStore.js

@@ -22,7 +22,7 @@ export var TransactionErrorMessage;
 (function (TransactionErrorMessage) {
     TransactionErrorMessage["BAD_CALLLDATA"] = "Bad calldata.";
     TransactionErrorMessage["DEPLOY_FAILED"] = "Lock transaction failed.";
-    TransactionErrorMessage["TIMEOUT"] = "The subgraph took too long to respond. Please check the transaction link.";
+    TransactionErrorMessage["TIMEOUT"] = "The subgraph took too long to respond.";
     TransactionErrorMessage["APPROVAL_FAILED"] = "Approval transaction failed.";
     TransactionErrorMessage["USER_REJECTED_APPROVAL"] = "User rejected approval transaction.";
     TransactionErrorMessage["USER_REJECTED_TRANSACTION"] = "User rejected the transaction.";
@@ -46,15 +46,11 @@ export const initialState = {
 const transactionStore = () => {
     const { subscribe, set, update } = writable(initialState);
     const reset = () => set(initialState);
-    const returnError = (interval) => {
-        clearInterval(interval);
-        return transactionError(TransactionErrorMessage.TIMEOUT);
-    };
     const awaitTransactionIndexing = async (subgraphUrl, txHash, successMessage) => {
         update((state) => ({
             ...state,
             status: TransactionStatus.PENDING_SUBGRAPH,
-            message: 'Checking for transaction indexing...'
+            message: 'Waiting for transaction to be indexed...'
         }));
         let attempts = 0;
         let newTx;
@@ -66,16 +62,12 @@ const transactionStore = () => {
                     clearInterval(interval);
                     transactionSuccess(txHash, successMessage);
                 }
-                else if (attempts >= 10) {
-                    update((state) => ({
-                        ...state,
-                        message: 'The subgraph took too long to respond. Please check again later.'
-                    }));
-                    return returnError(interval);
-                }
             }
             catch {
-                return returnError(interval);
+                if (attempts >= 10) {
+                    clearInterval(interval);
+                    return transactionError(TransactionErrorMessage.TIMEOUT);
+                }
             }
         }, 1000);
     };
@@ -90,16 +82,16 @@ const transactionStore = () => {
             attempts++;
             try {
                 const addOrders = await getTransactionAddOrders(subgraphUrl, txHash);
-                if (attempts >= 10) {
-                    return returnError(interval);
-                }
-                else if (addOrders?.length > 0) {
+                if (addOrders?.length > 0) {
                     clearInterval(interval);
                     return transactionSuccess(txHash, '', addOrders[0].order.orderHash, network);
                 }
             }
             catch {
-                return returnError(interval);
+                if (attempts >= 10) {
+                    clearInterval(interval);
+                    return transactionError(TransactionErrorMessage.TIMEOUT);
+                }
             }
         }, 1000);
     };
@@ -114,20 +106,16 @@ const transactionStore = () => {
             attempts++;
             try {
                 const removeOrders = await getTransactionRemoveOrders(subgraphUrl, txHash);
-                if (attempts >= 10) {
-                    update((state) => ({
-                        ...state,
-                        message: 'The subgraph took too long to respond. Please check again later.'
-                    }));
-                    return returnError(interval);
-                }
-                else if (removeOrders?.length > 0) {
+                if (removeOrders?.length > 0) {
                     clearInterval(interval);
                     return transactionSuccess(txHash, 'Order removed successfully');
                 }
             }
             catch {
-                return returnError(interval);
+                if (attempts >= 10) {
+                    clearInterval(interval);
+                    return transactionError(TransactionErrorMessage.TIMEOUT);
+                }
             }
         }, 1000);
     };
@@ -260,9 +248,10 @@ const transactionStore = () => {
             return transactionError(TransactionErrorMessage.USER_REJECTED_TRANSACTION);
         }
         try {
+            const transactionExplorerLink = await getExplorerLink(hash, chainId, 'tx');
             awaitTx(hash, action === 'deposit'
                 ? TransactionStatus.PENDING_DEPOSIT
-                : TransactionStatus.PENDING_WITHDRAWAL);
+                : TransactionStatus.PENDING_WITHDRAWAL, transactionExplorerLink);
             await waitForTransactionReceipt(config, { hash });
             return awaitTransactionIndexing(subgraphUrl, hash, `The ${action === 'deposit' ? 'deposit' : 'withdrawal'} was successful.`);
         }
@@ -291,7 +280,8 @@ const transactionStore = () => {
             return transactionError(TransactionErrorMessage.USER_REJECTED_TRANSACTION);
         }
         try {
-            awaitTx(hash, TransactionStatus.PENDING_REMOVE_ORDER);
+            const transactionExplorerLink = await getExplorerLink(hash, chainId, 'tx');
+            awaitTx(hash, TransactionStatus.PENDING_REMOVE_ORDER, transactionExplorerLink);
             await waitForTransactionReceipt(config, { hash });
             return awaitRemoveOrderIndexing(subgraphUrl, hash);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@rainlanguage/ui-components",
-	"version": "0.0.1-alpha.74",
+	"version": "0.0.1-alpha.76",
 	"description": "A component library for building Svelte applications to be used with Raindex.",
 	"license": "LicenseRef-DCL-1.0",
 	"author": "Rain Open Source Software Ltd",
@@ -53,7 +53,7 @@
 		"@fontsource/dm-sans": "5.1.0",
 		"@imask/svelte": "7.6.1",
 		"@observablehq/plot": "0.6.16",
-		"@rainlanguage/orderbook": "0.0.1-alpha.74",
+		"@rainlanguage/orderbook": "0.0.1-alpha.76",
 		"@reown/appkit": "1.6.4",
 		"@reown/appkit-adapter-wagmi": "1.6.4",
 		"@sentry/sveltekit": "7.120.0",