fix sort order of notifications

rairprotocol · Jul 5, 2024 · 190dcd5 · 190dcd5
1 parent 5e183e1
commit 190dcd5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/rair-front/src/components/Navigation/MenuComponents/MobileNavigationList.tsx b/rair-front/src/components/Navigation/MenuComponents/MobileNavigationList.tsx
@@ -155,7 +155,12 @@ const MobileNavigationList: React.FC<IMobileNavigationList> = ({
             {flagLoading ? (
               <LoadingComponent />
             ) : notificationArray && notificationArray.length > 0 ? (
-              notificationArray.map((el) => {
+              notificationArray.sort((a,b) => {
+                if (a.read === b.read) {
+                  return 0; 
+                }
+                return a.read ? 1 : -1;
+              }).map((el) => {
                 return (
                   <NotificationBox
                     getNotifications={getNotifications}

diff --git a/rair-front/src/components/UserProfileSettings/PopUpNotification/PopUpNotification.tsx b/rair-front/src/components/UserProfileSettings/PopUpNotification/PopUpNotification.tsx
@@ -105,7 +105,12 @@ const PopUpNotification = ({getNotifications, realDataNotification, notification
                 overflowY: 'auto'
               }}>
               {realDataNotification && realDataNotification.length > 0 ? (
-                realDataNotification.map((el) => {
+                realDataNotification.sort((a, b) => {
+                  if (a.read === b.read) {
+                    return 0; 
+                  }
+                  return a.read ? 1 : -1;
+                }).map((el) => {
                   return (
                     <NotificationBox
                     currentUserAddress={currentUserAddress}