fix: show network card with zero value on the sender side if the router does not return a route for that network #20152
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Jenkins BuildsClick to see older builds (30)
|
briansztamfater
force-pushed
the
fix/show-zero-value-routes
branch
4 times, most recently
from
e2c9e69
to
083b43f
Compare
briansztamfater
changed the title
briansztamfater
requested review from
vkjr,
J-Son89,
OmarBasem,
BalogunofAfrica,
mmilad75 and
ulisesmac
briansztamfater
force-pushed
the
fix/show-zero-value-routes
branch
3 times, most recently
from
f3a532f
to
31c85a1
Compare
J-Son89
reviewed
May 22, 2024
| (fn [{:keys [db]} [address]] | ||
| {:db (assoc-in db [:wallet :current-viewing-account-address] address)})) | ||
| (fn [{:keys [db]} [{:keys [address network-details update-balance?]}]] | ||
| (let [current-token (-> db :wallet :ui :send :token) |
There was a problem hiding this comment.
hmm I would like to push back against this change. We're taking a very simple and effective method and coupling it with some send related logic.
Can we handle this some other way? - maybe just a separate event being fired for this particular action? 🤔
There was a problem hiding this comment.
According to the comment in this event:
;; When switching accounts, if there is a selected token we need to update
;; it to reflect balances of the new account
Seems more as a task for a subscription, the subscription that extracts the token from
[:wallet :ui :send :token]
could also receive the current-viewing-account and add the extra data needed.
wdyt?
There was a problem hiding this comment.
I think it makes sense, will try to refactor this and let you know!
There was a problem hiding this comment.
I removed this logic, send the updated token from subscription to :wallet/get-suggested-routes event
|
Hey @briansztamfater
|
ulisesmac
reviewed
May 22, 2024
| (fn [{:keys [db]} [address]] | ||
| {:db (assoc-in db [:wallet :current-viewing-account-address] address)})) | ||
| (fn [{:keys [db]} [{:keys [address network-details update-balance?]}]] | ||
| (let [current-token (-> db :wallet :ui :send :token) |
There was a problem hiding this comment.
According to the comment in this event:
;; When switching accounts, if there is a selected token we need to update
;; it to reflect balances of the new account
Seems more as a task for a subscription, the subscription that extracts the token from
[:wallet :ui :send :token]
could also receive the current-viewing-account and add the extra data needed.
wdyt?
Comment on lines
83
to
89
| (filter (fn [[_ {:keys [raw-balance]}]] | ||
| (or (not only-with-balance?) | ||
| (and only-with-balance? | ||
| (and (money/bignumber? raw-balance) | ||
| (money/greater-than raw-balance (money/bignumber "0"))))))) | ||
| (filter (fn [[_ {:keys [chain-id]}]] | ||
| (not (contains? disabled-set chain-id)))) |
There was a problem hiding this comment.
We can only use one and in the filter condition:
(filter (fn [[_ {:keys [raw-balance]}]]
(or (not only-with-balance?)
(and only-with-balance?
(money/bignumber? raw-balance)
(money/greater-than raw-balance (money/bignumber "0"))))))Have you consider extending the filter below instead of creating a new one? I think performing two filters is more expensive 🤔
There was a problem hiding this comment.
Yeah, I've considered that option, thought that it was more "readable" even if it is a bit less performant, but I have no strong opinion on this tbh, I will change it to have only one filter :)
There was a problem hiding this comment.
We can create two functions to make it more readable, something like
(filter (fn [my-data]
(and (check-conditions-1 my-data)
(check-conditions-2 my-data)))If you take this approach, just make sure to provide good names :)
Comment on lines
366
to
386
| (filter | ||
| #(not= bridge-to-chain-id %) | ||
| sender-token-available-networks-for-suggested-routes) | ||
| sender-token-available-networks-for-suggested-routes) |
There was a problem hiding this comment.
Small comment, consider using remove instead of filter + not + predicate.
Comment on lines
347
to
399
| sender-token-available-networks-for-suggested-routes | ||
| (when token | ||
| (send-utils/token-available-networks-for-suggested-routes {:balances-per-chain | ||
| balances-per-chain | ||
| :disabled-chain-ids | ||
| disabled-from-chain-ids})) | ||
| disabled-from-chain-ids | ||
| :only-with-balance? true})) | ||
| receiver-token-available-networks-for-suggested-routes | ||
| (when token | ||
| (send-utils/token-available-networks-for-suggested-routes {:balances-per-chain | ||
| balances-per-chain | ||
| :disabled-chain-ids | ||
| disabled-from-chain-ids | ||
| :only-with-balance? false})) | ||
| token-networks-ids (when token (mapv #(:chain-id %) (:networks token))) | ||
| sender-network-values (when token-available-networks-for-suggested-routes | ||
| sender-network-values (when sender-token-available-networks-for-suggested-routes | ||
| (send-utils/loading-network-amounts | ||
| {:valid-networks (if (= transaction-type :tx/bridge) | ||
| (filter | ||
| #(not= bridge-to-chain-id %) | ||
| token-available-networks-for-suggested-routes) | ||
| token-available-networks-for-suggested-routes) | ||
| {:valid-networks | ||
| (if (= transaction-type :tx/bridge) | ||
| (filter | ||
| #(not= bridge-to-chain-id %) | ||
| sender-token-available-networks-for-suggested-routes) | ||
| sender-token-available-networks-for-suggested-routes) | ||
| :disabled-chain-ids disabled-from-chain-ids | ||
| :receiver-networks receiver-networks | ||
| :receiver-networks receiver-networks | ||
| :token-networks-ids token-networks-ids | ||
| :tx-type transaction-type | ||
| :receiver? false})) | ||
| receiver-network-values (when token-available-networks-for-suggested-routes | ||
| :tx-type transaction-type | ||
| :receiver? false})) | ||
| receiver-network-values (when receiver-token-available-networks-for-suggested-routes | ||
| (send-utils/loading-network-amounts | ||
| {:valid-networks (if (= transaction-type :tx/bridge) | ||
| (filter | ||
| #(= bridge-to-chain-id %) | ||
| token-available-networks-for-suggested-routes) | ||
| token-available-networks-for-suggested-routes) | ||
| {:valid-networks | ||
| (if (= transaction-type :tx/bridge) | ||
| (filter | ||
| #(= bridge-to-chain-id %) | ||
| receiver-token-available-networks-for-suggested-routes) | ||
| receiver-token-available-networks-for-suggested-routes) |
There was a problem hiding this comment.
This function/event looks very complex, it'd be great if we solve this problem in smaller functions with meaningful names, I know this is out of scope of this PR, but IMO this function needs to be refactored to be easier to understand and maintain.
There was a problem hiding this comment.
Agree, we should even write tests for these events. Will file an issue for it.
Hey @ulisesmac, let me answer those questions!
|
briansztamfater
changed the title
FYI, regarding question 2, we talked today with Alisher and cards in the receiver side with 0 won't be shown anymore, but will raise a separate PR with all the discussed changes once they are 100% defined and represented in designs 👍 . |
briansztamfater
force-pushed
the
fix/show-zero-value-routes
branch
3 times, most recently
from
c18403e
to
c210884
Compare
|
@J-Son89 @ulisesmac just addressed the comments, can you please re-check? |
ulisesmac
approved these changes
May 23, 2024
There was a problem hiding this comment.
Thanks for the explanation and for adressing the comments @briansztamfater
Looks good
67% of end-end tests have passedFailed tests (14)Click to expandClass TestCommunityMultipleDeviceMerged:
Class TestWalletMultipleDevice:
Class TestWalletOneDevice:
Expected to fail tests (3)Click to expandClass TestCommunityOneDeviceMerged:
Class TestGroupChatMultipleDeviceMergedNewUI:
Passed tests (35)Click to expandClass TestCommunityOneDeviceMerged:
Class TestDeepLinksOneDevice:
Class TestOneToOneChatMultipleSharedDevicesNewUiTwo:
Class TestActivityCenterContactRequestMultipleDevicePR:
Class TestCommunityMultipleDeviceMergedTwo:
Class TestActivityMultipleDevicePRTwo:
Class TestWalletOneDevice:
Class TestOneToOneChatMultipleSharedDevicesNewUi:
Class TestActivityMultipleDevicePR:
Class TestGroupChatMultipleDeviceMergedNewUI:
|
J-Son89
reviewed
May 23, 2024
| (defn token-available-networks-for-suggested-routes | ||
| [{:keys [balances-per-chain disabled-chain-ids]}] | ||
| [{:keys [balances-per-chain disabled-chain-ids only-with-balance?]}] |
There was a problem hiding this comment.
I would say only-with-balance is not very clear. What is the purpose of this variable ? 🤔
J-Son89
reviewed
May 23, 2024
| (let [wallet-address (get-in db [:wallet :current-viewing-account-address]) | ||
| token (get-in db [:wallet :ui :send :token]) | ||
| token (or updated-token (get-in db [:wallet :ui :send :token])) |
There was a problem hiding this comment.
do we need both token and updated-token? why not just one of these? 🤔
J-Son89
approved these changes
May 23, 2024
BalogunofAfrica
approved these changes
May 24, 2024
briansztamfater
force-pushed
the
fix/show-zero-value-routes
branch
from
c210884
to
09410c4
Compare
mariia-skrypnyk
force-pushed
the
fix/show-zero-value-routes
branch
from
09410c4
to
96a5b6c
Compare
79% of end-end tests have passedFailed tests (3)Click to expandClass TestWalletOneDevice:
Class TestWalletMultipleDevice:
Passed tests (11)Click to expandClass TestCommunityMultipleDeviceMerged:
|
|
Hi @briansztamfater ! Thanks for your PR. Failed e2e are not related, you can merge your PR. |
…er does not return a route for that network Signed-off-by: Brian Sztamfater <brian@status.im>
briansztamfater
force-pushed
the
fix/show-zero-value-routes
branch
from
96a5b6c
to
9f5b0aa
Compare
jo-mut
pushed a commit
that referenced
this pull request
May 28, 2024
…er does not return a route for that network (#20152) Signed-off-by: Brian Sztamfater <brian@status.im>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fixes #20143
Summary
This PR implements showing network cards with 0 value on the sender side if the account has balance for that token that network when the router does not return a route for that network.
Some examples:
User has ETH on Mainnet, Optimism and Arbitrum
ethavailableonethoptarb.mp4
User has SNT only on Mainnet
sntavailableoneth.mp4
Platforms
Areas that maybe impacted
Functional
Steps to test
status: ready