Skip to content

[TASK-14290] Fix Bug: recognize bank account that was already added #1162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Zishan-7 merged 4 commits into from
Sep 4, 2025
Merged

[TASK-14290] Fix Bug: recognize bank account that was already added #1162

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
575b3bd
feat: check for existing account
Zishan-7 Aug 31, 2025
7e07644
remove useEffect
Zishan-7 Sep 2, 2025
4812c61
use `useSavedAccounts` hook for getting user's saved accounts
Zishan-7 Sep 2, 2025
2aee1cc
Merge remote-tracking branch 'origin/peanut-wallet-dev' into feat/det…
Zishan-7 Sep 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions src/components/AddWithdraw/DynamicBankAccountForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,15 @@ import { Button } from '@/components/0_Bruddle/Button'
import { AddBankAccountPayload, BridgeAccountOwnerType, BridgeAccountType } from '@/app/actions/types/users.types'
import BaseInput from '@/components/0_Bruddle/BaseInput'
import { countryCodeMap } from '@/components/AddMoney/consts'
import { useParams } from 'next/navigation'
import { useParams, useRouter } from 'next/navigation'
import { validateIban, validateBic, isValidRoutingNumber } from '@/utils/bridge-accounts.utils'
import ErrorAlert from '@/components/Global/ErrorAlert'
import { getBicFromIban } from '@/app/actions/ibanToBic'
import PeanutActionDetailsCard, { PeanutActionDetailsCardProps } from '../Global/PeanutActionDetailsCard'
import { PEANUT_WALLET_TOKEN_SYMBOL } from '@/constants'
import { useWithdrawFlow } from '@/context/WithdrawFlowContext'
import { getCountryFromIban, validateMXCLabeAccount, validateUSBankAccount } from '@/utils/withdraw.utils'
import useSavedAccounts from '@/hooks/useSavedAccounts'
import { useAppDispatch, useAppSelector } from '@/redux/hooks'
import { bankFormActions } from '@/redux/slices/bank-form-slice'
import { useDebounce } from '@/hooks/useDebounce'
Expand Down Expand Up @@ -72,9 +73,11 @@ export const DynamicBankAccountForm = forwardRef<{ handleSubmit: () => void }, D
const [isSubmitting, setIsSubmitting] = useState(false)
const [submissionError, setSubmissionError] = useState<string | null>(null)
const { country: countryNameParams } = useParams()
const { amountToWithdraw } = useWithdrawFlow()
const { amountToWithdraw, setSelectedBankAccount } = useWithdrawFlow()
const [firstName, ...lastNameParts] = (user?.user.fullName ?? '').split(' ')
const lastName = lastNameParts.join(' ')
const router = useRouter()
const savedAccounts = useSavedAccounts()
const [isCheckingBICValid, setisCheckingBICValid] = useState(false)

let selectedCountry = (countryNameFromProps ?? (countryNameParams as string)).toLowerCase()
Expand Down Expand Up @@ -146,6 +149,17 @@ export const DynamicBankAccountForm = forwardRef<{ handleSubmit: () => void }, D

setIsSubmitting(true)
try {
const existingAccount = savedAccounts.find(
(account) => account.identifier === (data.accountNumber.toLowerCase() || data.clabe.toLowerCase())
)

// Skip adding account if the account already exists for the logged in user
if (existingAccount) {
setSelectedBankAccount(existingAccount)
router.push(`/withdraw/${country}/bank`)
return
}

const isUs = country.toUpperCase() === 'USA'
const isMx = country.toUpperCase() === 'MX'
const isIban = isUs || isMx ? false : isIBANCountry(country)
Expand Down
Loading