From 9c7c796e02cf2b33f998ef624c298969df8120dc Mon Sep 17 00:00:00 2001
From: Roman Volosovskyi <roman.wolosovskyi@gmail.com>
Date: Tue, 2 Mar 2021 13:16:42 +0200
Subject: [PATCH] [wallet] Avoid requesting of token balances on account
 creation

---
 src/status_im/ethereum/transactions/core.cljs | 14 +++++++-------
 src/status_im/wallet/accounts/core.cljs       |  7 +++++--
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/status_im/ethereum/transactions/core.cljs b/src/status_im/ethereum/transactions/core.cljs
index b8aed96623..5cef9490d6 100644
--- a/src/status_im/ethereum/transactions/core.cljs
+++ b/src/status_im/ethereum/transactions/core.cljs
@@ -231,16 +231,16 @@
                            (wallet/stop-watching-tx hash))
                          transfers))
 
-                  true
+                  (and max-known-block
+                       (some #(> (:block %) max-known-block) transfers))
                   (conj (wallet/update-balances
-                         (into [] (reduce (fn [acc {:keys [address block]}]
-                                            (if (and max-known-block (> block max-known-block))
-                                              (conj acc address)
-                                              acc))
-                                          #{}
-                                          transfers))
+                         [address]
                          (zero? max-known-block)))
 
+                  (and (zero? max-known-block)
+                       (empty? transfers))
+                  (conj (wallet/set-zero-balances {:address address}))
+
                   (< (count transfers) limit)
                   (conj (tx-history-end-reached checksum)))]
     (apply fx/merge cofx (tx-fetching-ended [checksum]) effects)))
diff --git a/src/status_im/wallet/accounts/core.cljs b/src/status_im/wallet/accounts/core.cljs
index e0d485f48c..44852b8acf 100644
--- a/src/status_im/wallet/accounts/core.cljs
+++ b/src/status_im/wallet/accounts/core.cljs
@@ -23,7 +23,8 @@
             [status-im.utils.hex :as hex]
             [status-im.ethereum.ens :as ens]
             [status-im.ens.core :as ens.core]
-            [status-im.ethereum.resolver :as resolver]))
+            [status-im.ethereum.resolver :as resolver]
+            [status-im.utils.mobile-sync :as utils.mobile-sync]))
 
 (fx/defn start-adding-new-account
   {:events [:wallet.accounts/start-adding-new-account]}
@@ -205,7 +206,9 @@
       (fx/merge cofx
                 {:db (update-in db [:add-account :account] merge account)}
                 (save-new-account)
-                (wallet/update-balances nil true)
+                (if (utils.mobile-sync/syncing-allowed? cofx)
+                  (wallet/set-max-block address 0)
+                  (wallet/update-balances nil true))
                 (prices/update-prices)
                 (navigation/navigate-back)))))