From 6037fe80c42d94bf581340371cf6de8533faeb84 Mon Sep 17 00:00:00 2001 From: flexsurfer Date: Wed, 1 May 2024 12:19:50 +0200 Subject: [PATCH] More reagent atom regression #19812 (#19828) --- .../buttons/dynamic_button/view.cljs | 2 +- .../components/links/url_preview/view.cljs | 33 ++++++++++--------- .../loaders/skeleton_list/view.cljs | 6 ++-- .../chat/messenger/messages/list/view.cljs | 5 +-- 4 files changed, 24 insertions(+), 22 deletions(-) diff --git a/src/quo/components/buttons/dynamic_button/view.cljs b/src/quo/components/buttons/dynamic_button/view.cljs index 7c249f7563..13879dd32b 100644 --- a/src/quo/components/buttons/dynamic_button/view.cljs +++ b/src/quo/components/buttons/dynamic_button/view.cljs @@ -77,7 +77,7 @@ :background-color button-color} style)} (when (#{:mention :search :search-with-label :scroll-to-bottom} type) - [icon-view type]) + [icon-view type theme]) (when (#{:jump-to :mention :notification-down :notification-up :search-with-label} type) [text/text {:weight :medium diff --git a/src/quo/components/links/url_preview/view.cljs b/src/quo/components/links/url_preview/view.cljs index db069d83ce..4190b7eadc 100644 --- a/src/quo/components/links/url_preview/view.cljs +++ b/src/quo/components/links/url_preview/view.cljs @@ -29,22 +29,23 @@ :resize-mode :cover}])) (defn- content - [{:keys [title body]} theme] - [rn/view {:style style/content-container} - [text/text - {:accessibility-label :title - :size :paragraph-2 - :weight :semi-bold - :number-of-lines 1 - :style (style/title theme)} - title] - [text/text - {:accessibility-label :body - :size :paragraph-2 - :weight :medium - :number-of-lines 1 - :style (style/body theme)} - body]]) + [{:keys [title body]}] + (let [theme (quo.theme/use-theme)] + [rn/view {:style style/content-container} + [text/text + {:accessibility-label :title + :size :paragraph-2 + :weight :semi-bold + :number-of-lines 1 + :style (style/title theme)} + title] + [text/text + {:accessibility-label :body + :size :paragraph-2 + :weight :medium + :number-of-lines 1 + :style (style/body theme)} + body]])) (defn- clear-button [{:keys [on-press]}] diff --git a/src/quo/components/loaders/skeleton_list/view.cljs b/src/quo/components/loaders/skeleton_list/view.cljs index b20fbd6140..80052cedc4 100644 --- a/src/quo/components/loaders/skeleton_list/view.cljs +++ b/src/quo/components/loaders/skeleton_list/view.cljs @@ -57,9 +57,9 @@ [rn/view {:style (style/author color)}]]])]) (defn- f-animated-skeleton-view - [{:keys [style color skeleton-height animated? translate-x window-width theme] :as data}] - (let [loading-color (colors/theme-colors colors/neutral-10 colors/neutral-60 theme)] - + [{:keys [style color skeleton-height animated? translate-x window-width] :as data}] + (let [theme (quo.theme/use-theme) + loading-color (colors/theme-colors colors/neutral-10 colors/neutral-60 theme)] (rn/use-effect (fn [] (when-not animated? diff --git a/src/status_im/contexts/chat/messenger/messages/list/view.cljs b/src/status_im/contexts/chat/messenger/messages/list/view.cljs index 1baa30da6b..8989310bfe 100644 --- a/src/status_im/contexts/chat/messenger/messages/list/view.cljs +++ b/src/status_im/contexts/chat/messenger/messages/list/view.cljs @@ -220,8 +220,9 @@ [actions chat-id customization-color]])) (defn footer-component - [{:keys [chat distance-from-list-top theme customization-color]}] - (let [{:keys [chat-id chat-name emoji chat-type + [{:keys [chat distance-from-list-top customization-color]}] + (let [theme (quo.theme/use-theme) + {:keys [chat-id chat-name emoji chat-type group-chat color description last-message]} chat display-name (cond