fix_: account address derivation in mobile user upgrade

This reverts commit a6688fb866.

src/status_im/contexts/network/data_store.cljs

@@ -0,0 +1,5 @@
+(ns status-im.contexts.network.data-store)
+
+(defn online?
+  [{:network/keys [status]}]
+  (= :online status))

src/status_im/contexts/onboarding/intro/style.cljs

@@ -7,15 +7,19 @@
    :justify-content :flex-end})
 
 (def text-container
-  {:flex           1
+  {:flex-direction :row
-   :flex-direction :row
+   :flex-wrap      :wrap})
-   :flex-wrap      :wrap
+
-   :align-self     :center})
+(def text-aligner
+  {:flex            1
+   :flex-direction  :row
+   :justify-content :center})
 
 (def terms-privacy-container
-  {:gap                8
+  {:flex-direction     :row
    :padding-horizontal 20
-   :padding-vertical   8})
+   :padding-vertical   8
+   :gap                8})
 
 (def plain-text
   {:color colors/white-opa-70})

src/status_im/contexts/onboarding/intro/view.cljs

@@ -21,8 +21,7 @@
        :actions              :two-vertical-actions
        :description          :top
        :description-top-text [rn/view
-                              {:style          style/terms-privacy-container
+                              {:style style/terms-privacy-container}
-                               :flex-direction :row}
                               [rn/view
                                {:accessibility-label :terms-privacy-checkbox-container}
                                [quo/selectors
@@ -30,7 +29,7 @@
                                  :blur?     true
                                  :checked?  terms-accepted?
                                  :on-change #(set-terms-accepted? not)}]]
-                              [rn/view {:style {:flex 1}}
+                              [rn/view {:style style/text-aligner}
                                [rn/view {:style style/text-container}
                                 [quo/text
                                  {:style style/plain-text
@@ -47,7 +46,7 @@
                                 [quo/text
                                  {:style style/plain-text
                                   :size  :paragraph-2}
-                                 " & "]
+                                 " " (i18n/label :t/and) " "]
                                 [quo/text
                                  {:on-press #(rf/dispatch [:show-bottom-sheet
                                                            {:content (fn [] [privacy/privacy-statement])

src/status_im/contexts/profile/config.cljs

@@ -12,10 +12,10 @@
    :wakuV2Nameserver              "8.8.8.8"
    :statusProxyEnabled            config/status-proxy-enabled?
    :statusProxyStageName          config/status-proxy-stage-name
-   :statusProxyMarketUser         "test"
+   :statusProxyMarketUser         config/STATUS_BUILD_PROXY_USER
-   :statusProxyMarketPassword     "test"
+   :statusProxyMarketPassword     config/STATUS_BUILD_PROXY_PASSWORD
-   :statusProxyBlockchainUser     "test"
+   :statusProxyBlockchainUser     config/STATUS_BUILD_PROXY_USER
-   :statusProxyBlockchainPassword "test"
+   :statusProxyBlockchainPassword config/STATUS_BUILD_PROXY_PASSWORD
    :openseaAPIKey                 config/opensea-api-key
    :poktToken                     config/POKT_TOKEN
    :infuraToken                   config/INFURA_TOKEN

src/status_im/contexts/wallet/collectible/events.cljs

@@ -2,6 +2,7 @@
   (:require [camel-snake-kebab.extras :as cske]
             [clojure.string :as string]
             [react-native.platform :as platform]
+            [status-im.contexts.network.data-store :as network.data-store]
             [status-im.contexts.wallet.collectible.utils :as collectible-utils]
             [taoensso.timbre :as log]
             [utils.ethereum.chain :as chain]
@@ -122,14 +123,15 @@
 (rf/reg-event-fx
  :wallet/request-collectibles-for-current-viewing-account
  (fn [{:keys [db]} _]
-   (let [current-viewing-account (-> db :wallet :current-viewing-account-address)
+   (when (network.data-store/online? db)
-         [request-id]            (get-unique-collectible-request-id 1)]
+     (let [current-viewing-account (-> db :wallet :current-viewing-account-address)
-     {:db (assoc-in db [:wallet :ui :collectibles :pending-requests] 1)
+           [request-id]            (get-unique-collectible-request-id 1)]
-      :fx [[:dispatch
+       {:db (assoc-in db [:wallet :ui :collectibles :pending-requests] 1)
-            [:wallet/request-new-collectibles-for-account
+        :fx [[:dispatch
-             {:request-id request-id
+              [:wallet/request-new-collectibles-for-account
-              :account    current-viewing-account
+               {:request-id request-id
-              :amount     collectibles-request-batch-size}]]]})))
+                :account    current-viewing-account
+                :amount     collectibles-request-batch-size}]]]}))))
 
 (defn- update-fetched-collectibles-progress
   [db owner-address collectibles offset has-more?]

src/status_im/contexts/wallet/data_store.cljs

@@ -262,3 +262,7 @@
      ;;  :cost () ;; tbd not used on desktop
      :token-fees                token-fees
      :gas-amount                (:tx-gas-amount new-path)}))
+
+(defn tokens-never-loaded?
+  [db]
+  (nil? (get-in db [:wallet :ui :tokens-loading])))

src/status_im/contexts/wallet/db.cljs

@@ -7,4 +7,7 @@
 
 (def defaults
   {:ui {:network-filter network-filter-defaults
-        :tokens-loading {}}})
+        ;; Note: we set it to nil by default to differentiate when the user logs
+        ;; in and the device is offline, versus re-fetching when offline and
+        ;; tokens already exist in the app-db.
+        :tokens-loading nil}})

src/status_im/contexts/wallet/events.cljs

@@ -5,6 +5,7 @@
     [clojure.string :as string]
     [react-native.platform :as platform]
     [status-im.constants :as constants]
+    [status-im.contexts.network.data-store :as network.data-store]
     [status-im.contexts.settings.wallet.effects]
     [status-im.contexts.settings.wallet.events]
     [status-im.contexts.wallet.common.activity-tab.events]
@@ -107,23 +108,44 @@
          [:dispatch [:wallet/request-new-collectibles-for-account-from-signal address]]
          [:dispatch [:wallet/check-recent-history-for-account address]]]}))
 
