Skip to content

Add 90 secs timeout for Manteca payments #1527

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

Open
Zishan-7 wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Add 90 secs timeout for Manteca payments #1527

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
26 changes: 19 additions & 7 deletions src/app/(mobile-ui)/qr-pay/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,12 +678,20 @@ export default function QRPayPage() {
paymasterVerificationGasLimit: signedUserOpData.signedUserOp.paymasterVerificationGasLimit,
paymasterPostOpGasLimit: signedUserOpData.signedUserOp.paymasterPostOpGasLimit,
}
const qrPayment = await mantecaApi.completeQrPaymentWithSignedTx({
paymentLockCode: finalPaymentLock.code,
signedUserOp,
chainId: signedUserOpData.chainId,
entryPointAddress: signedUserOpData.entryPointAddress,
})
const QR_PAYMENT_TIMEOUT_MS = 90_000
const timeoutPromise = new Promise<never>((_, reject) =>
setTimeout(() => reject(new Error('timeout')), QR_PAYMENT_TIMEOUT_MS)
)

const qrPayment = await Promise.race([
mantecaApi.completeQrPaymentWithSignedTx({
paymentLockCode: finalPaymentLock.code,
signedUserOp,
chainId: signedUserOpData.chainId,
entryPointAddress: signedUserOpData.entryPointAddress,
}),
timeoutPromise,
])
// clear the timer since we got a response
if (payingStateTimerRef.current) {
clearTimeout(payingStateTimerRef.current)
Expand All @@ -701,7 +709,11 @@ export default function QRPayPage() {
const errorMsg = (error as Error).message || 'Could not complete payment'

// Handle specific error cases
if (errorMsg.toLowerCase().includes('nonce')) {
if (errorMsg.toLowerCase().includes('timeout')) {
setErrorMessage(
'Could not complete payment. Please scan the QR code again. If problem persists contact support'
)
} else if (errorMsg.toLowerCase().includes('nonce')) {
setErrorMessage(
'Transaction failed due to account state change. Please try again. If the problem persists, contact support.'
)
Expand Down
Loading