Merge remote-tracking branch 'origin' into feature/tracking

components/HotelReservation/EnterDetails/Payment/PaymentCallback/index.tsx

@@ -8,7 +8,7 @@ import { detailsStorageName } from "@/stores/enter-details"
 import { createQueryParamsForEnterDetails } from "@/components/HotelReservation/SelectRate/RoomSelection/utils"
 import LoadingSpinner from "@/components/LoadingSpinner"
 
-import type { DetailsState } from "@/types/stores/enter-details"
+import type { PersistedState } from "@/types/stores/enter-details"
 
 export default function PaymentCallback({
   returnUrl,
@@ -23,12 +23,9 @@ export default function PaymentCallback({
     const bookingData = window.sessionStorage.getItem(detailsStorageName)
 
     if (bookingData) {
-      const detailsStorage: Record<
-        "state",
-        Pick<DetailsState, "booking">
-      > = JSON.parse(bookingData)
+      const detailsStorage: PersistedState = JSON.parse(bookingData)
       const searchParams = createQueryParamsForEnterDetails(
-        detailsStorage.state.booking,
+        detailsStorage.booking,
         searchObject
       )
 

components/HotelReservation/EnterDetails/Payment/PaymentClient.tsx

@@ -36,7 +36,7 @@ import { bedTypeMap } from "../../SelectRate/RoomSelection/utils"
 import PriceChangeDialog from "../PriceChangeDialog"
 import GuaranteeDetails from "./GuaranteeDetails"
 import PaymentOption from "./PaymentOption"
-import { PaymentFormData, paymentSchema } from "./schema"
+import { type PaymentFormData, paymentSchema } from "./schema"
 
 import styles from "./payment.module.css"
 
@@ -403,6 +403,9 @@ export default function PaymentClient({
           </section>
           <div className={styles.submitButton}>
             <Button
+              intent="primary"
+              theme="base"
+              size="small"
               type="submit"
               disabled={
                 !methods.formState.isValid || methods.formState.isSubmitting

components/HotelReservation/EnterDetails/Payment/PaymentOption/index.tsx

@@ -1,16 +1,19 @@
 import Image from "next/image"
 import { useFormContext } from "react-hook-form"
 
-import { PAYMENT_METHOD_ICONS, PaymentMethodEnum } from "@/constants/booking"
+import {
+  PAYMENT_METHOD_ICONS,
+  type PaymentMethodEnum,
+} from "@/constants/booking"
 
 import Body from "@/components/TempDesignSystem/Text/Body"
 import Caption from "@/components/TempDesignSystem/Text/Caption"
 import { trackUpdatePaymentMethod } from "@/utils/tracking"
 
-import { PaymentOptionProps } from "./paymentOption"
-
 import styles from "./paymentOption.module.css"
 
+import type { PaymentOptionProps } from "./paymentOption"
+
 export default function PaymentOption({
   name,
   value,

components/HotelReservation/EnterDetails/Payment/PaymentOption/paymentOption.ts

@@ -1,4 +1,4 @@
-import { RegisterOptions } from "react-hook-form"
+import type { RegisterOptions } from "react-hook-form"
 
 export interface PaymentOptionProps {
   name: string

components/HotelReservation/EnterDetails/Payment/index.tsx

@@ -2,7 +2,7 @@ import { getSavedPaymentCardsSafely } from "@/lib/trpc/memoizedRequests"
 
 import PaymentClient from "./PaymentClient"
 
-import { PaymentProps } from "@/types/components/hotelReservation/selectRate/section"
+import type { PaymentProps } from "@/types/components/hotelReservation/selectRate/section"
 
 export default async function Payment({
   user,