From 8aeeb19f228dc489f1d12583054766569fde105a Mon Sep 17 00:00:00 2001 From: psdp <4315882+psdp@users.noreply.github.com> Date: Tue, 8 May 2018 05:53:01 +0000 Subject: [PATCH] Show spinner when refreshing wallet on iOS [#3667] Signed-off-by: Julien Eluard --- src/status_im/ui/screens/wallet/styles.cljs | 22 ++++++++++----------- src/status_im/ui/screens/wallet/views.cljs | 7 ++++--- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/status_im/ui/screens/wallet/styles.cljs b/src/status_im/ui/screens/wallet/styles.cljs index 0cda5da9fb..88558a3d3f 100644 --- a/src/status_im/ui/screens/wallet/styles.cljs +++ b/src/status_im/ui/screens/wallet/styles.cljs @@ -65,18 +65,18 @@ ;; Main section -(def main-section - {:flex 1}) +(defstyle main-section + {:flex 1 + :ios {:background-color colors/blue}}) -(def scroll-top - (let [height (:height (react/get-dimensions "window"))] - {:background-color colors/blue - :zIndex -1 - :position :absolute - :height height - :top (- height) - :left 0 - :right 0})) +(defstyle scroll-bottom + {:background-color colors/white + :zIndex -1 + :position :absolute + :left 0 + :right 0 + :android {:height 0} + :ios {:height 9999}}) (def section {:background-color colors/blue}) diff --git a/src/status_im/ui/screens/wallet/views.cljs b/src/status_im/ui/screens/wallet/views.cljs index 25560268f7..4a5711de5d 100644 --- a/src/status_im/ui/screens/wallet/views.cljs +++ b/src/status_im/ui/screens/wallet/views.cljs @@ -91,14 +91,15 @@ [react/refresh-control {:on-refresh #(re-frame/dispatch [:update-wallet]) :tint-color :white :refreshing false}])} - [react/view {:style styles/scroll-top}] ;; Hack to allow different colors for top / bottom scroll view] [total-section portfolio-value currency] [list/action-list actions {:container-style styles/action-section}] - [asset-section assets currency]]])) + [asset-section assets currency] + ;; Hack to allow different colors for bottom scroll view (iOS only) + [react/view {:style styles/scroll-bottom}]]])) (views/defview wallet [] (views/letsubs [{:keys [wallet-set-up-passed?]} [:get-current-account]] (if wallet-set-up-passed? [wallet-root] - [onboarding.views/onboarding]))) \ No newline at end of file + [onboarding.views/onboarding])))