refactor

https://github.com/status-im/status-go/compare/1d9d7343...fc03393e

src/status_im2/contexts/chat/events.cljs

@@ -335,3 +335,4 @@
   {:events [:chat.ui/update-shared-element-id]}
   [{:keys [db]} shared-element-id]
   {:db (assoc db :shared-element-id shared-element-id)})
+

src/status_im2/contexts/chat/messages/content/image/view.cljs

@@ -40,6 +40,7 @@
             :native-ID (when (= shared-element-id message-id) :shared-element)}]]]))))
 =======
          {:active-opacity 1
+          :key            message-id
           :style          {:margin-top (when (> index 0) 20)}
           :on-press       (fn []
                             (rf/dispatch [:chat.ui/update-shared-element-id message-id])

src/status_im2/contexts/chat/photo_selector/album_selector/style.cljs

@@ -9,7 +9,7 @@
    :margin-horizontal  8
    :border-radius      12
    :align-items        :center
-   :background-color   (when selected? colors/neutral-5)})
+   :background-color   (when selected? colors/primary-50-opa-5)})
 
 (def cover
   {:width         40

src/status_im2/contexts/chat/photo_selector/style.cljs

@@ -40,7 +40,8 @@
    :position         :absolute
    :left             20})
 
-(def title-container
+(defn title-container
+  []
   {:flex-direction     :row
    :background-color   (colors/theme-colors colors/neutral-10 colors/neutral-80)
    :border-radius      10

src/status_im2/contexts/chat/photo_selector/view.cljs

@@ -82,7 +82,7 @@
 (defn album-title
   [photos? selected-album]
   [rn/touchable-opacity
-   {:style               style/title-container
+   {:style               (style/title-container)
     :active-opacity      1
     :accessibility-label :album-title
     :on-press            #(rf/dispatch (if photos?
@@ -93,16 +93,17 @@
     [quo/icon (if photos? :i/chevron-down :i/chevron-up)
      {:color (colors/theme-colors colors/neutral-100 colors/white)}]]])
 
+
 (defn photo-selector
   []
-  (let [selected-images (rf/sub [:chats/sending-image])
-        selected-album  (or (rf/sub [:camera-roll/selected-album]) (i18n/label :t/recent))
-        selected        (reagent/atom [])]
-    (rf/dispatch [:chat.ui/camera-roll-get-photos 20 nil selected-album])
-    [:f>
-     (fn []
+  [:f>
+   (fn []
+     (let [selected-images (rf/sub [:chats/sending-image])
+           selected-album  (or (rf/sub [:camera-roll/selected-album]) (i18n/label :t/recent))
+           selected        (reagent/atom [])]
        (rn/use-effect-once
         (fn []
+          (rf/dispatch [:chat.ui/camera-roll-get-photos 20 nil selected-album])
           (if selected-images
             (reset! selected (vec (vals selected-images)))
             (reset! selected []))
@@ -136,5 +137,5 @@
                :on-end-reached          #(rf/dispatch [:camera-roll/on-end-reached end-cursor
                                                        selected-album loading?
                                                        has-next-page?])}]
-             [bottom-gradient selected-images insets selected]]))])]))
+             [bottom-gradient selected-images insets selected]]))]))])
 

src/status_im2/setup/dev.cljs

@@ -4,18 +4,18 @@
             [utils.re-frame :as rf]))
 
 ;; Ignore all logs, because there are lots of temporary warnings when developing and hot reloading
-(.ignoreAllLogs LogBox)
+;(.ignoreAllLogs LogBox)
 
 ;; Only ignore warnings/errors that cannot be fixed for the time being.
 ;; When you add a warning to be ignored explain below why it is ignored and how it can be fixed.
 ;; When a warning is fixed make sure to remove it from here.
-#_(.ignoreLogs ^js LogBox
-               (clj->js ["undefined is not an object (evaluating 'e.message')"
-                         "Cannot read property 'message' of undefined"
-                         "InternalError Metro has encountered an error"
-                         "undefined Unable to resolve module `parse-svg-path`"
-                         "group12"
-                         "Setting a timer for a long period of time"]))
+(.ignoreLogs ^js LogBox
+             (clj->js ["undefined is not an object (evaluating 'e.message')"
+                       "Cannot read property 'message' of undefined"
+                       "InternalError Metro has encountered an error"
+                       "undefined Unable to resolve module `parse-svg-path`"
+                       "group12"
+                       "Setting a timer for a long period of time"]))
 
 ;; List of ignored warnings/errors:
 ;; 1. "evaluating 'e.message'": Not sure why this error is happening, but it is coming from here

status-go-version.json

@@ -4,6 +4,7 @@
     "owner": "status-im",
     "repo": "status-go",
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     "version": "v0.125.2",
     "commit-sha1": "fc03393e1b9cc430c6c3357629e47b4aec4f113d",
@@ -29,4 +30,9 @@
     "src-sha256": "1cia31skfhr78b1zqxzd0196hsbaqdh0mbqhyry275pcsw979lp2"
 >>>>>>> 1c406eb07... update status-go
 >>>>>>> 1e8722132... update status-go
+=======
+    "version": "e57d1c34beee03aeb3ed83d946a1e7cf96bf6bdd",
+    "commit-sha1": "e57d1c34beee03aeb3ed83d946a1e7cf96bf6bdd",
+    "src-sha256": "1cia31skfhr78b1zqxzd0196hsbaqdh0mbqhyry275pcsw979lp2"
+>>>>>>> ae976abc7... refactor
 }

translations/en.json

@@ -1945,15 +1945,11 @@
     "contact-request-chat-pending": "Your contact request is pending",
     "contact-request-chat-add": "Add {{name}} to send a message",
     "join-request": "Join request",
-<<<<<<< HEAD
     "join-one-user": "Join {{user}}",
     "join-two-users": "Join {{user1}} and {{user2}}",
     "join-more-users": "Join {{user1}}, {{user2}} and {{left-count}} more",
-    "wants-to-join": "wants to join"
-=======
     "wants-to-join": "wants to join",
     "my-albums": "My albums",
     "images": "images",
     "only-6-images": "You can only add 6 images to your message"
->>>>>>> 9b3c165c0... feat: photo & album selector screens
 }