Commit Graph

611 Commits

Author SHA1 Message Date
Anton Gunnarsson
de94c47f3f Merged in fix/sw-3667-not-enough-points (pull request #3337)
fix(SW-3667): Remove conditional on Scandic user token

* Remove conditional on Scandic user token


Approved-by: Joakim Jäderberg
2025-12-12 09:34:07 +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
Bianca Widstam
7d021f8e40 Merged in fix/storybook-error (pull request #3336)
fix: storybook error remove slash

* fix: storybook error remove slash


Approved-by: Erik Tiekstra
Approved-by: Matilda Landström
2025-12-12 08:52:42 +00:00
Matilda Landström
c051474ffc Merged in fix/LOY-519-handle-null-identifier (pull request #3329)
fix(LOY-519): handle null values on icon identifier

* fix(LOY-519): handle null values on icon identifier


Approved-by: Erik Tiekstra
2025-12-12 07:37:43 +00:00
Erik Tiekstra
0597b09c08 Feat/BOOK-257 videoplayer with card
* feat(BOOK-257): Added VideoPlayer with card component
* feat(BOOK-257): Added queries and component for VideoCard block to Content and Collection pages
* fix(BOOK-257): Only setting object-fit: cover on the video if it is not fullscreen
* feat(BOOK-257): Added queries and component for VideoCard block to Startpage
* feat(BOOK-257): Added queries and component for Video block to content/collection/start page

Approved-by: Chuma Mcphoy (We Ahead)
2025-12-12 06:34:32 +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
Erik Tiekstra
f06e466827 Feat/BOOK-240 hero video
Approved-by: Chuma Mcphoy (We Ahead)
Approved-by: Christel Westerberg
2025-12-11 08:35:27 +00:00
Christel Westerberg
cd8b30f2ec 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
2025-12-11 07:29:36 +00:00
Matilda Landström
5bcbc23732 Merged in feat/LOY-419-highlight-promo-campaigns (pull request #3308)
feat(LOY-419): add promo campaigns to Campaign Overview Page

* feat(LOY-419): add promo campaigns as top campaign and all campaigns

* refactor(LOY-419)


Approved-by: Chuma Mcphoy (We Ahead)
2025-12-10 12:29:23 +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
Chuma Mcphoy (We Ahead)
f40035baa9 Merged in LOY-493/Sidepeek-upcoming-stays (pull request #3315)
LOY-493/Sidepeek upcoming stays

* chore(LOY-493): Add icon to next stay card cta

* chore(LOY-493): better folder org for stays

* chore(LOY-494): more folder reorg

* feat(LOY-493): Implement Sidepeek for Upcoming Stays


Approved-by: Matilda Landström
2025-12-09 10:54:57 +00:00
Matilda Landström
8764945b2f Merged in fix/LOY-430-filter-old-campaigns (pull request #3317)
fix(LOY-430): don't show inactive campaigns

* fix(LOY-430): don't show inactive campaigns


Approved-by: Chuma Mcphoy (We Ahead)
2025-12-09 10:51:23 +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
Rasmus Langvad
ca6cc5ab6c Merged in feat/SW-3636-storybook-structure (pull request #3309)
feat(SW-3636): Storybook structure

* New sections in Storybook sidebar

* Group Storybook content files and add token files for spacing, border radius and shadows


Approved-by: Joakim Jäderberg
2025-12-08 12:35:14 +00:00
Joakim Jäderberg
8b94540d19 Merged in chore/redirect-counter (pull request #3302)
Counter name is now searchable and add counter for redirects

* refactor: createCounter() only takes one argument, the name of the counter. Makes it easier to search for

* feat: add counter when we do a redirect from redirect-service


Approved-by: Linus Flood
2025-12-08 10:24:05 +00:00
Rasmus Langvad
edca33c49f Merged in feat/SW-3655-input-component (pull request #3296)
feat: (SW-3655) new Input and FormInput components

* First version new Input and FormInput components

* Handle aria-describedby with react-aria instead of manually add it

* Update breaking unit and stories tests

* Merge branch 'master' into feat/SW-3655-input-component

* Update example form

* Merge branch 'master' into feat/SW-3655-input-component

* New lock file


Approved-by: Linus Flood
2025-12-08 08:51:03 +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 Landström
5986828580 Merged in feat/LOY-430-reward-nights (pull request #3295)
Feat/LOY-430 reward nights

* chore(LOY-430): add reward nights request and dynamic content

* chore(LOY-430): fix Reward Night component

* Refactor: use existing endpoint and add rewardNight data to that response instead


Approved-by: Linus Flood
2025-12-08 07:44:58 +00:00
Chuma Mcphoy (We Ahead)
9d8399b7c7 Merged in refactor/LOY-495-hook-for-sidepeek-scrolling (pull request #3297)
refactor(LOY-495): create useSidePeekScrollToTop hook

* refactor(LOY-495): create useSidePeekScrollToTop hook

* fix(LOY-495):  Read ref fresh each time


Approved-by: Emma Zettervall
2025-12-05 13:51:10 +00:00
Christel Westerberg
001000a56d Merged in fix/STAY-131-hide-ancillaries (pull request #3299)
fix: fix logic for identifying single use ancillaries

* fix: fix logic for identifying single use ancillaries

* fix: filter out empty categories of ancillaries


Approved-by: Erik Tiekstra
2025-12-05 12:25:12 +00:00
Erik Tiekstra
a9c1a91134 fix(BOOK-599): Filtering on correct values for hotel pages now and added comments
Approved-by: Matilda Landström
2025-12-05 06:31:17 +00:00
Chuma Mcphoy (We Ahead)
aae5c4d33d Merged in feat/LOY-495-Stays-Sidepeek-Scroll-to-Top (pull request #3279)
Feat/LOY-495 Scroll to Top Functionality in Previous Stays Sidepeek

* feat(LOY-495): enable scroll to top functionality for past stays sidepeek


Approved-by: Emma Zettervall
Approved-by: Matilda Landström
2025-12-05 05:41:02 +00:00
Chuma Mcphoy (We Ahead)
2738cbae7d Merged in fix/add-years-to-get-days-until-text-util (pull request #3281)
fix: add years to getDaysUntilText + confirmation number in upcoming stay card

* fix: add years to getDaysUntilText + confirmation number in upcoming stay card


Approved-by: Erik Tiekstra
Approved-by: Matilda Landström
2025-12-04 09:46:53 +00:00
Linus Flood
aba7e7f9eb Merged in fix/book-639-startpage-cache (pull request #3288)
feat(BOOK-639): add all block types on startpage to refs cache key

* feat(BOOK-639): add all block types on startpage to refs cache key


Approved-by: Erik Tiekstra
Approved-by: Matilda Landström
2025-12-04 09:17:28 +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
e459eb17f4 Merged in fix/BOOK-529-new-icon (pull request #3290)
Fix/BOOK-529 new icon

* fix(BOOK-529): add new icon, remove scroll again

* fix(BOOK-529): remove divider when no saved card


Approved-by: Joakim Jäderberg
2025-12-04 07:46:20 +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
Erik Tiekstra
6730575f7a feat(BOOK-113): Synced hover/focus states for buttons and added better examples to storybook
* fix(BOOK-113): Updated hover colors after blend/mix has been removed

Approved-by: Christel Westerberg
2025-12-03 10:45:34 +00:00
Matilda Landström
f19d5fa083 Merged in fix/handle-unpublished-profiling-consent (pull request #3275)
fix: handle unpublished profiling consent

* fix: handle unpublished profiling consent


Approved-by: Emma Zettervall
Approved-by: Chuma Mcphoy (We Ahead)
2025-12-03 08:41:33 +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
a6b3904b2a fix(BOOK-146): Synced default Sidepeek and SelfControlled Sidepeek in regards of functionality and looks
Approved-by: Bianca Widstam
2025-12-03 07:45:43 +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
Emma Zettervall
34526bbaf1 Merged in fix/LOY-400-make-contentstack-data-optional (pull request #3266)
fix(LOY-400): made contentstack data optional so the whole page does not crash if it's empty.

* fix(LOY-400): made contentstack data optional so the whole page does not crash if it's empty.

* Merged in fix/LOY-400-make-contentstack-data-optional-2 (pull request #3269)

Fix/LOY-400 make contentstack data optional 2

* Test

* .

* Correct ref tag

* refactor

* Correct key

* fix(LOY-400): cleaned up


Approved-by: Linus Flood
Approved-by: Matilda Landström
2025-12-02 08:08:12 +00:00
Erik Tiekstra
84593438e6 feat(BOOK-257): Added VideoPlayer component
Approved-by: Christel Westerberg
Approved-by: Bianca Widstam
2025-12-02 07:35:38 +00:00
Linus Flood
b1ccabb0b6 Merged in fix/redis-delete (pull request #3271)
feat(redis): include git hash when deleting without fuzzy

* feat(redis): include git hash when deleting without fuzzy

* Refactor


Approved-by: Joakim Jäderberg
2025-12-02 07:02:52 +00:00
Erik Tiekstra
8f7e4b8d06 fix(BOOK-622): Removed blending step for hover colors and respect original values from design system instead
Approved-by: Linus Flood
2025-12-02 06:24:59 +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
Joakim Jäderberg
3ec78b4fab refactor: update error handling and logging for improved error details display 2025-12-01 13:00:44 +01:00
Joakim Jäderberg
f6a807758e Merged in chore/remove-enrichHotel-call (pull request #3244)
Chore/remove enrichHotel call

* chore: remove enrichHotel api call

* include cityId when errors happen

* remove unused funciton and cleanup code

* tests no longer expect us to have called a function that is not used

* remove commented code


Approved-by: Linus Flood
2025-12-01 07:49:59 +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
Christel Westerberg
69f194f7bf Merged in fix/handle-single-ancillaries (pull request #3231)
Fix(STAY-128): Handle single ancillaries

* fix: refactor ancillaries flow

* fix: add logic to determine if an ancillary requires quantity

* fix: breakout ancillary description to its own component

* fix: cleanup

* fix: cleanup


Approved-by: Bianca Widstam
Approved-by: Erik Tiekstra
2025-11-28 15:02:45 +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
Matilda Landström
22dd2f60fe Merged in feat/LOY-431-profile-v2 (pull request #3202)
Feat/LOY-431: Switch to V2 of Profile endpoint

* feat(LOY-431): switch to v2 of profile endpoint

* feat(LOY-431): use CreditCard

* feat(LOY-431): remove hotelinformation from friendTransaction schema

* chore(LOY-431): add hotel data request to transactions

* fix(LOY-431): use v1 of friendTransactions


Approved-by: Linus Flood
Approved-by: Erik Tiekstra
Approved-by: Anton Gunnarsson
2025-11-28 13:58:06 +00:00