Watch-only address balance should not be included in the overall balance by default #19657 #19716
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 (41)
|
mmilad75
requested review from
ulisesmac,
smohamedjavid,
J-Son89,
briansztamfater and
vkjr
and removed request for
ulisesmac
ibrkhalil
approved these changes
Apr 19, 2024
88% of end-end tests have passedFailed tests (4)Click to expandClass TestCommunityMultipleDeviceMerged:
Class TestOneToOneChatMultipleSharedDevicesNewUiTwo:
Class TestActivityCenterContactRequestMultipleDevicePR:
Class TestCommunityOneDeviceMerged:
Expected to fail tests (2)Click to expandClass TestGroupChatMultipleDeviceMergedNewUI:
Class TestCommunityOneDeviceMerged:
Passed tests (46)Click to expandClass TestWalletMultipleDevice:
Class TestCommunityMultipleDeviceMerged:
Class TestCommunityOneDeviceMerged:
Class TestActivityCenterContactRequestMultipleDevicePR:
Class TestDeepLinksOneDevice:
Class TestGroupChatMultipleDeviceMergedNewUI:
Class TestCommunityMultipleDeviceMergedTwo:
Class TestWalletOneDevice:
Class TestActivityMultipleDevicePR:
Class TestActivityMultipleDevicePRTwo:
Class TestOneToOneChatMultipleSharedDevicesNewUiTwo:
Class TestOneToOneChatMultipleSharedDevicesNewUi:
|
mariia-skrypnyk
force-pushed
the
milad/19657-remove-watch-only-balance-in-overal
branch
from
9234420
to
16c5740
Compare
|
One question, does this affect the balance of the individual tokens in the asset list too? 🤔 I think we should check with designers about this. 
|
No, it doesn't. The ticket was only for the top balance. I will check with them and if it's required, I will update them as well @J-Son89 |
cool, thanks @mmilad75 - we can keep them as separate issues either way. But yes let's check :) |
@J-Son89 It should be included https://discord.com/channels/624634427930312714/928625369542713396/1231915683294478368 |
|
@mmilad75 would you mind to fix it here? |
Sure. I had issues with running the app. I'll be working on it today |
mmilad75
force-pushed
the
milad/19657-remove-watch-only-balance-in-overal
branch
from
d913140
to
7c5979e
Compare
|
Hi @mmilad75 ! Checked and still see sum of My + Watch Only tokens: |
src/status_im/config.cljs
Outdated
| @@ -133,3 +133,5 @@ | |||
| (def community-accounts-selection-enabled? true) | |||
| (def fetch-messages-enabled? (enabled? (get-config :FETCH_MESSAGES_ENABLED "1"))) | |||
| (def test-networks-enabled? (enabled? (get-config :TEST_NETWORKS_ENABLED "0"))) | |||
|
|
|||
| (def include-watch-only-balance-in-total? false) | |||
There was a problem hiding this comment.
This flag can be removed as we are excluding the watched addresses in the balance calculation.
| :<- [:wallet/accounts-without-watched-accounts] | ||
| (fn [[all-accounts owned-accounts]] | ||
| (let [accounts (if config/include-watch-only-balance-in-total? all-accounts owned-accounts)] | ||
| (utils/aggregate-tokens-for-all-accounts accounts)))) | ||
|
|
There was a problem hiding this comment.
(rf/reg-sub
:wallet/aggregated-tokens
:<- [:wallet/accounts-without-watched-accounts] ;; Replace :wallet/accounts with this sub
(fn [accounts]
(utils/aggregate-tokens-for-all-accounts accounts)))
Please check again with the latest build 🙏 |
smohamedjavid
approved these changes
Apr 28, 2024
|
Thanks @mmilad75 ! Functionality works properly. |
94% of end-end tests have passedFailed tests (1)Click to expandClass TestWalletMultipleDevice:
Expected to fail tests (2)Click to expandClass TestGroupChatMultipleDeviceMergedNewUI:
Class TestCommunityOneDeviceMerged:
Passed tests (49)Click to expandClass TestCommunityMultipleDeviceMergedTwo:
Class TestOneToOneChatMultipleSharedDevicesNewUiTwo:
Class TestGroupChatMultipleDeviceMergedNewUI:
Class TestActivityMultipleDevicePRTwo:
Class TestOneToOneChatMultipleSharedDevicesNewUi:
Class TestCommunityMultipleDeviceMerged:
Class TestWalletOneDevice:
Class TestWalletMultipleDevice:
Class TestActivityCenterContactRequestMultipleDevicePR:
Class TestDeepLinksOneDevice:
Class TestCommunityOneDeviceMerged:
Class TestActivityMultipleDevicePR:
|
vkjr
approved these changes
Apr 29, 2024
|
Hi @mmilad75 ! |
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 #19657
Screen.Recording.2024-04-19.at.00.44.41.mov