From d0e2bd5c8de68f6519a0fc0b0072bb35b3f86770 Mon Sep 17 00:00:00 2001 From: Tobias Johansson Date: Thu, 6 Feb 2025 08:09:15 +0000 Subject: [PATCH] Merged in fix/booking-status-retry-and-timeout (pull request #1258) fix: increase retry for getting booking status and dont show spinner if timeout occurs * fix: increase retry for getting booking status and dont show spinner if timeout occurrs Approved-by: Arvid Norlin --- .../HotelReservation/EnterDetails/Payment/PaymentClient.tsx | 6 ++++-- hooks/booking/useHandleBookingStatus.ts | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/components/HotelReservation/EnterDetails/Payment/PaymentClient.tsx b/components/HotelReservation/EnterDetails/Payment/PaymentClient.tsx index 385294521..ca8d67171 100644 --- a/components/HotelReservation/EnterDetails/Payment/PaymentClient.tsx +++ b/components/HotelReservation/EnterDetails/Payment/PaymentClient.tsx @@ -44,7 +44,7 @@ import styles from "./payment.module.css" import { RoomPackageCodeEnum } from "@/types/components/hotelReservation/selectRate/roomFilter" import type { PaymentClientProps } from "@/types/components/hotelReservation/selectRate/section" -const maxRetries = 4 +const maxRetries = 15 const retryInterval = 2000 export const formId = "submit-booking" @@ -309,7 +309,9 @@ export default function PaymentClient({ if ( initiateBooking.isPending || - (isPollingForBookingStatus && !bookingStatus.data?.paymentUrl) + (isPollingForBookingStatus && + !bookingStatus.data?.paymentUrl && + !bookingStatus.isTimeout) ) { return } diff --git a/hooks/booking/useHandleBookingStatus.ts b/hooks/booking/useHandleBookingStatus.ts index b816d5797..4f12176d6 100644 --- a/hooks/booking/useHandleBookingStatus.ts +++ b/hooks/booking/useHandleBookingStatus.ts @@ -2,9 +2,10 @@ import { useRef } from "react" -import { BookingStatusEnum } from "@/constants/booking" import { trpc } from "@/lib/trpc/client" +import type { BookingStatusEnum } from "@/constants/booking" + export function useHandleBookingStatus({ confirmationNumber, expectedStatus,