-(rf/reg-event-fx
+(defn- reconcile-accounts
- :wallet/get-accounts-success
+  [db-accounts-by-address new-accounts]
+  (reduce
+   (fn [res {:keys [address] :as account}]
+     ;; Because we add extra fields (tokens and collectibles) into the RPC
+     ;; response from accounts_getAccounts, if we are offline we want to keep
+     ;; the old balances in the accounts, thus we merge the up-to-date account
+     ;; from status-go into the cached accounts. We also merge when online
+     ;; because we will re-fetch balances anyway.
+     ;;
+     ;; Refactor improvement: don't augment entities from status-go, store
+     ;; tokens and collectibles in separate keys in the app-db indexed by
+     ;; account address.
+     (assoc res
+            address
+            (-> (get db-accounts-by-address address)
+                (merge account)
+                ;; These should not be cached, otherwise when going
+                ;; offline->online collectibles won't be fetched.
+                (dissoc :current-collectible-idx :has-more-collectibles?))))
+   {}
+   new-accounts))
+
+(rf/reg-event-fx :wallet/get-accounts-success
  (fn [{:keys [db]} [accounts]]
    (let [wallet-accounts     (data-store/rpc->accounts accounts)
          wallet-db           (get db :wallet)
          new-account?        (:new-account? wallet-db)
          navigate-to-account (:navigate-to-account wallet-db)]
-     {:db (assoc-in db
+     {:db (update-in db [:wallet :accounts] reconcile-accounts wallet-accounts)
-           [:wallet :accounts]
+      :fx (concat (when (or (data-store/tokens-never-loaded? db)
-           (utils.collection/index-by :address wallet-accounts))
+                            (network.data-store/online? db))
-      :fx (concat refresh-accounts-fx-dispatches
+                    refresh-accounts-fx-dispatches)
                   [(when new-account?
                      [:dispatch [:wallet/navigate-to-new-account navigate-to-account]])])})))
 
-(rf/reg-event-fx
+(rf/reg-event-fx :wallet/get-accounts
- :wallet/get-accounts
+ (fn []
- (fn [_]
    {:fx [[:json-rpc/call
           [{:method     "accounts_getAccounts"
             :on-success [:wallet/get-accounts-success]
@@ -486,7 +508,7 @@
                                   {:test-networks-enabled? test-networks-enabled?
                                    :is-goerli-enabled?     is-goerli-enabled?})
          chains-filtered-by-mode (remove #(not (contains? chain-ids-by-mode %)) down-chain-ids)
-         chains-down?            (seq chains-filtered-by-mode)
+         chains-down?            (and (network.data-store/online? db) (seq chains-filtered-by-mode))
          chain-names             (when chains-down?
                                    (->> (map #(-> (network-utils/id->network %)
                                                   name

src/status_im/contexts/wallet/send/events.cljs

@@ -518,8 +518,8 @@
 
 (rf/reg-event-fx
  :wallet/handle-suggested-routes
- (fn [_ data]
+ (fn [_ [data]]
-   (if-let [{:keys [code details]} (-> data :ErrorResponse first)]
+   (if-let [{:keys [code details]} (-> data :ErrorResponse)]
      (let [error-message (if (= code "0") "An error occurred" details)]
        (log/error "failed to get suggested routes (async)"
                   {:event :wallet/handle-suggested-routes
@@ -531,7 +531,6 @@
            candidates-fix  (comp ->old-route-paths
                                  remove-invalid-bonder-fees-routes)
            routes          (-> data
-                               (first)
                                (data-store/rpc->suggested-routes)
                                (update :best best-routes-fix)
                                (update :candidates candidates-fix))]

src/status_im/contexts/wallet/signals.cljs

@@ -43,9 +43,15 @@
        {:fx [[:dispatch [:wallet/reload]]]}
 
        "wallet-blockchain-status-changed"
-       {:fx [[:dispatch
+       {:fx [[:dispatch-later
-              [:wallet/blockchain-status-changed
+              ;; Don't dispatch immediately because the signal may arrive as
-               (transforms/js->clj event-js)]]]}
+              ;; soon as the device goes offline. We need to give some time for
+              ;; RN to dispatch the network status update, otherwise when going
+              ;; offline the user will immediately see a toast saying "provider
+              ;; X is down".
+              [{:ms       500
+                :dispatch [:wallet/blockchain-status-changed
+                           (transforms/js->clj event-js)]}]]]}
 
        "wallet-activity-filtering-done"
        {:fx

src/status_im/subs/general.cljs

@@ -152,8 +152,12 @@
  (fn [toasts [_ toast-id & cursor]]
    (get-in toasts (into [:toasts toast-id] cursor))))
 
-(re-frame/reg-sub
+(re-frame/reg-sub :network/offline?
- :network/offline?
  :<- [:network/status]
  (fn [status]
    (= status :offline)))
+
+(re-frame/reg-sub :network/online?
+ :<- [:network/status]
+ (fn [status]
+   (= status :online)))

src/status_im/subs/wallet/wallet.cljs

@@ -48,11 +48,10 @@
  :wallet/home-tokens-loading?
  :<- [:wallet/tokens-loading]
  (fn [tokens-loading]
-   (or (empty? tokens-loading)
+   (->> tokens-loading
-       (->> tokens-loading
+        vals
-            vals
+        (some true?)
-            (some true?)
+        boolean)))
-            boolean))))
 
 (rf/reg-sub
  :wallet/current-viewing-account-tokens-loading?
@@ -351,9 +350,10 @@
  :<- [:wallet/accounts]
  :<- [:wallet/balances-in-selected-networks]
  :<- [:wallet/tokens-loading]
+ :<- [:network/online?]
  :<- [:profile/currency-symbol]
  :<- [:wallet/keypairs]
- (fn [[accounts balances tokens-loading currency-symbol keypairs]]
+ (fn [[accounts balances tokens-loading online? currency-symbol keypairs]]
    (mapv (fn [{:keys [color address watch-only? key-uid operable] :as account}]
            (let [account-type (cond
                                 (= operable :no) :missing-keypair
@@ -373,8 +373,9 @@
                                                                        account
                                                                        keypair)}]))
                                            #(rf/dispatch [:wallet/navigate-to-account address]))
-                    :loading?            (or (get tokens-loading address)
+                    :loading?            (and online?
-                                             (not (contains? tokens-loading address)))
+                                              (or (get tokens-loading address)
+                                                  (not (contains? tokens-loading address))))
                     :balance             (utils/prettify-balance currency-symbol
                                                                  (get balances address)))))
          accounts)))

src/status_im/subs/wallet/wallet_connect.cljs

@@ -133,8 +133,7 @@
            max-fees-fiat           (wallet-utils/calculate-token-fiat-value {:currency currency
                                                                              :balance  max-fees-ether
                                                                              :token    eth-token})
-           max-fees-fiat-formatted (-> max-fees-ether
+           max-fees-fiat-formatted (-> (wallet-utils/get-standard-crypto-format eth-token max-fees-ether)
-                                       (wallet-utils/get-standard-crypto-format eth-token)
                                        (wallet-utils/get-standard-fiat-format currency-symbol
                                                                               max-fees-fiat))
            balance                 (-> eth-token

status-go-version.json

@@ -3,7 +3,7 @@
     "_comment": "Instead use: scripts/update-status-go.sh <rev>",
     "owner": "status-im",
     "repo": "status-go",
-    "version": "test/set-api-proxy-test-debug",
+    "version": "fix/generate_account2",
-    "commit-sha1": "022b6fd45b99819ec14baabd6d482ae85ed468bf",
+    "commit-sha1": "58ee4f0461740f5b74f9655ea47275410bd05135",
-    "src-sha256": "03p7x3s9005ghi02x334077nxwdhwlkxmvhcnc07lsygfsnzkkzk"
+    "src-sha256": "032badg45ibya6h7ahg6hdb1z90363hq043va3cf5cvhjakbw8l2"
 }