Swap failed events: only reject committed txs with code !== 0

packages/web/components/swap-tool/index.tsx

@@ -222,12 +222,8 @@ export const SwapTool: FunctionComponent<SwapToolProps> = observer(
             });
           }
         })
-        .catch((error) => {
-          console.error("swap failed", error);
-          if (error instanceof Error && error.message === "Request rejected") {
-            // don't log when the user rejects in wallet
-            return;
-          }
+        .catch(() => {
+          console.log("reject sig");
           logEvent([EventName.Swap.swapFailed, baseEvent]);
         })
         .finally(() => {

packages/web/hooks/use-swap.tsx

@@ -269,14 +269,14 @@ export function useSwap(
     () =>
       new Promise<"multiroute" | "multihop" | "exact-in">(
         async (resolve, reject) => {
-          if (!maxSlippage) return reject("No max slippage");
-          if (!inAmountInput.amount) return reject("No input amount");
-          if (!account) return reject("No account");
-          if (!swapAssets.fromAsset) return reject("No from asset");
-          if (!swapAssets.toAsset) return reject("No to asset");
+          if (!maxSlippage) return reject(new Error("No max slippage"));
+          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"));
 
           let txParams: ReturnType<typeof getSwapTxParameters>;
-
           try {
             txParams = getSwapTxParameters({
               coinAmount: inAmountInput.amount.toCoin().amount,
@@ -287,7 +287,7 @@ export function useSwap(
             });
           } catch (e) {
             const error = e as Error;
-            return reject(error.message);
+            return reject(error);
           }
 
           const { routes, tokenIn, tokenOutMinAmount } = txParams;
@@ -344,7 +344,7 @@ export function useSwap(
                 );
               });
             } catch (e) {
-              return reject("Rejected manual approval");
+              return reject(new Error("Rejected manual approval"));
             }
           }
 
@@ -373,14 +373,15 @@ export function useSwap(
                 tokenOutMinAmount,
                 undefined,
                 signOptions,
-                () => {
-                  resolve(pools.length === 1 ? "exact-in" : "multihop");
+                ({ code }) => {
+                  if (code)
+                    reject(
+                      new Error("Failed to send swap exact amount in message")
+                    );
+                  else resolve(pools.length === 1 ? "exact-in" : "multihop");
                 }
               )
-              .catch((reason) => {
-                reject(reason);
-              });
-            return pools.length === 1 ? "exact-in" : "multihop";
+              .catch(reject);
           } else if (routes.length > 1) {
             account.osmosis
               .sendSplitRouteSwapExactAmountInMsg(
@@ -389,15 +390,20 @@ export function useSwap(
                 tokenOutMinAmount,
                 undefined,
                 signOptions,
-                () => {
-                  resolve("multiroute");
+                ({ code }) => {
+                  if (code)
+                    reject(
+                      new Error(
+                        "Failed to send split route swap exact amount in message"
+                      )
+                    );
+                  else resolve("multiroute");
                 }
               )
-              .catch((reason) => {
-                reject(reason);
-              });
+              .catch(reject);
           } else {
-            reject("No routes given");
+            // should not be possible because button should be disabled
+            reject(new Error("No routes given"));
           }
         }
       ).finally(() => {