status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[#21323] fix: wrong networks when asset not available in default account (#21689)

This commit is contained in:
Mohsen 2024-12-03 17:24:30 +03:00 committed by GitHub
parent 2be78041e2
commit 32ccca0912
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/status_im/contexts/wallet/swap/events.cljs
View File

@ -16,16 +16,19 @@
test-networks-enabled? (get-in db [:profile/profile :test-networks-enabled?]) test-networks-enabled? (get-in db [:profile/profile :test-networks-enabled?])
view-id (:view-id db) view-id (:view-id db)
root-screen? (or (= view-id :wallet-stack) (nil? view-id)) root-screen? (or (= view-id :wallet-stack) (nil? view-id))
account (or from-account (swap-utils/wallet-account wallet)) available-accounts (utils/get-accounts-with-token-balance (:accounts wallet)
asset-to-pay (if (get-in data [:asset-to-pay :networks]) (:asset-to-pay data))
account (or from-account
(swap-utils/current-viewing-account wallet)
(first available-accounts))
asset-to-pay (if (and (not from-account) (get-in data [:asset-to-pay :networks]))
(:asset-to-pay data) (:asset-to-pay data)
(swap-utils/select-asset-to-pay-by-symbol (swap-utils/select-asset-to-pay-by-symbol
{:wallet wallet {:wallet wallet
:account account :account account
:test-networks-enabled? test-networks-enabled? :test-networks-enabled? test-networks-enabled?
:token-symbol (get-in data [:asset-to-pay :symbol])})) :token-symbol (get-in data [:asset-to-pay :symbol])}))
multi-account-balance? (-> (utils/get-accounts-with-token-balance (:accounts wallet) multi-account-balance? (-> available-accounts
asset-to-pay)
(count) (count)
(> 1)) (> 1))
network' (or network network' (or network

23
src/status_im/contexts/wallet/swap/utils.cljs
View File

@ -30,27 +30,10 @@
:else :else
(i18n/label :t/something-went-wrong-please-try-again-later))) (i18n/label :t/something-went-wrong-please-try-again-later)))
(defn- first-operable-account (defn current-viewing-account
[accounts]
(->> accounts
vals
(remove :watch-only?)
(filter :operable?)
(sort-by :position)
first))
(defn wallet-account
"Picks the account that's gonna be used for the swap operation.
It's gonna be either the preselected account defined by
`[:wallet :current-viewing-account-address]` in `db`
or the first operable account."
[wallet] [wallet]
(if-let [wallet-address (get wallet :current-viewing-account-address)] (when-let [wallet-address (get wallet :current-viewing-account-address)]
(-> wallet (get-in wallet [:accounts wallet-address])))
:accounts
vals
(utils/get-account-by-address wallet-address))
(-> wallet :accounts first-operable-account)))
(defn select-asset-to-pay-by-symbol (defn select-asset-to-pay-by-symbol
"Selects an asset to pay by token symbol. "Selects an asset to pay by token symbol.