Fix account balance discrepancies #5959

walmat · 2024-07-26T16:23:20Z

Fixes APP-1689
Fixes APP-1564

What changed (plus any additional context for devs)

We had a couple issues going on here.

In the change wallet sheet we were using the addys account summary API to display balances, this was somehow really off.
On the wallet screen, we were filtering assets a little too heavily so the balance was different between BX and App.
In the send sheet I am now consuming the new method as well to keep it consistent

In order to solve both, we now consume a shared react-query hook in both places, which is the same one the BX uses.

Screen recordings / screenshots

Simulator.Screen.Recording.-.iPhone.15.Pro.-.2024-08-05.at.16.49.58.mp4

What to test

…sheet

linear · 2024-07-26T16:23:23Z

APP-1689 Issue: Balance Discrepancy between home and wallet switcher

src/helpers/buildWalletSections.tsx

src/hooks/useAssetsBalanceForAddress.ts

src/hooks/useUserAssetsBalance.ts

linear · 2024-08-01T15:52:58Z

APP-1564 App displaying two separate balances on wallet switcher and home screen

src/languages/en_US.json

src/hooks/useUserAssetsBalance.ts

src/helpers/buildWalletSections.tsx

src/components/change-wallet/AddressRow.tsx

src/components/contacts/ContactRow.js

… some reason

walmat · 2024-08-05T21:07:24Z

src/__swaps__/screens/Swap/providers/swap-provider.tsx

-          }),
-        },
-      ]);
+      queryClient.invalidateQueries(


separated all of the instances of invalidateQueries out because Arrays weren't working for whatever reason.

src/components/DappBrowser/control-panel/ControlPanel.tsx

walmat · 2024-08-05T21:08:38Z

src/hooks/useRefreshAccountData.ts

-        connectedToHardhat,
-      }),
-    });
+    queryClient.invalidateQueries(nftsQueryKey({ address: accountAddress }));


same here. Arrays were just not working..

src/helpers/buildWalletSections.tsx

src/hooks/useWallets.ts

src/hooks/useWalletsWithBalancesAndNames.ts

…@matthew/APP-1689

src/hooks/useWalletSectionsData.ts

src/hooks/useWallets.ts

src/components/DappBrowser/control-panel/ControlPanel.tsx

src/hooks/useWalletBalances.ts

jinchung · 2024-08-10T22:50:51Z

in the ControlPanel, AddressRow, and ContactRow, we have either the balance or show "No balance" - wondering about the loading state here as for now it'll just show "No balance" which can be jarring; at some point Matthew had something like a "Loading balance" copy placeholder, wonder if we want to use something like that

jinchung · 2024-08-10T23:24:12Z

src/hooks/useWalletBalances.ts

+    })),
+  });
+
+  const isLoading = isSummaryLoading || positionQueries.some(query => query.isLoading);


just want to check:
for the useAddysSummary hook, isLoading will only be set to true at the initial load but will be false afterwards since we have keepPreviousData set to true which is great.

can we double check that we have something similar for the position queries, and that we aren't going back to isLoading set to true every time we're fetching after the initial fetch? we should check what we have configured for the positions data

otherwise would expect to result in something like profile balance showing up and then the row disappearing for a bit during a positions refresh, and coming back, etc. also while we're at it, generally check that the data is being refreshed in a reasonable manner now that we rely on this for balances instead of the underlying token data

keepPreviousData is actually not used correctly there. react query actually "keeps previous data" all the time - even if data is stale, react query still provides it until the new data (fetched in the background) is ready to replace it. keepPreviousData keeps the previously fetched data when the query key changes, which is not behavior we want. i'm removing that.

but you're right that the useWalletBalances version of isLoading is somewhat problematic, for 2 reasons:

the addys query has a cache time of 24 hours while the positions queries do not have cache times

even if the cache times were the same may not be aligned, especially since these queries could be used in other contexts

this means that the problem you described would currently be valid every time a user cold starts the app since there is no positions query cache.

to mitigate it i've given all the queries in useWalletBalances a staleTime of 2 minutes and a cacheTime of 24 hours. this means worst case scenario isLoading will be true a few times a day, but in reality it will probably be fewer.

…@matthew/APP-1689

jinchung

🌮

