Commit Graph

206 Commits

Author SHA1 Message Date
Bianca Widstam
68c1b3dc50 Merged in chore/BOOK-708-replace-title-component (pull request #3414)
Chore/BOOK-708 replace title component

* chore(BOOK-708): replace title with typography

* chore(BOOK-708): replace title with typography

* chore(BOOK-708): remove Title from package.json


Approved-by: Linus Flood
Approved-by: Anton Gunnarsson
2026-01-12 07:54:59 +00:00
Bianca Widstam
1b9273136a Merged in chore/BOOK-701-replace-subtitle-component (pull request #3398)
chore(BOOK-701): replace subtitle with typography

* chore(BOOK-701): replace subtitle with typography

* chore(BOOK-701): align center

* chore(BOOK-701): change token

* chore(BOOK-701): change text color

* fix(BOOK-704): revert pricechange dialog changes

* chore(BOOK-701): remove subtitle from package.json


Approved-by: Matilda Landström
2026-01-12 07:40:30 +00:00
Linus Flood
cd59102ef4 Merged in feat/svg-instead-of-fonts (pull request #3411)
feat(SW-3695): use svg icons instead of font icons

* feat(icons): use svg instead of font icons

* feat(icons): use webpack/svgr for inlined svgs. Now support for isFilled again

* Merge master

* Remove old font icon


Approved-by: Joakim Jäderberg
2026-01-09 13:14:09 +00:00
Bianca Widstam
6e700cc3d4 Merged in feat/BOOK-693-tracking-member-price (pull request #3403)
feat(BOOK-693): add tracking for memberprice and join

* feat(BOOK-693): add tracking for memberprice and join


Approved-by: Erik Tiekstra
2026-01-09 08:40:22 +00:00
Rasmus Langvad
4980cc830d Merged in feat/3685-new-textarea-component (pull request #3392)
feat(SW-3685): Add new TextArea and FormTextArea components

* Add new TextArea and FormTextArea components

* Update example form with description

* Merge branch 'master' into feat/3685-new-textarea-component

* Formatting new files with new prettier config

* Added custom controls for the text area story


Approved-by: Linus Flood
2026-01-07 17:04:30 +00:00
Rasmus Langvad
d0546926a9 Merged in fix/3697-prettier-configs (pull request #3396)
fix(SW-3691): Setup one prettier config for whole repo

* Setup prettierrc in root and remove other configs


Approved-by: Joakim Jäderberg
Approved-by: Linus Flood
2026-01-07 12:45:50 +00:00
Bianca Widstam
932413412b Merged in fix/BOOK-700-skeleton-misaligned-select-hotel (pull request #3391)
fix(BOOK-700): skeleton styling disoriented on select hotel

* fix(BOOK-700): skeleton styling disoriented on select hotel


Approved-by: Joakim Jäderberg
Approved-by: Linus Flood
2026-01-07 11:20:51 +00:00
Matilda Landström
d23137a69d Merged in fix(BOOK-659)-multiroom-name-check (pull request #3385)
fix(BOOK-659): use unique ids for multiroom booking input fields

* fix(BOOK-659): use unique ids for multiroom booking input fields


Approved-by: Bianca Widstam
Approved-by: Linus Flood
2026-01-05 11:20:20 +00:00
Matilda Landström
15626d49af Merged in fix(BOOK-659)-multiroom-name-check (pull request #3384)
fix(BOOK-659): trim names for multiroom booking

* fix(BOOK-659): trim names for multiroom booking


Approved-by: Matilda Haneling
2025-12-30 10:02:36 +00:00
Matilda Landström
54d9534d62 Merged in feat/BOOK-691-children-label (pull request #3380)
feat/BOOK-691-update-children-label

* feat/BOOK-691-update-children-label


Approved-by: Matilda Haneling
2025-12-29 09:01:40 +00:00
Matilda Landström
a061808b2a Merged in fix/BOOK-343-disable-clear-preferences (pull request #3369)
fix(BOOK-343): disable clear if no active preferences

* fix(BOOK-343): disable clear if no active preferences


Approved-by: Bianca Widstam
2025-12-23 09:04:35 +00:00
Bianca Widstam
57d0e1b27b Merged in fix/BOOK-662-handle-overlapping-dates-timezone (pull request #3319)
Fix/BOOK-662 handle overlapping dates timezone

* fix(BOOK-662): handle overlapping dates alerts

* fix(BOOK-662): handle overlapping dates alerts

* fix(BOOK-662): add test same dates


Approved-by: Anton Gunnarsson
2025-12-19 14:03:30 +00:00
Erik Tiekstra
3f632e6031 Merged in fix/BOOK-293-button-variants (pull request #3371)
fix(BOOK-293): changed variants and props on IconButton component

* fix(BOOK-293): changed variants and props on IconButton component

* fix(BOOK-293): inherit color for icon


Approved-by: Bianca Widstam
Approved-by: Christel Westerberg
2025-12-19 12:32:52 +00:00
Matilda Landström
2197ab2137 Merged in feat/BOOK-334-booking-widget-ui (pull request #3366)
fix/BOOK-334-booking-widget-tablet-fix

* fix/BOOK-334-booking-widget-tablet-fix


Approved-by: Anton Gunnarsson
2025-12-19 11:41:04 +00:00
Bianca Widstam
96b4e5a254 Merged in fix/BOOK-584-strikethrough-regulare-price (pull request #3374)
fix(BOOK-584): multiple nights did not show strikethrough price, wrong calculation for regular price per stay

* fix(BOOK-548): multiple nights did not show strikethrough price, wrong calculation for regular price per stay

* fix(BOOK-584): fix test, regularPrice first compare with pricePerStay


Approved-by: Anton Gunnarsson
2025-12-19 08:19:19 +00:00
Rasmus Langvad
b9a62b5280 Merged in feat/use-new-input-component (pull request #3324)
feat(SW-3659): Use new input component

* Use new input component

* Update error formatter

* Merged master into feat/use-new-input-component

* Merged master into feat/use-new-input-component

* Merge branch 'master' into feat/use-new-input-component

* Merged master into feat/use-new-input-component

* Update Input stories

* Merge branch 'feat/use-new-input-component' of bitbucket.org:scandic-swap/web into feat/use-new-input-component

* Update Storybook logo

* Add some new demo icon input story

* Fix the clear content button position

* Fix broken password input icon

* Merged master into feat/use-new-input-component

* Merged master into feat/use-new-input-component

* Add aria-hidden to required asterisk

* Merge branch 'feat/use-new-input-component' of bitbucket.org:scandic-swap/web into feat/use-new-input-component

* Merge branch 'master' into feat/use-new-input-component


Approved-by: Bianca Widstam
Approved-by: Matilda Landström
2025-12-18 15:42:09 +00:00
Christel Westerberg
6b08d5a113 Merged in fix/STAY-135 (pull request #3368)
Fix/STAY-135 & STAY-127

* fix: make quantity and delivery separate steps in mobile

* fix: update design for delivery step in ancillary flow

* fix: add error state for missing time

* fix: only allow points or cash payment for ancillaries

* fix: break out stepper to design system

* fix: update design of select quantity step in add ancillaries flow

* fix: add error states for quantity

* fix: handle insufficient points case

* fix: update stepper to include optional disabledMessage tooltip

* fix: handle validations

* fix: change name to camel case


Approved-by: Bianca Widstam
Approved-by: Chuma Mcphoy (We Ahead)
2025-12-18 13:31:43 +00:00
Anton Gunnarsson
6ee262ad89 Merged in chore/booking-flow-cleaning (pull request #3354)
chore: Clean booking-flow

* Clean booking-flow

* Fix type issue


Approved-by: Joakim Jäderberg
Approved-by: Linus Flood
2025-12-17 13:04:26 +00:00
Matilda Haneling
b8bc94acb3 Merged in fix/book-607-page-not-found-confirmation-page (pull request #3345)
* fix(BOOK-607): updated to read from base URL env and contentstack slug instead

* made url optional on interface

* added url to findBooking query

* added the correct (new) link in the confirmation header, add to calendar


Approved-by: Erik Tiekstra
2025-12-17 07:53:04 +00:00
Anton Gunnarsson
713ca6562e Merged in fix/book-674-select-hotel-infinite-loop (pull request #3351)
fix(BOOK-674): Refactor how we handle hotel filters

* Refactor hotel filters store to URL state

* Rename hotel filter store


Approved-by: Joakim Jäderberg
2025-12-15 13:58:00 +00:00
Christel Westerberg
5861f9a811 Merged in fix/STAY-133-modal-header (pull request #3330)
fix: adapt modal header to look like design

* fix: adapt modal header to look like design


Approved-by: Chuma Mcphoy (We Ahead)
Approved-by: Matilda Landström
2025-12-15 07:35:27 +00:00
Erik Tiekstra
4ec1e85d84 Feat/BOOK-293 button adjustments
* feat(BOOK-293): Adjusted padding of the buttons to match Figma design
* feat(BOOK-293): Updated variants for IconButton
* feat(BOOK-113): Updated focus indicators on buttons and added default focus ring color
* feat(BOOK-293): Replaced buttons inside booking widget

Approved-by: Christel Westerberg
2025-12-15 07:05:31 +00:00
Anton Gunnarsson
c153e0db50 Merged in chore/delete-unused-files (pull request #3346)
chore: Delete unused files

* Delete unused files

Ignore design-system for now


Approved-by: Joakim Jäderberg
2025-12-12 13:56:51 +00:00
Anton Gunnarsson
c14b804c03 Merged in chore/cleanup-package-exports (pull request #3344)
chore: Cleanup package exports

* Cleanup package exports


Approved-by: Matilda Landström
2025-12-12 13:56:42 +00:00
Anton Gunnarsson
3e3b15940f Merged in fix/booking-flow-eslint-fix (pull request #3342)
fix: Upgrade booking-flow eslint config

* Upgrade booking-flow eslint config


Approved-by: Bianca Widstam
2025-12-12 11:40:45 +00:00
Anton Gunnarsson
e5149846e5 Merged in chore/upgrade-to-next16 (pull request #3305)
chore(SW-3665): Upgrade to Next 16

* Upgrade partner-sas

* Upgrade scandic-web to next 16

* Update peerDep versions

* Fix revalidateTag

* Remove comment

* Merge branch 'master' into chore/upgrade-to-next16

* Update netlify adapter

* Build with webpack instead of turbopack

* Revert from proxy to middleware

* Merge branch 'master' into chore/upgrade-to-next16

* Revert proxy type

* Fix react types versions

* 16.0.9

* Bump to 16.0.10


Approved-by: Linus Flood
2025-12-12 09:17:15 +00:00
Anton Gunnarsson
7faa9933a2 Merged in feat/sw-3642-inject-sas-eb-payment (pull request #3243)
feat(SW-3642): Enable SAS EB payments

* Wip add SAS eb payment

* Add validate payment call

* Check booking status payment method to determine validation

* Clean up getPaymentData

* Fix PartnerPoints casing

* Add comment for validatePartnerPayment error handling

* Remove comment


Approved-by: Joakim Jäderberg
2025-12-11 13:23:12 +00:00
Joakim Jäderberg
7eb74ea239 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
2025-12-09 12:45:34 +00:00
Bianca Widstam
8682e66047 Merged in fix/BOOK-599-filter-alert-booking-flow (pull request #3314)
fix(BOOK-599): filter displayInBookingFlow alert

* fix(BOOK-599): filter displayInBookingFlow alert

* fix(BOOK-599): filter displayinbookingflow on confirmation page


Approved-by: Linus Flood
2025-12-08 15:00:41 +00:00
Bianca Widstam
200cf3f617 Merged in fix/BOOK-584-red-price-strikethrough (pull request #3298)
fix(BOOK-584): show discounted if specialrate or member

* fix(BOOK-584): show discounted if specialrate or member


Approved-by: Anton Gunnarsson
2025-12-08 14:23:44 +00:00
Anton Gunnarsson
914da2b094 Merged in chore/apply-lint-fix (pull request #3312)
chore: Apply lint:fix on booking-flow

* run lint:fix


Approved-by: Bianca Widstam
2025-12-08 13:50:41 +00:00
Joakim Jäderberg
de4b3c1c3c Merged in chore/eslint-curly-braces (pull request #3304)
Chore/eslint curly braces

* Add eslint rule for curly braces

* run eslint --fix for all files


Approved-by: Linus Flood
2025-12-08 07:56:21 +00:00
Matilda Haneling
9de9654bb0 Merged in fix/book-636-mobile-booking-widget-border-radius (pull request #3287)
fix(BOOK-636): updeted rounded corners and text align on mobile start page

* fix(BOOK-636): updeted rounded corners and text align on mobile start page


Approved-by: Erik Tiekstra
2025-12-04 08:07:58 +00:00
Bianca Widstam
7db225a3ee Merged in fix/BOOK-529-my-stay-guarantee (pull request #3282)
fix(BOOK-529): add card icon to payment cards, show scrollbar, add missing text

* fix(BOOK-529): add card icon to payment cards, show scrollbar, add missing text

* fix(BOOK-529): refactor savdecard

* fix(BOOK-529): fix lokaliseid

* fix(BOOK-529): paymentmethods


Approved-by: Joakim Jäderberg
2025-12-03 13:04:02 +00:00
Matilda Haneling
7acfde7b49 Merged in fix/hamburger-menu-freezes (pull request #3276)
fix(BOOK-613): pinned react aria compnents and aria overlays versions

* fix(BOOK-613): pinned react aria compnents and aria overlays versions


Approved-by: Linus Flood
2025-12-03 07:46:01 +00:00
Erik Tiekstra
c976079df1 fix(BOOK-469): Removed otherPaymentOptions on non mandatory GLA
Approved-by: Bianca Widstam
2025-12-03 07:42:31 +00:00
Bianca Widstam
c6d0223edb Merged in fix/BOOK-629-aria-label-social-media (pull request #3259)
fix(BOOK-629): add aria-label to social media on sidepeek

* fix(BOOK-629): add aria-label to social media on sidepeek

* fix(BOOK-629): add aria-label for social media


Approved-by: Erik Tiekstra
2025-12-02 13:21:14 +00:00
Bianca Widstam
07193a519c Merged in fix/BOOK-630-multiroom-select-rate (pull request #3272)
fix(BOOK-630): pinned nuqs version

* fix(BOOK-630): pinned nuqs version


Approved-by: Joakim Jäderberg
2025-12-02 08:15:05 +00:00
Matilda Haneling
3e4ac2c270 Merged in fix/book-510-fix-misaligned-flexbox (pull request #3268)
fix(BOOK-510): fixed misaligned flexbox for booking codes on Select Rate

* fix(BOOK-510): fixed misaligned flexbox for booking codes on Select Rate


Approved-by: Anton Gunnarsson
2025-12-01 14:07:04 +00:00
Joakim Jäderberg
f5dd6740d0 Merged in chore/upgrade-vitest4 (pull request #3253)
chore: upgrade to vitest@4

* chore: upgrade to vitest@4


Approved-by: Anton Gunnarsson
2025-12-01 12:41:12 +00:00
Bianca Widstam
77ac3628c1 Merged in fix/BOOK-99-focus-indicator-booking-widget (pull request #3254)
fix(BOOK-99): change border from 1px to 2px

* fix(BOOK-99): change border from 1px to 2px


Approved-by: Matilda Haneling
Approved-by: Erik Tiekstra
Approved-by: Matilda Landström
2025-12-01 07:10:00 +00:00
Emma Zettervall
f443bae46e Merged in feat/LOY-400-create-spend-points-modal (pull request #3131)
Feat/LOY-400 create spend points modal

* feat(LOY-400): Added custom button to my pages overview and skeleton file to custom modal for my points.

* feat(LOY-400): Added custom button to my pages overview and components for custom modal for my points.

* feat(LOY-400): Changed some style and infogridcardover

* feat(LOY-400):Removed custom card components and changed in infoCard: Added imagePosition top, added optional height prop. In Card: Changed Text-wrap styling, added min-width styling to buttons, added optional Icon prop, added optional height prop

* feat(LOY-400):Added linkList, LinkListItem component and messageBanner component. Added granola illustration.

* feat(LOY-400): Removed background in several illustrations. Added component for illustration. Fixed LinkedList and styling for UsePointsButton.

* feat(LOY-400): Added modal to PointsToSpendCard and fixed UsePointsButton.

* fix(LOY-400):added some styling

* feat(LOY-400): Linked Modal to contentstack and fetch the data in cards with UsePointsModal for now

* feat(LOY-400): changed link to aria-component, cleaned up a bit

* feat(LOY-400): Changed height for larger modals in mobile, fixed zod schema for no illustration input, cleaned up

* fix(LOY-400): fixed graphql after rebase

* fix(LOY-400): mini fix

* fix(LOY-400): fixed pr-comments

* fix(LOY-400): fixed some PR-comments

* fix(LOY-400): fixed a PR-comment

* feat(LOY-400): added size prop to ilustration in LinkListItem to be able to use illustrations in IllustrationByIconName

* fix(LOY-400): fixed pr-comments

* Merged in feat/LOY-402-pre-ticked-book-reward-night-in-booking-flow (pull request #3210)

Feat/LOY-402 pre ticked book reward night in booking flow

* feat(LOY-402): Changed UsePointsModal structure to handle button actions in card.

* feat(LOY-402): added functionality for book now button

* feat(LOY-400): pr comment fix

* feat(LOY-402): transformed the contentstack data

* fix(LOY-402): fixed pr comments

Approved-by: Chuma Mcphoy (We Ahead)
Approved-by: Anton Gunnarsson
Approved-by: Matilda Landström

* Merged in feat/LOY-404-add-tracking-for-spend-points-modal (pull request #3229)

Feat/LOY-404 add tracking for spend points modal

* feat(LOY-402): Changed UsePointsModal structure to handle button actions in card.

* feat(LOY-402): added functionality for book now button

* feat(LOY-400): pr comment fix

* feat(LOY-402): transformed the contentstack data

* feat(LOY-404): added tracking

* fix(LOY-404): fix for session storage removal of bookNowFromPointsModal

* feat(LOY-404): added consts

* fix(LOY-404): moved foxusWidget const

* fix(LOY-404): moved BOOKING_WIDGET_STATE const

* fix(LOY-404):fix


Approved-by: Matilda Landström

* fix(LOY-400): some fixes

* feat(LOY-400): created linkList storybook


Approved-by: Chuma Mcphoy (We Ahead)
Approved-by: Matilda Landström
2025-11-28 15:08:06 +00:00
Anton Gunnarsson
4eee1cff64 Merged in fix/sw-3643-mobile-booking-widget-label-color (pull request #3255)
fix(SW-3643): Update mobile booking widget label color

* Update mobile booking widget label color


Approved-by: Matilda Haneling
2025-11-28 14:59:53 +00:00
Bianca Widstam
46fa42750f Merged in feat/BOOK-529-update-GLA-design-mystay (pull request #3230)
Feat/BOOK-529 update GLA design mystay

* feat(BOOK-529): update gla design on my stay

* feat(BOOK-529): open gla modal if error

* feat(BOOK-529): add inline accordion to storybook

* feat(529): move errormessage below message

* feat(529): update infomodal

* feat(BOOK-529): update infomodal

* feat(BOOK-529): hide guarantee info for adding ancillaries if prepaid

* feat(BOOK-529): update width on info dialog

* feat(BOOK-529): fix alignment

* feat(BOOK-529): check if member price

* feat(BOOK-529): refactor msg

* feat(BOOK-529): refactor terms and conditions to own component

* feat(BOOK-529): clean up confirmation step


Approved-by: Christel Westerberg
2025-11-28 14:27:25 +00:00
Rasmus Langvad
c65091b36a Merged in feat/SW-3644-storybook-v10 (pull request #3240)
feat(SW-3644): Storybook v10

* Auto update to Storybook v10

* Add scandic theme and logo

* Update yarn.lock

* Update formatting of package.json

* Update vitest config and playwright plugin

* Remove vitest 4 update

* Re-added comment

* Update the Typography component to explicitly return React.ReactNode

* Add an explicit type assertion to the export

* Add an explicit type assertion to the export for Checkbox

* Explicit return type assertion

* Add an explicit type assertion to the export

* Update @types/react and fix ts warnings

* Updated typings


Approved-by: Linus Flood
Approved-by: Matilda Landström
2025-11-28 08:05:40 +00:00
Anton Gunnarsson
27b3f41bff Merged in feat/refactor-enter-details-price-calculation (pull request #3183)
feat: Refactor enter details price calculation

* Refactor getTotalPrice and child functions

* Move price calculations from helper file to specific file


Approved-by: Linus Flood
2025-11-27 13:44:45 +00:00
Anton Gunnarsson
c69993fa96 Merged in chore/refactor-paymentclient (pull request #3219)
chore: Refactor PaymentClient

* Extract function mustGuaranteeBooking

* Break apart PaymentClient


Approved-by: Joakim Jäderberg
2025-11-27 10:04:10 +00:00
Christel Westerberg
42b039c4ef Merged in fix/STAY-37-arrow-margin (pull request #3236)
Fix/STAY-37 arrow margin

* fix: mobile padding on button

* fix: remove deprecated button and fix border radius on booking widget button


Approved-by: Erik Tiekstra
2025-11-27 06:12:55 +00:00
Erik Tiekstra
931696de54 fix: Added padding to bottom sheet for tablet sized viewports
Approved-by: Christel Westerberg
Approved-by: Matilda Landström
2025-11-26 14:26:29 +00:00
Erik Tiekstra
b41aab56a6 feat(BOOK-101): Added functionality to show active map card when focus is within the hotel card
Approved-by: Bianca Widstam
2025-11-26 07:40:12 +00:00