From 2c73f136b459ef99bf1429d698d2adaf33219831 Mon Sep 17 00:00:00 2001
From: Jon Ator <jonathanator0@gmail.com>
Date: Thu, 6 Jun 2024 08:48:22 -0500
Subject: [PATCH] fixes

---
 packages/web/components/swap-tool/index.tsx |  7 ++++---
 packages/web/hooks/use-swap.tsx             | 18 ++++++++++++------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/packages/web/components/swap-tool/index.tsx b/packages/web/components/swap-tool/index.tsx
index 7ea06ebe54..f752ca4ae0 100644
--- a/packages/web/components/swap-tool/index.tsx
+++ b/packages/web/components/swap-tool/index.tsx
@@ -222,9 +222,10 @@ export const SwapTool: FunctionComponent<SwapToolProps> = observer(
             });
           }
         })
-        .catch(() => {
-          console.log("reject sig");
-          logEvent([EventName.Swap.swapFailed, baseEvent]);
+        .catch((e) => {
+          if (e instanceof Error && e.message.includes("Failed to send")) {
+            logEvent([EventName.Swap.swapFailed, baseEvent]);
+          }
         })
         .finally(() => {
           setIsSendingTx(false);
diff --git a/packages/web/hooks/use-swap.tsx b/packages/web/hooks/use-swap.tsx
index 3f95fdef62..0c2cbc48e8 100644
--- a/packages/web/hooks/use-swap.tsx
+++ b/packages/web/hooks/use-swap.tsx
@@ -269,12 +269,16 @@ export function useSwap(
     () =>
       new Promise<"multiroute" | "multihop" | "exact-in">(
         async (resolve, reject) => {
-          if (!maxSlippage) return reject(new Error("No max slippage"));
+          if (!maxSlippage)
+            return reject(new Error("Max slippage is not defined."));
           if (!inAmountInput.amount)
-            return reject(new Error("No input amount"));
-          if (!account) return reject(new Error("No account"));
-          if (!swapAssets.fromAsset) return reject(new Error("No from asset"));
-          if (!swapAssets.toAsset) return reject(new Error("No to asset"));
+            return reject(new Error("Input amount is not specified."));
+          if (!account)
+            return reject(new Error("Account information is missing."));
+          if (!swapAssets.fromAsset)
+            return reject(new Error("From asset is not specified."));
+          if (!swapAssets.toAsset)
+            return reject(new Error("To asset is not specified."));
 
           let txParams: ReturnType<typeof getSwapTxParameters>;
           try {
@@ -287,7 +291,9 @@ export function useSwap(
             });
           } catch (e) {
             const error = e as Error;
-            return reject(error);
+            return reject(
+              new Error(`Transaction preparation failed: ${error.message}`)
+            );
           }
 
           const { routes, tokenIn, tokenOutMinAmount } = txParams;