From cb51f8a2f3fd7ecb6dd9348e2c12c09c6ba4519b Mon Sep 17 00:00:00 2001 From: Parvesh Monu Date: Thu, 5 Oct 2023 14:19:01 +0530 Subject: [PATCH 1/2] fix wrong counter color in jump-to screen --- .../jump_to/components/bottom_tabs/view.cljs | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/status_im2/contexts/shell/jump_to/components/bottom_tabs/view.cljs b/src/status_im2/contexts/shell/jump_to/components/bottom_tabs/view.cljs index 440d1552dea..0bf50010325 100644 --- a/src/status_im2/contexts/shell/jump_to/components/bottom_tabs/view.cljs +++ b/src/status_im2/contexts/shell/jump_to/components/bottom_tabs/view.cljs @@ -1,10 +1,11 @@ (ns status-im2.contexts.shell.jump-to.components.bottom-tabs.view - (:require [utils.re-frame :as rf] + (:require [quo2.core :as quo] + [quo2.theme :as theme] + [utils.re-frame :as rf] [react-native.core :as rn] [react-native.gesture :as gesture] [react-native.platform :as platform] [react-native.reanimated :as reanimated] - [quo2.core :as quo] [status-im2.contexts.shell.jump-to.utils :as utils] [status-im2.contexts.shell.jump-to.state :as state] [status-im2.contexts.shell.jump-to.animation :as animation] @@ -58,14 +59,15 @@ shared-values))] (utils/load-stack @state/selected-stack-id) (reanimated/set-shared-value (:pass-through? shared-values) pass-through?) - [reanimated/view - {:style (style/bottom-tabs-container pass-through? (:bottom-tabs-height shared-values))} - (when pass-through? - [reanimated/blur-view (blur-overlay-params bottom-tabs-blur-overlay-style)]) - [rn/view {:style (style/bottom-tabs)} - [gesture/gesture-detector {:gesture communities-double-tab-gesture} - [bottom-tab :i/communities :communities-stack shared-values notifications-data]] - [gesture/gesture-detector {:gesture messages-double-tap-gesture} - [bottom-tab :i/messages :chats-stack shared-values notifications-data]] - [bottom-tab :i/wallet :wallet-stack shared-values notifications-data] - [bottom-tab :i/browser :browser-stack shared-values notifications-data]]])) + [theme/provider {:theme :dark} + [reanimated/view + {:style (style/bottom-tabs-container pass-through? (:bottom-tabs-height shared-values))} + (when pass-through? + [reanimated/blur-view (blur-overlay-params bottom-tabs-blur-overlay-style)]) + [rn/view {:style (style/bottom-tabs)} + [gesture/gesture-detector {:gesture communities-double-tab-gesture} + [bottom-tab :i/communities :communities-stack shared-values notifications-data]] + [gesture/gesture-detector {:gesture messages-double-tap-gesture} + [bottom-tab :i/messages :chats-stack shared-values notifications-data]] + [bottom-tab :i/wallet :wallet-stack shared-values notifications-data] + [bottom-tab :i/browser :browser-stack shared-values notifications-data]]]])) From 3a12952dd70d23de18f05fe727012fe09ab0456a Mon Sep 17 00:00:00 2001 From: Parvesh Monu Date: Thu, 5 Oct 2023 14:30:40 +0530 Subject: [PATCH 2/2] Review changes --- .../contexts/shell/jump_to/components/bottom_tabs/view.cljs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/status_im2/contexts/shell/jump_to/components/bottom_tabs/view.cljs b/src/status_im2/contexts/shell/jump_to/components/bottom_tabs/view.cljs index 0bf50010325..f7f2c104916 100644 --- a/src/status_im2/contexts/shell/jump_to/components/bottom_tabs/view.cljs +++ b/src/status_im2/contexts/shell/jump_to/components/bottom_tabs/view.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.shell.jump-to.components.bottom-tabs.view (:require [quo2.core :as quo] - [quo2.theme :as theme] [utils.re-frame :as rf] + [quo2.theme :as quo.theme] [react-native.core :as rn] [react-native.gesture :as gesture] [react-native.platform :as platform] @@ -59,7 +59,7 @@ shared-values))] (utils/load-stack @state/selected-stack-id) (reanimated/set-shared-value (:pass-through? shared-values) pass-through?) - [theme/provider {:theme :dark} + [quo.theme/provider {:theme :dark} [reanimated/view {:style (style/bottom-tabs-container pass-through? (:bottom-tabs-height shared-values))} (when pass-through?