Skip to content

[ISSUE-252] refactor(cashout): use ValidatedInput for account number #484

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
merged 2 commits into from
Oct 25, 2024
Merged

[ISSUE-252] refactor(cashout): use ValidatedInput for account number #484

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32aa7b3
refactor(cashout): use ValidatedInput for account number
jjramirezn Oct 25, 2024
2f2722f
refactor(cashout): rename accountNumber to bankAccountNumber
jjramirezn Oct 25, 2024
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
170 changes: 53 additions & 117 deletions src/components/Cashout/Components/Initial.view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import TokenAmountInput from '@/components/Global/TokenAmountInput'
import TokenSelector from '@/components/Global/TokenSelector/TokenSelector'
import ValidatedInput from '@/components/Global/ValidatedInput'
import { useAccount } from 'wagmi'
import { useWeb3Modal } from '@web3modal/wagmi/react'
import { useState, useContext, useEffect, useMemo } from 'react'
Expand All @@ -13,10 +14,9 @@ import { useAuth } from '@/context/authContext'
import { useCreateLink } from '@/components/Create/useCreateLink'
import { Icon as ChakraIcon } from '@chakra-ui/react'
import * as assets from '@/assets'
import * as utils from '@/utils'
import { formatIban, validateBankAccount } from '@/utils'
import { FAQComponent } from './Faq.comp'
import { RecipientInfoComponent } from './RecipientInfo.comp'
import { motion, AnimatePresence } from 'framer-motion'
import Icon from '@/components/Global/Icon'
import { twMerge } from 'tailwind-merge'
import { MAX_CASHOUT_LIMIT, MIN_CASHOUT_LIMIT } from '@/components/Offramp/Offramp.consts'
Expand Down Expand Up @@ -61,6 +61,9 @@ export const InitialCashoutView = ({
const [_tokenValue, _setTokenValue] = useState<string | undefined>(
inputDenomination === 'TOKEN' ? tokenValue : usdValue
)
const [bankAccountNumber, setBankAccountNumber] = useState<string>('')
const [isValidBankAccountNumber, setIsValidBankAccountNumber] = useState<boolean>(false)
const [isValidatingBankAccountNumber, setIsValidatingBankAccountNumber] = useState<boolean>(false)

const { prepareCreateLinkWrapper } = useCreateLink()

Expand All @@ -71,10 +74,6 @@ export const InitialCashoutView = ({
open()
}

const [selectedBankAccount, setSelectedBankAccount] = useState<string | undefined>(undefined)
const [newBankAccount, setNewBankAccount] = useState<string>('')
const [activeInput, setActiveInput] = useState<'newBankAccount' | 'selectedBankAccount'>()

const isBelowMinLimit = useMemo(() => {
return !usdValue || parseFloat(usdValue) < MIN_CASHOUT_LIMIT
}, [usdValue])
Expand All @@ -86,36 +85,32 @@ export const InitialCashoutView = ({
const isDisabled = useMemo(() => {
return (
!_tokenValue ||
(!selectedBankAccount && !newBankAccount) ||
!isValidBankAccountNumber ||
isValidatingBankAccountNumber ||
!xchainAllowed ||
!!isBelowMinLimit ||
!!isExceedingMaxLimit
)
}, [_tokenValue, selectedBankAccount, newBankAccount, xchainAllowed, isBelowMinLimit, isExceedingMaxLimit])
}, [
_tokenValue,
isValidBankAccountNumber,
isValidatingBankAccountNumber,
xchainAllowed,
isBelowMinLimit,
isExceedingMaxLimit,
])
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: booleans like these variables usually don't need useMemo, you're not getting any performance improvement. Also it includes potential bugs if you're missing a variable in the dependency array the the compute is broken


const handleOnNext = async (_inputValue?: string) => {
setLoadingState('Loading')
setErrorState({ showError: false, errorMessage: '' })
try {
if (!selectedBankAccount && !newBankAccount) {
if (!bankAccountNumber) {
setErrorState({ showError: true, errorMessage: 'Please select a bank account.' })
setLoadingState('Idle')
return
}
if (!_tokenValue) return

const recipientBankAccount = selectedBankAccount || newBankAccount

const validAccount = await utils.validateBankAccount(recipientBankAccount)
if (!validAccount) {
console.error('Invalid bank account')
setErrorState({
showError: true,
errorMessage: 'Invalid bank account. Please make sure your account is supported',
})
return
}

if (!user) {
await fetchUser()
}
Expand All @@ -132,7 +127,7 @@ export const InitialCashoutView = ({
'Content-Type': 'application/json',
},
body: JSON.stringify({
accountIdentifier: recipientBankAccount,
accountIdentifier: bankAccountNumber,
}),
})

Expand All @@ -151,21 +146,21 @@ export const InitialCashoutView = ({
name: '',
email: '',
password: '',
recipient: recipientBankAccount,
recipient: bankAccountNumber,
})
setInitialKYCStep(0)
} else {
setOfframpForm({
email: user?.user?.email ?? '',
name: user?.user?.full_name ?? '',
recipient: recipientBankAccount,
recipient: bankAccountNumber,
password: '',
})
if (user?.user.kycStatus == 'verified') {
const account = user.accounts.find(
(account: any) =>
account.account_identifier.replaceAll(/\s/g, '').toLowerCase() ===
recipientBankAccount.replaceAll(/\s/g, '').toLowerCase()
bankAccountNumber.replaceAll(/\s/g, '').toLowerCase()
)

if (account) {
Expand Down Expand Up @@ -194,20 +189,6 @@ export const InitialCashoutView = ({
}
}

const [showNewBankAccount, setShowNewBankAccount] = useState(true)

useEffect(() => {
setShowNewBankAccount(!selectedBankAccount)
}, [selectedBankAccount])

useEffect(() => {
if (activeInput === 'newBankAccount') {
setSelectedBankAccount(undefined)
} else if (activeInput === 'selectedBankAccount') {
setNewBankAccount('')
}
}, [newBankAccount, selectedBankAccount])

useEffect(() => {
if (!_tokenValue) return
if (inputDenomination === 'TOKEN') {
Expand Down Expand Up @@ -281,35 +262,30 @@ export const InitialCashoutView = ({
key={index}
className={twMerge(
'flex w-full items-center justify-between border border-black p-2',
selectedBankAccount === account.account_identifier
bankAccountNumber === account.account_identifier
? 'bg-purple-1'
: 'hover:bg-gray-100',
xchainAllowed && 'cursor-pointer',
!xchainAllowed && 'opacity-60'
)}
onClick={() => {
if (!xchainAllowed) return
if (selectedBankAccount === account.account_identifier) {
setSelectedBankAccount(undefined)
} else {
setSelectedBankAccount(account.account_identifier)
setActiveInput('selectedBankAccount')
}
setBankAccountNumber(account.account_identifier)
}}
>
<div className="flex flex-grow items-center">
<Icon name={'bank'} className="mr-2 h-4 fill-gray-1" />
<label htmlFor={`bank-${index}`} className="text-right">
{utils.formatIban(account.account_identifier)}
{formatIban(account.account_identifier)}
</label>
</div>
<div className="flex w-6 justify-center">
{selectedBankAccount === account.account_identifier && (
{bankAccountNumber === account.account_identifier && (
<button
className="text-lg text-black"
onClick={(e) => {
e.stopPropagation()
setSelectedBankAccount(undefined)
setBankAccountNumber('')
}}
>
✕
Expand All @@ -320,75 +296,35 @@ export const InitialCashoutView = ({
))}
</div>
)}
<AnimatePresence>
{showNewBankAccount && (
<motion.div
initial={{ opacity: 0, height: 0 }}
animate={{ opacity: 1, height: 'auto' }}
exit={{ opacity: 0, height: 0 }}
transition={{ duration: 0.3 }}
className="flex w-full flex-col items-start justify-center gap-2 overflow-hidden"
>
<label className="text-left text-h8 font-light">
{user && user.accounts.length > 0
? 'Cash out to a new bank account:'
: 'Cash out to a bank account:'}
</label>
<div
className={twMerge(
'flex w-full border border-black p-2',
xchainAllowed && 'cursor-pointer',
!xchainAllowed && 'opacity-60'
)}
>
<label className="ml-2 text-right">To:</label>
<input
type="text"
className={twMerge(
!xchainAllowed && 'bg-transparent',
'ml-2 w-full border-none outline-none'
)}
placeholder="IBAN / US account number"
value={newBankAccount}
onChange={(e) => setNewBankAccount(e.target.value)}
onFocus={() => setActiveInput('newBankAccount')}
spellCheck="false"
autoComplete="iban"
disabled={!xchainAllowed}
/>
</div>
</motion.div>
)}
</AnimatePresence>
</>
) : (
<div className="flex w-full flex-col items-start justify-center gap-2">
<label className="text-left text-h8 font-light">Cash out to a bank account:</label>
<div
className={twMerge(
'flex w-full border border-black p-2',
xchainAllowed && 'cursor-pointer',
!xchainAllowed && 'opacity-60'
)}
>
<label className="ml-2 text-right">To:</label>
<input
type="text"
className={twMerge(
!xchainAllowed && 'bg-transparent',
'ml-2 w-full border-none outline-none'
)}
placeholder="IBAN / US account number"
value={newBankAccount}
onChange={(e) => setNewBankAccount(e.target.value)}
onFocus={() => setActiveInput('newBankAccount')}
spellCheck="false"
autoComplete="iban"
disabled={!xchainAllowed}
/>
</div>
</div>
)}
) : null}
<div className="flex w-full flex-col items-start justify-center gap-2">
<label className="text-left text-h8 font-light">Cash out to a bank account:</label>
<ValidatedInput
placeholder="IBAN / US account number"
label="To"
value={bankAccountNumber}
debounceTime={750}
validate={validateBankAccount}
onUpdate={({ value, isValid, isChanging }) => {
setBankAccountNumber(value)
setIsValidBankAccountNumber(isValid)
setIsValidatingBankAccountNumber(isChanging)
if (!isChanging && value && !isValid) {
setErrorState({
showError: true,
errorMessage:
'Invalid bank account. Please make sure your account is supported',
})
} else {
setErrorState({
showError: false,
errorMessage: '',
})
}
}}
/>
</div>
</div>
</div>
</div>
Expand Down