refactor: Refactor all pushAlert call.

6 files changed, 17 insertions, 47 deletions

diff --git a/FrontEnd/src/app/service-worker.tsx b/FrontEnd/src/app/service-worker.tsx
index 2dc7fb6e..ea8dfc32 100644
--- a/FrontEnd/src/app/service-worker.tsx
+++ b/FrontEnd/src/app/service-worker.tsx
@@ -11,10 +11,7 @@ if ("serviceWorker" in navigator) {
 
   if (window.localStorage.getItem(upgradeSuccessLocalStorageKey)) {
     pushAlert({
-      message: {
-        type: "i18n",
-        key: "serviceWorker.upgradeSuccess",
-      },
+      message: "serviceWorker.upgradeSuccess",
       type: "success",
     });
     window.localStorage.removeItem(upgradeSuccessLocalStorageKey);
@@ -61,10 +58,7 @@ if ("serviceWorker" in navigator) {
     wb.addEventListener("activated", (event) => {
       if (!event.isUpdate) {
         pushAlert({
-          message: {
-            type: "i18n",
-            key: "serviceWorker.availableOffline",
-          },
+          message: "serviceWorker.availableOffline",
           type: "success",
         });
       }
diff --git a/FrontEnd/src/app/services/user.ts b/FrontEnd/src/app/services/user.ts
index 4814bf7c..9a8e5687 100644
--- a/FrontEnd/src/app/services/user.ts
+++ b/FrontEnd/src/app/services/user.ts
@@ -104,17 +104,14 @@ export class UserService {
       this.userSubject.next(user);
       pushAlert({
         type: "success",
-        message: {
-          type: "i18n",
-          key: "user.welcomeBack",
-        },
+        message: "user.welcomeBack",
       });
       return user;
     } catch (error) {
       if (error instanceof HttpNetworkError) {
         pushAlert({
           type: "danger",
-          message: { type: "i18n", key: "user.verifyTokenFailedNetwork" },
+          message: "user.verifyTokenFailedNetwork",
         });
         return savedUser;
       } else {
@@ -122,7 +119,7 @@ export class UserService {
         this.userSubject.next(null);
         pushAlert({
           type: "danger",
-          message: { type: "i18n", key: "user.verifyTokenFailed" },
+          message: "user.verifyTokenFailed",
         });
         return null;
       }
diff --git a/FrontEnd/src/app/views/home/BoardWithUser.tsx b/FrontEnd/src/app/views/home/BoardWithUser.tsx
index ba22916c..3263c745 100644
--- a/FrontEnd/src/app/views/home/BoardWithUser.tsx
+++ b/FrontEnd/src/app/views/home/BoardWithUser.tsx
@@ -27,10 +27,7 @@ const BoardWithUser: React.FC<{ user: AuthUser }> = ({ user }) => {
                   .delete(timeline)
                   .catch((e) => {
                     pushAlert({
-                      message: {
-                        type: "i18n",
-                        key: "home.message.deleteBookmarkFail",
-                      },
+                      message: "home.message.deleteBookmarkFail",
                       type: "danger",
                     });
                     throw e;
@@ -43,10 +40,7 @@ const BoardWithUser: React.FC<{ user: AuthUser }> = ({ user }) => {
                   )
                   .catch((e) => {
                     pushAlert({
-                      message: {
-                        type: "i18n",
-                        key: "home.message.moveBookmarkFail",
-                      },
+                      message: "home.message.moveBookmarkFail",
                       type: "danger",
                     });
                     throw e;
@@ -77,10 +71,7 @@ const BoardWithUser: React.FC<{ user: AuthUser }> = ({ user }) => {
                         .delete(timeline)
                         .catch((e) => {
                           pushAlert({
-                            message: {
-                              type: "i18n",
-                              key: "home.message.deleteHighlightFail",
-                            },
+                            message: "home.message.deleteHighlightFail",
                             type: "danger",
                           });
                           throw e;
@@ -93,10 +84,7 @@ const BoardWithUser: React.FC<{ user: AuthUser }> = ({ user }) => {
                         )
                         .catch((e) => {
                           pushAlert({
-                            message: {
-                              type: "i18n",
-                              key: "home.message.moveHighlightFail",
-                            },
+                            message: "home.message.moveHighlightFail",
                             type: "danger",
                           });
                           throw e;
diff --git a/FrontEnd/src/app/views/timeline-common/TimelineCardTemplate.tsx b/FrontEnd/src/app/views/timeline-common/TimelineCardTemplate.tsx
index d6eaa16c..c29e628d 100644
--- a/FrontEnd/src/app/views/timeline-common/TimelineCardTemplate.tsx
+++ b/FrontEnd/src/app/views/timeline-common/TimelineCardTemplate.tsx
@@ -68,12 +68,9 @@ function TimelineCardTemplate({
                       [timeline.isHighlight ? "delete" : "put"](timeline.name)
                       .catch(() => {
                         pushAlert({
-                          message: {
-                            type: "i18n",
-                            key: timeline.isHighlight
-                              ? "timeline.removeHighlightFail"
-                              : "timeline.addHighlightFail",
-                          },
+                          message: timeline.isHighlight
+                            ? "timeline.removeHighlightFail"
+                            : "timeline.addHighlightFail",
                           type: "danger",
                         });
                       });
@@ -92,12 +89,9 @@ function TimelineCardTemplate({
                   [timeline.isBookmark ? "delete" : "put"](timeline.name)
                   .catch(() => {
                     pushAlert({
-                      message: {
-                        type: "i18n",
-                        key: timeline.isBookmark
-                          ? "timeline.removeBookmarkFail"
-                          : "timeline.addBookmarkFail",
-                      },
+                      message: timeline.isBookmark
+                        ? "timeline.removeBookmarkFail"
+                        : "timeline.addBookmarkFail",
                       type: "danger",
                     });
                   });
diff --git a/FrontEnd/src/app/views/timeline-common/TimelinePostEdit.tsx b/FrontEnd/src/app/views/timeline-common/TimelinePostEdit.tsx
index 3ce7d53b..09d066cc 100644
--- a/FrontEnd/src/app/views/timeline-common/TimelinePostEdit.tsx
+++ b/FrontEnd/src/app/views/timeline-common/TimelinePostEdit.tsx
@@ -174,7 +174,7 @@ const TimelinePostEdit: React.FC<TimelinePostEditProps> = (props) => {
         (_) => {
           pushAlert({
             type: "danger",
-            message: t("timeline.sendPostFailed"),
+            message: "timeline.sendPostFailed",
           });
           setState("input");
         }
diff --git a/FrontEnd/src/app/views/timeline-common/TimelinePostView.tsx b/FrontEnd/src/app/views/timeline-common/TimelinePostView.tsx
index 7fd98310..d01ecfa8 100644
--- a/FrontEnd/src/app/views/timeline-common/TimelinePostView.tsx
+++ b/FrontEnd/src/app/views/timeline-common/TimelinePostView.tsx
@@ -93,10 +93,7 @@ const TimelinePostView: React.FC<TimelinePostViewProps> = (props) => {
               .then(onDeleted, () => {
                 pushAlert({
                   type: "danger",
-                  message: {
-                    type: "i18n",
-                    key: "timeline.deletePostFailed",
-                  },
+                  message: "timeline.deletePostFailed",
                 });
               });
           }}