Merged in fix/STAY-133 (pull request #3313)

Fix/STAY-133

* fix: Add static summary buttons row on add ancillary flow

* fix: refactor handling of modals

* fix: refactor file structure for add ancillary flow

* Merged in chore/replace-deprecated-body (pull request #3300)

Replace deprecated <Body> with <Typography>

* chore: replace deprecated body component

* refactor: replace Body component with Typography across various components

* merge

Approved-by: Bianca Widstam
Approved-by: Matilda Landström


Approved-by: Bianca Widstam
Approved-by: Matilda Landström
This commit is contained in:
Christel Westerberg
2025-12-11 07:29:36 +00:00
parent 5bcbc23732
commit cd8b30f2ec
35 changed files with 208 additions and 214 deletions

View File

@@ -9,8 +9,7 @@ import { Carousel } from "@/components/Carousel"
import { useAncillaries } from "@/hooks/useAncillaries"
import { AddAncillaryProvider } from "@/providers/AddAncillaryProvider"
import AddAncillaryFlowModal from "./AddAncillaryFlow/AddAncillaryFlowModal"
import AncillaryFlowModalWrapper from "./AddAncillaryFlow/AncillaryFlowModalWrapper"
import AddAncillaryFlow from "./AddAncillaryFlow"
import { AddedAncillaries } from "./AddedAncillaries"
import AllAncillariesModal from "./AllAncillariesModal"
import WrappedAncillaryCard from "./Card"
@@ -92,15 +91,12 @@ export function Ancillaries({
booking={bookedRoom}
ancillaries={ancillaries.allUnique}
/>
<AncillaryFlowModalWrapper>
<AddAncillaryFlowModal
user={user}
booking={bookedRoom}
packages={packages}
savedCreditCards={savedCreditCards}
/>
</AncillaryFlowModalWrapper>
<AddAncillaryFlow
user={user}
booking={bookedRoom}
packages={packages}
savedCreditCards={savedCreditCards}
/>
</div>
</AddAncillaryProvider>
)