Add generic message for errors during sign operation

trilitech · Dec 3, 2024 · 6802a24 · 6802a24
1 parent 590e69a
commit 6802a24
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/apps/web/src/components/SendFlow/utils.tsx b/apps/web/src/components/SendFlow/utils.tsx
@@ -123,14 +123,18 @@ export const useSignPageHelpers = (
     ).catch(() => setEstimationFailed(true));
 
   const onSign = async (tezosToolkit: TezosToolkit) =>
-    handleAsyncAction(async () => {
-      const operation = await executeOperations(
-        { ...operations, estimates: form.watch("executeParams") },
-        tezosToolkit
-      );
-      await openWith(<SuccessStep hash={operation.opHash} />);
-      return operation;
-    });
+    handleAsyncAction(
+      async () => {
+        const operation = await executeOperations(
+          { ...operations, estimates: form.watch("executeParams") },
+          tezosToolkit
+        );
+        await openWith(<SuccessStep hash={operation.opHash} />);
+        return operation;
+      },
+      // Here we should show a generic error message, keeping the original error for errors list
+      { description: "Something went wrong, please try again." }
+    );
 
   return {
     fee: totalFee(form.watch("executeParams")),

diff --git a/packages/core/src/estimate.ts b/packages/core/src/estimate.ts
@@ -66,6 +66,9 @@ export const handleTezError = (err: Error): string => {
     return "Contract does not exist, please check if the correct network is selected.";
   } else if (err.message.includes("staking_to_delegate_that_refuses_external_staking")) {
     return "The baker you are trying to stake to does not accept external staking.";
+  } else if (err.message.includes("empty_implicit_delegated_contract")) {
+    return "Emptying an implicit delegated account is not allowed.";
   }
+
   return err.message;
 };