[BX-1294] Fix missing wallets in Send flow #1368
Merged
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
BrodyHughes
requested review from
brunobar79,
DanielSinclair,
greg-schrammel,
estebanmino and
derHowie
|
Here's the packed extension for this build: |
|
Here's the packed extension for this build: |
DanielSinclair
approved these changes
Mar 6, 2024
Comment on lines
165
to
202
| const [newWalletOrder, setNewWalletOrder] = useState<`0x${string}`[]>([]); | ||
| const { walletOrder, saveWalletOrder } = useWalletOrderStore(); | ||
|
|
||
| // find the items in getAccounts then compare to the current | ||
| // walletOrder, then return all items in getAccounts in order | ||
|
|
||
| useEffect(() => { | ||
| const combineAndOrderArrays = async (orderArray: string[]) => { | ||
| const orderSet = new Set(orderArray); | ||
| const primaryArray = await getAccounts(); | ||
| const itemsNotInOrderArray = primaryArray.filter( | ||
| (item) => !orderSet.has(item), | ||
| ); | ||
|
|
||
| const primaryMap = new Map(primaryArray.map((item) => [item, item])); | ||
|
|
||
| const combinedAndOrdered = [ | ||
| ...orderArray.filter((item) => primaryMap.has(item)), | ||
| ...itemsNotInOrderArray, | ||
| ]; | ||
|
|
||
| return combinedAndOrdered; | ||
| }; | ||
|
|
||
| combineAndOrderArrays(walletOrder).then((orderedAccounts) => { | ||
| setNewWalletOrder(orderedAccounts as `0x${string}`[]); | ||
| saveWalletOrder(orderedAccounts as `0x${string}`[]); | ||
| }); | ||
| }, [walletOrder, saveWalletOrder]); | ||
|
|
||
| const sortedWallets = useMemo( | ||
| () => sortWallets(walletOrder, wallets), | ||
| [wallets, walletOrder], | ||
| () => sortWallets(newWalletOrder, wallets), | ||
| [newWalletOrder, wallets], | ||
| ); | ||
| const sortedWatchedWallets = useMemo( | ||
| () => sortWallets(walletOrder, watchedWallets), | ||
| [watchedWallets, walletOrder], | ||
| () => sortWallets(newWalletOrder, watchedWallets), | ||
| [newWalletOrder, watchedWallets], | ||
| ); |
There was a problem hiding this comment.
after playing with it a bit I'm pretty sure the props are in the right state already, we just need to remove all sorting from inside this component
like
greg-schrammel
approved these changes
Mar 12, 2024
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
|
Here's the packed extension for this build: |
Merged
greg-schrammel
pushed a commit
that referenced
this pull request
Mar 27, 2024
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 BX-1294
What changed (plus any additional context for devs)
useWalletOrderStore()and returning those. this was only ever updated when the order was changed in the walletSwitcher.getAccounts()and then compare that to the order of the wallets inuseWalletOrderStore()useWalletOrderStore()with all the wallets in the correct order and also updated theuseWalletOrderStore()What to test
Screen recordings / screenshots
Screen.Recording.2024-02-28.at.4.14.30.PM.mov