diff --git a/src/status_im/ui/screens/wallet/main/views.cljs b/src/status_im/ui/screens/wallet/main/views.cljs index db61cfc9d3a3..6f9614f970cc 100644 --- a/src/status_im/ui/screens/wallet/main/views.cljs +++ b/src/status_im/ui/screens/wallet/main/views.cljs @@ -164,11 +164,7 @@ [react/scroll-view {:end-fill-color colors/white :refresh-control (reagent/as-element - [react/refresh-control {:on-refresh (fn [_] - ;;TODO temporay fix to update balance, should be fixed - ;;properly later - (re-frame/dispatch [:wallet.ui/pull-to-refresh]) - (re-frame/dispatch [:update-wallet])) + [react/refresh-control {:on-refresh #(re-frame/dispatch [:wallet.ui/pull-to-refresh]) :tint-color :white :refreshing false}])} (if error-message diff --git a/src/status_im/ui/screens/wallet/navigation.cljs b/src/status_im/ui/screens/wallet/navigation.cljs index 5239b2e2d4b4..1a6fb5306ceb 100644 --- a/src/status_im/ui/screens/wallet/navigation.cljs +++ b/src/status_im/ui/screens/wallet/navigation.cljs @@ -2,27 +2,16 @@ (:require [re-frame.core :as re-frame] [status-im.ui.screens.navigation :as navigation] [status-im.utils.ethereum.core :as ethereum] - [status-im.constants :as constants] - [status-im.utils.utils :as utils])) + [status-im.constants :as constants])) (defmethod navigation/preload-data! :wallet [db _] ;;TODO(goranjovic) - get rid of this preload hook completely - ;;TODO(andrey) - temporary "improvement" with timeout, to fix screen rendering, wallet update should be optimized - (utils/set-timeout (fn [] - (re-frame/dispatch [:wallet.ui/pull-to-refresh]) - (re-frame/dispatch [:update-wallet])) - 500) (assoc-in db [:wallet :current-tab] 0)) (defmethod navigation/preload-data! :wallet-stack [db _] ;;TODO(goranjovic) - get rid of this preload hook completely - ;;TODO(andrey) - temporary "improvement" with timeout, to fix screen rendering, wallet update should be optimized - (utils/set-timeout (fn [] - (re-frame/dispatch [:wallet.ui/pull-to-refresh]) - (re-frame/dispatch [:update-wallet])) - 500) (assoc-in db [:wallet :current-tab] 0)) (defmethod navigation/preload-data! :transactions-history diff --git a/src/status_im/ui/screens/wallet/transactions/views.cljs b/src/status_im/ui/screens/wallet/transactions/views.cljs index c668a93c309d..e3db415e6d37 100644 --- a/src/status_im/ui/screens/wallet/transactions/views.cljs +++ b/src/status_im/ui/screens/wallet/transactions/views.cljs @@ -14,8 +14,7 @@ [status-im.utils.money :as money] [status-im.utils.ethereum.tokens :as tokens] [status-im.utils.ethereum.core :as ethereum] - [status-im.ui.screens.wallet.utils :as wallet.utils] - [status-im.utils.utils :as utils])) + [status-im.ui.screens.wallet.utils :as wallet.utils])) (defn history-action [filter?] (cond-> @@ -263,4 +262,3 @@ [details-confirmations confirmations confirmations-progress type] [react/view {:style styles/details-separator}] [details-list transaction]]])) -