Merge pull request #26954 from brave/fix-wallet-prevent-double-accoun…

…t-creation-on-buy-screen fix(wallet): Prevent Double Account Creation on Buy Screen
brave · Dec 12, 2024 · 059a437 · 059a437
2 parents 1ce9c73 + 9170120
commit 059a437
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/...nts/brave_wallet_ui/page/screens/fund-wallet/components/create_account/create_account.tsx b/...nts/brave_wallet_ui/page/screens/fund-wallet/components/create_account/create_account.tsx
@@ -47,7 +47,10 @@ import { Column, Row, Text } from '../../../../../components/shared/style'
 interface Props extends DialogProps {
   isOpen: boolean
   token?: MeldCryptoCurrency
-  onSelectToken: (asset: MeldCryptoCurrency) => void
+  onSelectToken: (
+    asset: MeldCryptoCurrency,
+    account?: BraveWallet.AccountInfo
+  ) => void
   onClose: () => void
 }
 
@@ -92,7 +95,7 @@ export const CreateAccount = (props: Props) => {
       }).unwrap()
 
       if (account) {
-        onSelectToken(token)
+        onSelectToken(token, account)
       }
     } catch (error) {
       console.log(error)

diff --git a/components/brave_wallet_ui/page/screens/fund-wallet/hooks/useBuy.ts b/components/brave_wallet_ui/page/screens/fund-wallet/hooks/useBuy.ts
@@ -395,10 +395,12 @@ export const useBuy = () => {
   )
 
   const onSelectToken = useCallback(
-    async (asset: MeldCryptoCurrency) => {
+    async (asset: MeldCryptoCurrency, account?: BraveWallet.AccountInfo) => {
       const incomingAssetsCoinType = getMeldTokensCoinType(asset)
       const accountToUse =
-        selectedAccount.accountId.coin !== incomingAssetsCoinType
+        account !== undefined
+          ? account
+          : selectedAccount.accountId.coin !== incomingAssetsCoinType
           ? getFirstAccountByCoinType(incomingAssetsCoinType, accounts)
           : selectedAccount
       if (!accountToUse) {