* Degen mode analytics, copy adjustment (#5979) * Brody/swap v2 e2e (#5915) * init * test file * clean up * matthew review fixes * lint * oops!!! * type casting * rename * . * lint * oops hardhat stuff removed * reverts * simplify hardhat check * Update src/__swaps__/screens/Swap/components/FadeMask.tsx Co-authored-by: Matthew Wall <[email protected]> * Apply suggestions from code review IS_TESTING > IS_TEST Co-authored-by: Matthew Wall <[email protected]> * fix lint * okay actually fix lint --------- Co-authored-by: Matthew Wall <[email protected]> * Revert CI script changes (#5961) * init * oop * update logging * test * undo * Revert "rerun only failed tests (#5878)" This reverts commit 497d27a. * Bump fast-xml-parser from 4.4.0 to 4.4.1 (#5965) Bumps [fast-xml-parser](https://github.com/NaturalIntelligence/fast-xml-parser) from 4.4.0 to 4.4.1. - [Release notes](https://github.com/NaturalIntelligence/fast-xml-parser/releases) - [Changelog](https://github.com/NaturalIntelligence/fast-xml-parser/blob/master/CHANGELOG.md) - [Commits](NaturalIntelligence/fast-xml-parser@v4.4.0...v4.4.1) --- updated-dependencies: - dependency-name: fast-xml-parser dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: i18n updates (#5980) * Revert "Brody/swap v2 e2e (#5915)" (#5987) This reverts commit a38f633. * Convert App.js => App.tsx (#5792) * . * undo tsconfig change and create routes.tsx with platform selector * chore: merge * yep * fix * rm authorize * change initial route context initial value * wrap in usecallbacks * Fix token to buy list empty spaces (#5983) * fixes empty spaces * also add searching to recents * rm log * remove duplicate recents and add migration * fix sort * fix bridge button sending users to swaps v1 (#5971) * fix (#5989) * fix favorites tokens with no icon (#5982) * fix favorites default list * wip * 👍 * Update src/resources/favorites.ts * fix format --------- Co-authored-by: Matthew Wall <[email protected]> * codeowners file removed (#5991) * Trending DApps (#5974) * initial work for trending dapps * progress on trending dapps * impl. trending hooks * combine selectors * fix crash and fix empty state not showing up (#5975) * bump version to v1.9.35 (#5992) * Swaps: Popular Tokens (#5990) * Default the Swap input currency to ETH (#5994) * . (#5993) * Design system improvements (#5984) * Revert ". (#5993)" (#5999) * swaps bug fix: missing asset balance for some tokens (#5998) * remove filter * forgot this * Drag and drop components, browser favorites reordering (#5978) * Add drag-and-drop components, useLayoutWorklet Slightly modified implementation based on https://github.com/mgcrea/react-native-dnd * Make browser favorites reorderable, migrate favoriteDapps store to createRainbowStore * Fix fallback logos, add useLayoutWorklet documentation * Reorder imports * Clean up favorites stores, types Removes unnecessary additions to the legacy store * Improve reliability of browser favorites URL handling Resolves issues causing certain favorites not to be removable (due to params in the URL or a subtly different URL path), by: - Adding more lenient fallback lookup mechanisms if no exact match is found - Trimming params from the standardized URLs Also moves the browser favorites store to within the /state/browser/ folder. * Create EasingGradient, useEasingGradient * Add activeScale, default activeOpacity to 1 * Clean up activeScale * Replace JS-based timer with useAnimatedTimeout, misc. cleanup * Add dragDirection option to Draggable * Add DraggableFlatList Fully working with the exception of auto scrolling while dragging * Improve browser homepage cards * Fix light mode card contrast, Android card gradient * Expose stop function in useAnimatedTimeout * useAnimatedTime: stop → clearTimeout * Improve card BlurView rendering * Make reorderable favorites mounting/unmounting smoother * Clean up animated reaction dependencies * Add missing favorites store method * Fix account balance discrepancies (#5959) * fix balance discrepency between bx and app and app and change wallet sheet * Update src/helpers/buildWalletSections.tsx * fix missing import from commit * also fix send sheet balance discrepancy * fix swap user assets not refetching on pending txn resolution and PTR * . * update en_US key * rmeove unused hook and bake it into the user assets store * good lord * separate invalidateQueries because they don't update when grouped for some reason * more instances * cleanup * cleanup useWatchPendingTxs * code suggestions * break up useWallets * rm latestBackup from useWallets * useMemo -> useEffect * logging * cleanup * remove unused withPositions params * type * fix PROFILE_STICKY_HEADER loading value * fix * optional chaining * fixes to buildWalletSections + related code * fix accountInfo isLoadingAccountBalance * clean up useWalletBalances * stuff is still broken but committing walletsWithBalancesAndNames fix * refactor useWalletsWithBalancesAndNames and fix consumers * fix wallet screen balance loading state * console.log * switch amount types from string | number -> string * align stale/cache times, remove keepPreviousData * remove spammy isDamaged logging * add loading balance copy + remove incorrectly used no balance copy * fix i18n mistake --------- Co-authored-by: Ben Goldberg <[email protected]> * update swaps sdk (#5996) * Swaps: Change fee denomination from USD -> actual payment token (#6000) * hm * done * idk how this got deleted * cleanup * fix bad rebase --------- Co-authored-by: gregs <[email protected]> * Fun stuff (#5995) * add filteration * clenaup * fix runtime error (#6001) * rotate user-agent (#6003) * fixed dapp browser height on android (#6004) * fixes android light mode button navigation colors (#6005) * fix TokenToBuyList weirdness when favoriting (#6002) * wip * fix * ops * bring back slice * Revert "fixes android light mode button navigation colors (#6005)" This reverts commit fc87001. * Revert "Convert App.js => App.tsx (#5792)" This reverts commit 0d09b10. * Revert "Drag and drop components, browser favorites reordering (#5978)" This reverts commit 5feae69. --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Christian Baroni <[email protected]> Co-authored-by: brdy <[email protected]> Co-authored-by: Matthew Wall <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Daniel Sinclair <[email protected]> Co-authored-by: gregs <[email protected]> Co-authored-by: Bruno Barbieri <[email protected]> Co-authored-by: Ben Goldberg <[email protected]> Co-authored-by: Bruno Barbieri <[email protected]>

fix balance discrepency between bx and app and app and change wallet …

415e800

…sheet

walmat commented Jul 26, 2024

View reviewed changes

src/helpers/buildWalletSections.tsx Outdated Show resolved Hide resolved

walmat added 3 commits July 26, 2024 12:23

Update src/helpers/buildWalletSections.tsx

2f82761

fix missing import from commit

4ff91ef

also fix send sheet balance discrepancy

d010309

walmat commented Jul 26, 2024

View reviewed changes

src/hooks/useAssetsBalanceForAddress.ts Outdated Show resolved Hide resolved

walmat commented Jul 26, 2024

View reviewed changes

src/hooks/useUserAssetsBalance.ts Outdated Show resolved Hide resolved

walmat added 2 commits July 31, 2024 13:40

fix swap user assets not refetching on pending txn resolution and PTR

50df200

.

cf6a796

jinchung requested review from benisgold and jinchung and removed request for benisgold August 2, 2024 22:25

jinchung reviewed Aug 2, 2024

View reviewed changes

src/languages/en_US.json Outdated Show resolved Hide resolved

jinchung reviewed Aug 2, 2024

View reviewed changes

src/hooks/useUserAssetsBalance.ts Outdated Show resolved Hide resolved

update en_US key

2605a21

jinchung reviewed Aug 3, 2024

View reviewed changes

src/helpers/buildWalletSections.tsx Show resolved Hide resolved

jinchung reviewed Aug 3, 2024

View reviewed changes

src/components/change-wallet/AddressRow.tsx Show resolved Hide resolved

jinchung reviewed Aug 3, 2024

View reviewed changes

src/components/contacts/ContactRow.js Outdated Show resolved Hide resolved

walmat added 2 commits August 5, 2024 12:10

rmeove unused hook and bake it into the user assets store

eb8bbe2

good lord

bc4c6e8

walmat requested review from brunobar79 and benisgold as code owners August 5, 2024 20:49

walmat added 3 commits August 5, 2024 16:54

separate invalidateQueries because they don't update when grouped for…

148a1eb

… some reason

more instances

d5a2a67

cleanup

1b4013f

walmat commented Aug 5, 2024

View reviewed changes

src/components/DappBrowser/control-panel/ControlPanel.tsx Outdated Show resolved Hide resolved

walmat commented Aug 5, 2024

View reviewed changes

jinchung reviewed Aug 9, 2024

View reviewed changes

src/helpers/buildWalletSections.tsx Outdated Show resolved Hide resolved

jinchung reviewed Aug 9, 2024

View reviewed changes

src/hooks/useWallets.ts Outdated Show resolved Hide resolved

jinchung reviewed Aug 9, 2024

View reviewed changes

src/hooks/useWalletsWithBalancesAndNames.ts Outdated Show resolved Hide resolved

benisgold added 8 commits August 9, 2024 11:02

optional chaining

fc10958

fixes to buildWalletSections + related code

b0eb61b

fix accountInfo isLoadingAccountBalance

943117b

clean up useWalletBalances

7a11e75

stuff is still broken but committing walletsWithBalancesAndNames fix

38e9eb5

refactor useWalletsWithBalancesAndNames and fix consumers

335bb0d

fix wallet screen balance loading state

04069ba

Merge branch 'develop' of https://github.com/rainbow-me/rainbow into …

4c6855d

…@matthew/APP-1689

benisgold requested a review from jinchung August 9, 2024 23:40