Merge branch 'develop' of github.com:meedan/check-web

Author: danielevalverde

localization/react-intl/src/app/components/annotations/Annotation.json

@@ -113,6 +113,11 @@
     "description": "Log entry indicating a source has been added",
     "defaultMessage": "Source {name} added by {author}"
   },
+  {
+    "id": "annotation.importedFromFeed",
+    "description": "Log entry indicating an item has been imported from a feedd",
+    "defaultMessage": "Item imported from shared feed: {feed_name}"
+  },
   {
     "id": "annotation.createProjectMedia",
     "description": "Log entry indicating an item has been created",

package-lock.json

@@ -466,7 +466,7 @@ class Annotation extends Component {
     }
     case 'create_projectmedia': {
       const meta = safelyParseJSON(activity.meta);
-      if (meta && meta.add_source) {
+      if (meta?.add_source) {
         contentTemplate = (
           <span>
             <FormattedMessage
@@ -480,6 +480,19 @@ class Annotation extends Component {
             />
           </span>
         );
+      } else if (meta?.feed_name) {
+        contentTemplate = (
+          <span>
+            <FormattedMessage
+              defaultMessage="Item imported from shared feed: {feed_name}"
+              description="Log entry indicating an item has been imported from a feedd"
+              id="annotation.importedFromFeed"
+              values={{
+                feed_name: meta.feed_name,
+              }}
+            />
+          </span>
+        );
       } else {
         contentTemplate = (
           <span>

src/app/components/annotations/Annotation.js

@@ -31,7 +31,6 @@ const optimisticProjectMedia = (media, context, customTeam) => {
         created_at: now,
         updated_at: now,
         last_seen: now,
-        share_count: 0,
         check_search_team: {
           id: team.search_id,
           number_of_results: team.medias_count + 1,