review

Author: flexsurfer

src/legacy/status_im/data_store/activities.cljs

@@ -64,7 +64,13 @@
                         :communityId               :community-id
                         :installationId            :installation-id
                         :membershipStatus          :membership-status
-                        :albumMessages             :album-messages})
+                        :albumMessages             :album-messages
+                        :newsImageUrl              :news-image-url
+                        :newsTitle                 :news-title
+                        :newsDescription           :news-description
+                        :newsContent               :news-content
+                        :newsLink                  :news-link
+                        :newsLinkLabel             :news-link-label})
       (update :last-message #(when % (messages/<-rpc %)))
       (update :message #(when % (messages/<-rpc %)))
       (update :reply-message #(when % (messages/<-rpc %)))

src/status_im/contexts/shell/activity_center/notification/news/style.cljs

@@ -29,45 +29,43 @@
        [rn/activity-indicator]])))
 
 (defn sheet
-  [{:keys [newsImageUrl newsTitle newsContent newsLink newsLinkLabel]} timestamp]
+  [{:keys [news-image-url news-title news-content news-link news-link-label]} timestamp]
   (let [customization-color (rf/sub [:profile/customization-color])]
     [:<>
-     [quo/drawer-top {:title newsTitle :description timestamp}]
+     [quo/drawer-top {:title news-title :description timestamp}]
      [rn/scroll-view {:style {:flex 1}}
-      (when (not (string/blank? newsImageUrl))
-        [auto-resized-image newsImageUrl])
+      (when (not (string/blank? news-image-url))
+        [auto-resized-image news-image-url])
       [quo/text
        {:style {:padding-horizontal 20
                 :padding-vertical   8}}
-       newsContent]]
-     (when (and (not (string/blank? newsLink)) (not (string/blank? newsLinkLabel)))
+       news-content]]
+     (when (and (not (string/blank? news-link)) (not (string/blank? news-link-label)))
        [quo/bottom-actions
-        {:button-one-label newsLinkLabel
-         :button-one-props {:customization-color
-                            customization-color
-                            :icon-right :i/external
-                            :on-press
-                            (fn []
-                              (rf/dispatch [:browser.ui/open-url newsLink])
-                              (rf/dispatch [:hide-bottom-sheet]))}}])]))
+        {:button-one-label news-link-label
+         :button-one-props {:customization-color customization-color
+                            :icon-right          :i/external
+                            :on-press            (fn []
+                                                   (rf/dispatch [:browser.ui/open-url news-link])
+                                                   (rf/dispatch [:hide-bottom-sheet]))}}])]))
 
 (defn view
   [{:keys [notification extra-fn]}]
-  (let [customization-color                           (rf/sub [:profile/customization-color])
-        {:keys [newsTitle newsDescription timestamp]} notification
-        timestamp                                     (datetime/timestamp->relative timestamp)]
+  (let [customization-color                             (rf/sub [:profile/customization-color])
+        {:keys [news-title news-description timestamp]} notification
+        timestamp                                       (datetime/timestamp->relative timestamp)]
     [common/swipeable
      {:left-button    common/swipe-button-read-or-unread
       :left-on-press  common/swipe-on-press-toggle-read
       :right-button   common/swipe-button-delete
       :right-on-press common/swipe-on-press-delete
       :extra-fn       extra-fn}
      [quo/activity-log
-      {:title               newsTitle
+      {:title               news-title
        :customization-color customization-color
        :icon                :i/status-logo-bw
        :timestamp           timestamp
-       :context             [[quo/text {} newsDescription]]
+       :context             [[quo/text {} news-description]]
        :items               [{:type                :button
                               :subtype             :primary
                               :key                 :button-reply