Merge pull request #138 from rairprotocol/add-clear-button-notification

Sort order of notifications
rairprotocol · Jul 30, 2024 · 8e256b9 · 8e256b9
2 parents a8c1e89 + 18e13f6
commit 8e256b9
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/rair-front/src/App.tsx b/rair-front/src/App.tsx
@@ -199,7 +199,7 @@ function App() {
   const getNotificationsCount = useCallback( async () => {
     if (currentUserAddress) {
       const result = await rFetch(`/api/notifications?onlyUnread=true`);
-      if (result.success && result.totalCount > 0) {
+      if (result.success && result.totalCount >= 0) {
         setNotificationCount(result.totalCount);
       }
     }

diff --git a/rair-front/src/components/Header/MainHeader.tsx b/rair-front/src/components/Header/MainHeader.tsx
@@ -141,13 +141,22 @@ const MainHeader: React.FC<IMainHeader> = ({
   const getNotifications = useCallback(
     async (pageNum?: number) => {
       if (currentUserAddress) {
-        // const result = await rFetch(`/api/notifications${itemsPerPage && pageNum ? `?itemsPerPage=${itemsPerPage}&pageNum=${pageNum}` : ''}`);
         const result = await rFetch(
           `/api/notifications${pageNum ? `?pageNum=${Number(pageNum)}` : ''}`
         );
 
         if (result.success) {
-          setRealDataNotification(result.notifications);
+          const sortedNotifications = result.notifications.sort((a, b) => {
+            if (!a.read && b.read) return -1;
+            if (a.read && !b.read) return 1;
+
+            const dateA = new Date(a.createdAt).getTime();
+            const dateB = new Date(b.createdAt).getTime();
+
+            return dateB - dateA;
+          }) 
+          console.info(result.notifications, 'result.notifications')
+          setRealDataNotification(sortedNotifications);
         }
       }
     },

diff --git a/rair-front/src/components/Navigation/MenuComponents/MobileNavigationList.tsx b/rair-front/src/components/Navigation/MenuComponents/MobileNavigationList.tsx
@@ -102,7 +102,16 @@ const MobileNavigationList: React.FC<IMobileNavigationList> = ({
       setFlagLoading(true);
       const result = await rFetch(`/api/notifications${ pageNum ? `?pageNum=${Number(pageNum)}` : ''}`);
       if (result.success) {
-        setNotificationArray(result.notifications);
+        const sortedNotifications = result.notifications.sort((a, b) => {
+          if (!a.read && b.read) return -1;
+          if (a.read && !b.read) return 1;
+
+          const dateA = new Date(a.createdAt).getTime();
+          const dateB = new Date(b.createdAt).getTime();
+
+          return dateB - dateA;
+        }) 
+        setNotificationArray(sortedNotifications);
       }
 
       setFlagLoading(false);