From 7ab033e4d12d4a596e88000562430e83b488fd11 Mon Sep 17 00:00:00 2001 From: balogunofafrica Date: Tue, 5 Dec 2023 05:43:20 +0000 Subject: [PATCH 1/2] fix: use custom color for confirm select --- .../contexts/chat/photo_selector/view.cljs | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/status_im2/contexts/chat/photo_selector/view.cljs b/src/status_im2/contexts/chat/photo_selector/view.cljs index 7d2d876bed3..11d326d70b8 100644 --- a/src/status_im2/contexts/chat/photo_selector/view.cljs +++ b/src/status_im2/contexts/chat/photo_selector/view.cljs @@ -35,7 +35,7 @@ (close)) (defn confirm-button - [selected-images sending-image close] + [selected-images sending-image close customization-color] (when (not= selected-images sending-image) [linear-gradient/linear-gradient {:colors [:black :transparent] @@ -43,7 +43,8 @@ :end {:x 0 :y 0} :style (style/gradient-container (safe-area/get-bottom))} [quo/button - {:container-style {:align-self :stretch + {:customization-color customization-color + :container-style {:align-self :stretch :margin-horizontal 20 :margin-top 12} :on-press #(on-press-confirm-selection selected-images close) @@ -94,10 +95,11 @@ [{:keys [scroll-enabled on-scroll current-scroll close] :as sheet}] (rf/dispatch [:photo-selector/get-photos-for-selected-album]) (rf/dispatch [:photo-selector/camera-roll-get-albums]) - (let [album? (reagent/atom false) - sending-image (into [] (vals (rf/sub [:chats/sending-image]))) - selected-images (reagent/atom sending-image) - window-width (:width (rn/get-window))] + (let [album? (reagent/atom false) + customization-color (rf/sub [:profile/customization-color]) + sending-image (into [] (vals (rf/sub [:chats/sending-image]))) + selected-images (reagent/atom sending-image) + window-width (:width (rn/get-window))] [:f> (fn [] (let [camera-roll-photos (rf/sub [:camera-roll/photos]) @@ -140,7 +142,7 @@ (rf/dispatch [:photo-selector/camera-roll-loading-more true]) (rf/dispatch [:photo-selector/get-photos-for-selected-album end-cursor])))}] - [confirm-button @selected-images sending-image close]] + [confirm-button @selected-images sending-image close customization-color]] [rn/view {:style style/buttons-container} [quo/dropdown {:type dropdown-type From d5a074b65490033526b83f955b32f4fe15695e61 Mon Sep 17 00:00:00 2001 From: balogunofafrica Date: Wed, 6 Dec 2023 03:55:39 +0000 Subject: [PATCH 2/2] refactor: use map for props --- src/status_im2/contexts/chat/photo_selector/view.cljs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/status_im2/contexts/chat/photo_selector/view.cljs b/src/status_im2/contexts/chat/photo_selector/view.cljs index 11d326d70b8..cd5801678df 100644 --- a/src/status_im2/contexts/chat/photo_selector/view.cljs +++ b/src/status_im2/contexts/chat/photo_selector/view.cljs @@ -35,7 +35,7 @@ (close)) (defn confirm-button - [selected-images sending-image close customization-color] + [{:keys [selected-images sending-image close customization-color]}] (when (not= selected-images sending-image) [linear-gradient/linear-gradient {:colors [:black :transparent] @@ -142,7 +142,11 @@ (rf/dispatch [:photo-selector/camera-roll-loading-more true]) (rf/dispatch [:photo-selector/get-photos-for-selected-album end-cursor])))}] - [confirm-button @selected-images sending-image close customization-color]] + [confirm-button + {:close close + :customization-color customization-color + :selected-images @selected-images + :sending-image sending-image}]] [rn/view {:style style/buttons-container} [quo/dropdown {:type dropdown-type