From 6469ff912a3073c9ac02818d349d2a129b57ebbd Mon Sep 17 00:00:00 2001 From: andrey Date: Wed, 27 Jan 2021 10:51:46 +0100 Subject: [PATCH] [#11651] No spinner when pressing "Fetch more messages" in public chat + white toggles in Sync settings on Android Signed-off-by: andrey --- src/status_im/ui/components/react.cljs | 4 ++-- src/status_im/ui/screens/profile/components/views.cljs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/status_im/ui/components/react.cljs b/src/status_im/ui/components/react.cljs index 648df0aca2..f7d959c45a 100644 --- a/src/status_im/ui/components/react.cljs +++ b/src/status_im/ui/components/react.cljs @@ -59,10 +59,10 @@ (def activity-indicator-class (reagent/adapt-react-class (.-ActivityIndicator react-native))) (defn activity-indicator [props] - [activity-indicator-class props]) + [activity-indicator-class (update props :color #(or % colors/gray))]) (defn small-loading-indicator [color] - [activity-indicator {:color (if color color :colors/gray) + [activity-indicator {:color color :ios {:size :small} :android {:size :16}}]) diff --git a/src/status_im/ui/screens/profile/components/views.cljs b/src/status_im/ui/screens/profile/components/views.cljs index 1ffcfd6116..0429ff4f79 100644 --- a/src/status_im/ui/screens/profile/components/views.cljs +++ b/src/status_im/ui/screens/profile/components/views.cljs @@ -46,7 +46,7 @@ [react/view styles/settings-item [react/view styles/settings-item-text-wrapper [react/i18n-text {:style styles/settings-item-text :key label-kw}]] - [react/switch {:track-color #js {:true colors/blue :false nil} + [react/switch {:track-color #js {:true colors/blue :false colors/gray-lighter} :value (boolean value) :on-value-change action-fn :disabled (not active?)}]])