Recognise duplicates based on id, add title from response

CirclesUBI · Sep 5, 2023 · 6cf1280 · 6cf1280
1 parent bf603a8
commit 6cf1280
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/src/components/ActivityStream.js b/src/components/ActivityStream.js
@@ -99,6 +99,7 @@ const ActivityStreamList = ({
           acc,
           {
             data,
+            id,
             hash,
             createdAt,
             type,
@@ -134,7 +135,7 @@ const ActivityStreamList = ({
               ? DateTime.fromISO(lastSeenAt) > DateTime.fromISO(createdAt)
               : true;
 
-          const key = hash || transactionHash;
+          const key = hash || transactionHash || id;
 
           const createdAtDate =
             createdAt || DateTime.fromSeconds(timestamp).toISO();

diff --git a/src/components/ActivityStreamItem.js b/src/components/ActivityStreamItem.js
@@ -106,7 +106,6 @@ const ActivityStreamItem = (props) => {
   } = props.type !== 'NEWS' ? formatMessage(props) : props;
 
   if (!formattedDate) {
-    //   // TODO which one? data.createdAt || data.date
     formattedDate = DateTime.fromISO(
       props.data.createdAt || props.data.date,
     ).toFormat('dd.LL.yyyy');
@@ -143,8 +142,7 @@ const ActivityStreamItem = (props) => {
           ...data,
           actor,
         })
-      : // TODO remove || 'This is test title'
-        data.title?.en || 'This is test title';
+      : data.title?.en;
   }, [actor, data, messageId]);
 
   return (

diff --git a/src/store/activity/actions.js b/src/store/activity/actions.js
@@ -374,7 +374,7 @@ export function loadMoreActivitiesNews(options = {}) {
 
     function checkForDuplicates(item) {
       for (const newsItem of currentNews) {
-        if (newsItem.data.date === item.date) {
+        if (newsItem.id === item.id) {
           return false;
         }
       }
@@ -386,7 +386,6 @@ export function loadMoreActivitiesNews(options = {}) {
       let filteredNewsData = [];
       let filterDuplicateNewsData = [];
       let noMoreRecords = false;
-      let loopCounter = 0;
 
       do {
         let data = await core.news.getLatestNews(offset, PAGE_SIZE);
@@ -409,7 +408,6 @@ export function loadMoreActivitiesNews(options = {}) {
         }
 
         // we have values till present which are not duplicates - we add them to newsData which we want to display
-        // newsData.push(...filteredNewsData);
         newsData.push(...filterDuplicateNewsData);
         offset += PAGE_SIZE;
       } while (!noMoreRecords && newsData.length < PAGE_SIZE);

diff --git a/src/store/activity/reducers.js b/src/store/activity/reducers.js
@@ -77,7 +77,6 @@ function mergeActivities(currentActivities, newActivities) {
       const newActivity = Object.assign({}, initialStateActivity, {
         createdAt: DateTime.fromSeconds(activity.timestamp).toISO(),
         data: activity.data,
-        txHash: activity.transactionHash,
         type: activity.type,
       });
 
@@ -123,14 +122,14 @@ function mergeNews(currentActivities, newActivities) {
           iconId: activity.iconId,
           isActive: activity.isActive,
           message: activity.message,
+          title: activity.title,
         },
         type: 'NEWS',
+        id: activity.id,
       });
 
-      newActivity.hash = generateHash(newActivity);
-
       const duplicateItem = currentActivities.find(
-        (item) => item.hash === newActivity.hash,
+        (item) => item.id === newActivity.id,
       );
       if (!duplicateItem) {
         acc.push(newActivity);
@@ -140,8 +139,8 @@ function mergeNews(currentActivities, newActivities) {
     }, [])
     .concat(currentActivities)
     .sort((itemA, itemB) => {
-      return DateTime.fromISO(itemB.createdAt) <
-        DateTime.fromISO(itemA.createdAt)
+      return DateTime.fromISO(itemB.data.date) <
+        DateTime.fromISO(itemA.data.date)
         ? -1
         : 1;
     });