Skip to content

Fix balance check skipping for free items in checkout #567

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
taylanpince merged 2 commits into from
Dec 3, 2025
Merged

Fix balance check skipping for free items in checkout #567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4ff192
skip balance and swap route queries for free items
AlexanderKolberg Dec 2, 2025
416b7dd
fix insufficient balance check to skip validation for free items
AlexanderKolberg Dec 2, 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
10 changes: 5 additions & 5 deletions packages/checkout/src/views/Checkout/PaymentMethodSelect/PayWithCrypto/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export const PayWithCryptoTab = ({ skipOnCloseCallback, isSwitchingChainRef }: P
onSuccessChecker
} = selectPaymentSettings

const isFree = Number(price) == 0
const isFree = BigInt(price) === 0n

const network = findSupportedNetwork(chain)
const chainId = network?.chainId || 137
Expand Down Expand Up @@ -204,16 +204,16 @@ export const PayWithCryptoTab = ({ skipOnCloseCallback, isSwitchingChainRef }: P
compareAddress(balance.contractAddress, selectedCurrency.address)
)

const isInsufficientBalance =
tokenBalance === undefined ||
(tokenBalance?.balance && tokenBalance.balance !== '' && BigInt(tokenBalance.balance) < BigInt(selectedCurrencyPrice))
const userBalance = BigInt(tokenBalance?.balance || '0')
const requiredBalance = BigInt(selectedCurrencyPrice)
const isInsufficientBalance = !isFree && userBalance < requiredBalance

useInitialBalanceCheck({
userAddress: userAddress || '',
buyCurrencyAddress,
price,
chainId,
isInsufficientBalance: isInsufficientBalance as boolean,
isInsufficientBalance,
tokenBalancesIsLoading
})

Expand Down
5 changes: 3 additions & 2 deletions .../checkout/src/views/Checkout/PaymentMethodSelect/PayWithCrypto/useInitialBalanceCheck.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export const useInitialBalanceCheck = ({
isInsufficientBalance,
tokenBalancesIsLoading
}: UseInitialBalanceCheckArgs) => {
const isFree = BigInt(price) === 0n
const { navigation, setNavigation } = useNavigationCheckout()

const isInitialBalanceChecked = (navigation.params as PaymentMethodSelectionParams).isInitialBalanceChecked
Expand All @@ -42,7 +43,7 @@ export const useInitialBalanceCheck = ({
chainId: chainId
},
{
disabled: isInitialBalanceChecked || !isInsufficientBalance
disabled: isInitialBalanceChecked || !isInsufficientBalance || isFree
}
)

Expand All @@ -65,7 +66,7 @@ export const useInitialBalanceCheck = ({
omitMetadata: true
},
{
disabled: isInitialBalanceChecked || !isInsufficientBalance || swapRoutesIsLoading
disabled: isInitialBalanceChecked || !isInsufficientBalance || swapRoutesIsLoading || isFree
}
)

Expand Down