fix(web): prevent duplicate network error (#1177)

* fix(web): prevent duplicate 'network error' Signed-off-by: Jay Clark <jay@jayeclark.dev> * fix(web): refactor errorTips Signed-off-by: Jay Clark <jay@jayeclark.dev> * fix(desktop): prevent duplicate error messages Signed-off-by: Jay Clark <jay@jayeclark.dev>
netless-io · Dec 7, 2021 · e9be221 · e9be221
1 parent 24fd1c7
commit e9be221
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/desktop/renderer-app/src/components/Tips/ErrorTips.tsx b/desktop/renderer-app/src/components/Tips/ErrorTips.tsx
@@ -9,8 +9,12 @@ export const errorTips = (e: unknown): void => {
     }
 
     if (e instanceof ServerRequestError) {
-        void message.error(i18n.t(e.errorMessage));
+        void message.error({
+            content: i18n.t(e.errorMessage),
+            key: e.errorMessage,
+        });
     } else {
-        void message.error((e as Error).message);
+        const { message: content, message: key } = e as Error;
+        void message.error({ content, key });
     }
 };
diff --git a/web/flat-web/src/components/Tips/ErrorTips.tsx b/web/flat-web/src/components/Tips/ErrorTips.tsx
@@ -9,8 +9,12 @@ export const errorTips = (e: unknown): void => {
     }
 
     if (e instanceof ServerRequestError) {
-        void message.error(i18n.t(e.errorMessage));
+        void message.error({
+            content: i18n.t(e.errorMessage),
+            key: e.errorMessage,
+        });
     } else {
-        void message.error((e as Error).message);
+        const { message: content, message: key } = e as Error;
+        void message.error({ content, key });
     }
 };