Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Andrea Maria Piana
|
bed2057d97 | ||
|
Andrea Maria Piana
|
ce87945736 | ||
|
Andrea Maria Piana
|
f4e0c69d72 |
@@ -1,5 +0,0 @@
|
||||
(ns status-im.contexts.network.data-store)
|
||||
|
||||
(defn online?
|
||||
[{:network/keys [status]}]
|
||||
(= :online status))
|
||||
@@ -7,19 +7,15 @@
|
||||
:justify-content :flex-end})
|
||||
|
||||
(def text-container
|
||||
{:flex-direction :row
|
||||
:flex-wrap :wrap})
|
||||
|
||||
(def text-aligner
|
||||
{:flex 1
|
||||
:flex-direction :row
|
||||
:justify-content :center})
|
||||
{:flex 1
|
||||
:flex-direction :row
|
||||
:flex-wrap :wrap
|
||||
:align-self :center})
|
||||
|
||||
(def terms-privacy-container
|
||||
{:flex-direction :row
|
||||
{:gap 8
|
||||
:padding-horizontal 20
|
||||
:padding-vertical 8
|
||||
:gap 8})
|
||||
:padding-vertical 8})
|
||||
|
||||
(def plain-text
|
||||
{:color colors/white-opa-70})
|
||||
|
||||
@@ -21,7 +21,8 @@
|
||||
: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
|
||||
@@ -29,7 +30,7 @@
|
||||
:blur? true
|
||||
:checked? terms-accepted?
|
||||
:on-change #(set-terms-accepted? not)}]]
|
||||
[rn/view {:style style/text-aligner}
|
||||
[rn/view {:style {:flex 1}}
|
||||
[rn/view {:style style/text-container}
|
||||
[quo/text
|
||||
{:style style/plain-text
|
||||
@@ -46,7 +47,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])
|
||||
|
||||
@@ -12,10 +12,10 @@
|
||||
:wakuV2Nameserver "8.8.8.8"
|
||||
:statusProxyEnabled config/status-proxy-enabled?
|
||||
:statusProxyStageName config/status-proxy-stage-name
|
||||
:statusProxyMarketUser config/STATUS_BUILD_PROXY_USER
|
||||
:statusProxyMarketPassword config/STATUS_BUILD_PROXY_PASSWORD
|
||||
:statusProxyBlockchainUser config/STATUS_BUILD_PROXY_USER
|
||||
:statusProxyBlockchainPassword config/STATUS_BUILD_PROXY_PASSWORD
|
||||
:statusProxyMarketUser "test"
|
||||
:statusProxyMarketPassword "test"
|
||||
:statusProxyBlockchainUser "test"
|
||||
:statusProxyBlockchainPassword "test"
|
||||
:openseaAPIKey config/opensea-api-key
|
||||
:poktToken config/POKT_TOKEN
|
||||
:infuraToken config/INFURA_TOKEN
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
(: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]
|
||||
@@ -123,15 +122,14 @@
|
||||
(rf/reg-event-fx
|
||||
:wallet/request-collectibles-for-current-viewing-account
|
||||
(fn [{:keys [db]} _]
|
||||
(when (network.data-store/online? db)
|
||||
(let [current-viewing-account (-> db :wallet :current-viewing-account-address)
|
||||
[request-id] (get-unique-collectible-request-id 1)]
|
||||
{:db (assoc-in db [:wallet :ui :collectibles :pending-requests] 1)
|
||||
:fx [[:dispatch
|
||||
[:wallet/request-new-collectibles-for-account
|
||||
{:request-id request-id
|
||||
:account current-viewing-account
|
||||
:amount collectibles-request-batch-size}]]]}))))
|
||||
(let [current-viewing-account (-> db :wallet :current-viewing-account-address)
|
||||
[request-id] (get-unique-collectible-request-id 1)]
|
||||
{:db (assoc-in db [:wallet :ui :collectibles :pending-requests] 1)
|
||||
:fx [[:dispatch
|
||||
[:wallet/request-new-collectibles-for-account
|
||||
{:request-id request-id
|
||||
:account current-viewing-account
|
||||
:amount collectibles-request-batch-size}]]]})))
|
||||
|
||||
(defn- update-fetched-collectibles-progress
|
||||
[db owner-address collectibles offset has-more?]
|
||||
|
||||
@@ -262,7 +262,3 @@
|
||||
;; :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])))
|
||||
|
||||
@@ -7,7 +7,4 @@
|
||||
|
||||
(def defaults
|
||||
{:ui {:network-filter network-filter-defaults
|
||||
;; 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}})
|
||||
:tokens-loading {}}})
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
[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]
|
||||
@@ -108,44 +107,23 @@
|
||||
[:dispatch [:wallet/request-new-collectibles-for-account-from-signal address]]
|
||||
[:dispatch [:wallet/check-recent-history-for-account address]]]}))
|
||||
|
||||
(defn- reconcile-accounts
|
||||
[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
|
||||
(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 (update-in db [:wallet :accounts] reconcile-accounts wallet-accounts)
|
||||
:fx (concat (when (or (data-store/tokens-never-loaded? db)
|
||||
(network.data-store/online? db))
|
||||
refresh-accounts-fx-dispatches)
|
||||
{:db (assoc-in db
|
||||
[:wallet :accounts]
|
||||
(utils.collection/index-by :address wallet-accounts))
|
||||
:fx (concat refresh-accounts-fx-dispatches
|
||||
[(when new-account?
|
||||
[:dispatch [:wallet/navigate-to-new-account navigate-to-account]])])})))
|
||||
|
||||
(rf/reg-event-fx :wallet/get-accounts
|
||||
(fn []
|
||||
(rf/reg-event-fx
|
||||
:wallet/get-accounts
|
||||
(fn [_]
|
||||
{:fx [[:json-rpc/call
|
||||
[{:method "accounts_getAccounts"
|
||||
:on-success [:wallet/get-accounts-success]
|
||||
@@ -508,7 +486,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? (and (network.data-store/online? db) (seq chains-filtered-by-mode))
|
||||
chains-down? (seq chains-filtered-by-mode)
|
||||
chain-names (when chains-down?
|
||||
(->> (map #(-> (network-utils/id->network %)
|
||||
name
|
||||
|
||||
@@ -518,8 +518,8 @@
|
||||
|
||||
(rf/reg-event-fx
|
||||
:wallet/handle-suggested-routes
|
||||
(fn [_ [data]]
|
||||
(if-let [{:keys [code details]} (-> data :ErrorResponse)]
|
||||
(fn [_ data]
|
||||
(if-let [{:keys [code details]} (-> data :ErrorResponse first)]
|
||||
(let [error-message (if (= code "0") "An error occurred" details)]
|
||||
(log/error "failed to get suggested routes (async)"
|
||||
{:event :wallet/handle-suggested-routes
|
||||
@@ -531,6 +531,7 @@
|
||||
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))]
|
||||
|
||||
@@ -43,15 +43,9 @@
|
||||
{:fx [[:dispatch [:wallet/reload]]]}
|
||||
|
||||
"wallet-blockchain-status-changed"
|
||||
{:fx [[:dispatch-later
|
||||
;; Don't dispatch immediately because the signal may arrive as
|
||||
;; 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)]}]]]}
|
||||
{:fx [[:dispatch
|
||||
[:wallet/blockchain-status-changed
|
||||
(transforms/js->clj event-js)]]]}
|
||||
|
||||
"wallet-activity-filtering-done"
|
||||
{:fx
|
||||
|
||||
@@ -152,12 +152,8 @@
|
||||
(fn [toasts [_ toast-id & cursor]]
|
||||
(get-in toasts (into [:toasts toast-id] cursor))))
|
||||
|
||||
(re-frame/reg-sub :network/offline?
|
||||
(re-frame/reg-sub
|
||||
:network/offline?
|
||||
:<- [:network/status]
|
||||
(fn [status]
|
||||
(= status :offline)))
|
||||
|
||||
(re-frame/reg-sub :network/online?
|
||||
:<- [:network/status]
|
||||
(fn [status]
|
||||
(= status :online)))
|
||||
|
||||
@@ -48,10 +48,11 @@
|
||||
:wallet/home-tokens-loading?
|
||||
:<- [:wallet/tokens-loading]
|
||||
(fn [tokens-loading]
|
||||
(->> tokens-loading
|
||||
vals
|
||||
(some true?)
|
||||
boolean)))
|
||||
(or (empty? tokens-loading)
|
||||
(->> tokens-loading
|
||||
vals
|
||||
(some true?)
|
||||
boolean))))
|
||||
|
||||
(rf/reg-sub
|
||||
:wallet/current-viewing-account-tokens-loading?
|
||||
@@ -350,10 +351,9 @@
|
||||
:<- [:wallet/accounts]
|
||||
:<- [:wallet/balances-in-selected-networks]
|
||||
:<- [:wallet/tokens-loading]
|
||||
:<- [:network/online?]
|
||||
:<- [:profile/currency-symbol]
|
||||
:<- [:wallet/keypairs]
|
||||
(fn [[accounts balances tokens-loading online? currency-symbol keypairs]]
|
||||
(fn [[accounts balances tokens-loading currency-symbol keypairs]]
|
||||
(mapv (fn [{:keys [color address watch-only? key-uid operable] :as account}]
|
||||
(let [account-type (cond
|
||||
(= operable :no) :missing-keypair
|
||||
@@ -373,9 +373,8 @@
|
||||
account
|
||||
keypair)}]))
|
||||
#(rf/dispatch [:wallet/navigate-to-account address]))
|
||||
:loading? (and online?
|
||||
(or (get tokens-loading address)
|
||||
(not (contains? tokens-loading address))))
|
||||
:loading? (or (get tokens-loading address)
|
||||
(not (contains? tokens-loading address)))
|
||||
:balance (utils/prettify-balance currency-symbol
|
||||
(get balances address)))))
|
||||
accounts)))
|
||||
|
||||
@@ -133,7 +133,8 @@
|
||||
max-fees-fiat (wallet-utils/calculate-token-fiat-value {:currency currency
|
||||
:balance max-fees-ether
|
||||
:token eth-token})
|
||||
max-fees-fiat-formatted (-> (wallet-utils/get-standard-crypto-format eth-token max-fees-ether)
|
||||
max-fees-fiat-formatted (-> 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
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
"_comment": "Instead use: scripts/update-status-go.sh <rev>",
|
||||
"owner": "status-im",
|
||||
"repo": "status-go",
|
||||
"version": "fix/generate_account2",
|
||||
"commit-sha1": "58ee4f0461740f5b74f9655ea47275410bd05135",
|
||||
"src-sha256": "032badg45ibya6h7ahg6hdb1z90363hq043va3cf5cvhjakbw8l2"
|
||||
"version": "test/set-api-proxy-test-debug",
|
||||
"commit-sha1": "022b6fd45b99819ec14baabd6d482ae85ed468bf",
|
||||
"src-sha256": "03p7x3s9005ghi02x334077nxwdhwlkxmvhcnc07lsygfsnzkkzk"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user