Skip to content

Attempt to fix swap from native #515

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 1 commit into from
Oct 4, 2025
Merged

Attempt to fix swap from native #515

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 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 @@ -81,7 +81,9 @@ export const PayWithCryptoTab = ({ skipOnCloseCallback, isSwitchingChainRef }: P
chainId: chain
}

// Check if the target currency (what the item is priced in) is native
const isNativeToken = compareAddress(currencyAddress, zeroAddress)
// Check if the selected currency (what the user is paying with) is native
const isNativeTokenSelectedCurrency = compareAddress(selectedCurrency.address, zeroAddress)

const { data: tokenBalancesData, isLoading: tokenBalancesIsLoading } = useGetTokenBalancesSummary({
Expand Down Expand Up @@ -163,14 +165,14 @@ export const PayWithCryptoTab = ({ skipOnCloseCallback, isSwitchingChainRef }: P
address: currencyAddress as Hex,
args: [userAddress, approvedSpenderAddress || targetContractAddress],
query: {
enabled: !!userAddress && !isNativeTokenSelectedCurrency
enabled: !!userAddress && !isNativeToken
}
})

const isLoading =
isLoadingCoinPrice ||
isLoadingCurrencyInfo ||
(allowanceIsLoading && !isNativeTokenSelectedCurrency) ||
(allowanceIsLoading && !isNativeToken) ||
isLoadingSwapQuote ||
tokenBalancesIsLoading ||
isLoadingSelectedCurrencyInfo
Expand Down Expand Up @@ -352,7 +354,7 @@ export const PayWithCryptoTab = ({ skipOnCloseCallback, isSwitchingChainRef }: P
: {})
},
// Actual transaction optional approve step
...(isApproved || isNativeTokenSelectedCurrency
...(isApproved || isNativeToken
? []
: [
{
Expand Down