Merge branch 'develop' into feat/SW-185-implement-footer-navigation

# Conflicts:
#	app/[lang]/(live)/layout.tsx
#	components/Icons/get-icon-by-icon-name.ts
#	types/components/icon.ts

types/components/bookingWidget/index.ts

@@ -1,5 +1,5 @@
 import { z } from "zod"
 
-import { bookingWidgetSchema } from "@/components/BookingWidget/schema"
+import { bookingWidgetSchema } from "@/components/Forms/BookingWidget/schema"
 
 export type BookingWidgetSchema = z.output<typeof bookingWidgetSchema>

types/components/icon.ts

@@ -16,10 +16,12 @@ export enum IconName {
   Camera = "Camera",
   Cellphone = "Cellphone",
   Check = "Check",
+  CrossCircle = "CrossCircle",
   CheckCircle = "CheckCircle",
   ChevronDown = "ChevronDown",
   ChevronRight = "ChevronRight",
   Close = "Close",
+  CloseLarge = "CloseLarge",
   Coffee = "Coffee",
   Concierge = "Concierge",
   DoorOpen = "DoorOpen",
@@ -42,6 +44,8 @@ export enum IconName {
   PlusCircle = "PlusCircle",
   Restaurant = "Restaurant",
   Tripadvisor = "Tripadvisor",
+  Sauna = "Sauna",
   TshirtWash = "TshirtWash",
   Wifi = "Wifi",
+  WarningTriangle = "WarningTriangle",
 }

types/components/myPages/myPage/earnAndBurn.ts

@@ -1,4 +1,4 @@
-import { awardPointsVariants } from "@/components/MyPages/Blocks/Points/EarnAndBurn/Desktop/Row/awardPointsVariants"
+import { awardPointsVariants } from "@/components/MyPages/Blocks/Points/EarnAndBurn/JourneyTable/Desktop/Row/awardPointsVariants"
 
 import type { VariantProps } from "class-variance-authority"
 
@@ -10,9 +10,9 @@ export type TransactionResponse = Awaited<
 >
 export type TransactionsNonNullResponseObject = NonNullable<TransactionResponse>
 export type Transactions =
-  NonNullable<TransactionsNonNullResponseObject>["data"]
+  NonNullable<TransactionsNonNullResponseObject>["data"]["transactions"]
 export type Transaction =
-  NonNullable<TransactionsNonNullResponseObject>["data"][number]
+  NonNullable<TransactionsNonNullResponseObject>["data"]["transactions"][number]
 
 export type ClientEarnAndBurnProps = {
   initialData: TransactionsNonNullResponseObject
@@ -31,6 +31,19 @@ export interface RowProps {
   transaction: Transaction
 }
 
+export interface PaginationProps {
+  pageCount: number
+  isFetching: boolean
+  handlePageChange: (page: number) => void
+  currentPage: number
+}
+
+export interface PaginationButtonProps {
+  disabled: boolean
+  isActive?: boolean
+  handleClick: () => void
+}
+
 export interface AwardPointsProps extends Pick<Transaction, "awardPoints"> {}
 
 export interface AwardPointsVariantProps

types/components/myPages/myProfile/addCreditCardButton.ts

@@ -0,0 +1,3 @@
+export type AddCreditCardButtonProps = {
+  redirectUrl: string
+}