Commit Graph

5835 Commits

Author SHA1 Message Date
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
Matilda Landström
5770147af4 Merged in feat/LOY-501-table-sorting (pull request #3321)
feat(LOY-501): add sorting to Reward Night Table

* feat(LOY-501): add sorting using Tanstack Table


Approved-by: Chuma Mcphoy (We Ahead)
2025-12-11 14:08:01 +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
eb90c382b8 Merged in fix/remove-scandic-friends-robots-override (pull request #3322)
fix: remove /scandic-friends indexable override

* fix: remove /scandic-friends indexable override


Approved-by: Bianca Widstam
Approved-by: Anton Gunnarsson
2025-12-11 12:51:36 +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
fde77a06ce Merged in feature/redis-api-get-all-keys-endopoint (pull request #3306)
feature: Add getAllKeys endpoint

* feature: Add getAllKeys endpoint

* rename DELETE_BATCH_SIZE to SCAN_BATCH_SIZE


Approved-by: Anton Gunnarsson
2025-12-10 09:36:53 +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
Matilda Landström
359f034041 Merged in feat/Lokalise-fetch-9.12.25 (pull request #3318)
Fetch from Lokalise 9.12.25

* Fetch from Lokalise 9.12.25


Approved-by: Bianca Widstam
2025-12-09 10:16:44 +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
Linus Flood
276027045e Merged in fix/mypages-menu-loggedin-out (pull request #3316)
feat(menu): fix race condition on auth token/logged in/out

* feat(menu): fix race condition on auth token/logged in/out


Approved-by: Anton Gunnarsson
2025-12-08 14:56:52 +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
Emma Zettervall
f37f2a0f34 Merged in fix/LOY-376-compare-levels-show-wrong-benefits (pull request #3303)
fix(LOY-376): replaced index-based key with a stable key to prevent incorrect rerenders.

* fix(LOY-376): replaced index-based key with a stable key to prevent incorrect rerenders.


Approved-by: Anton Gunnarsson
Approved-by: Linus Flood
Approved-by: Matilda Landström
Approved-by: Chuma Mcphoy (We Ahead)
2025-12-08 13:56:27 +00:00
Bianca Widstam
c8a79641df Merged in fix/BOOK-658-remove-info-modal-prepaid-reward-night (pull request #3311)
fix(BOOK-658): show booking guaranteed if guaranteed, prepaid or reward night, and hide info icon for prepaid and reward night

* fix(BOOK-658): show booking guaranteed if guaranteed, prepaid or reward night, and hide info icon for prepaid and reward night


Approved-by: Anton Gunnarsson
2025-12-08 13:55:14 +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
177c2e7176 Merged in feature/ai-instructions (pull request #3293)
chore: add ai instruction files

* chore: add ai instruction files

* let the instruction file apply to all files, not only ts files


Approved-by: Linus Flood
2025-12-08 12:23:22 +00:00
Joakim Jäderberg
5236b1dc71 Merged in fix/preprod-watermark (pull request #3307)
fix: watermark in preprod incorrectly showed test

* fix: watermark in preprod incorrectly showed test


Approved-by: Matilda Landström
2025-12-08 11:28:17 +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
Linus Flood
3bd23bf56e Merged in feat/book-595-gla-tracking-fix (pull request #3294)
feat(BOOK-595): fixed correct tracking values and enter details pageview tracking

* feat(BOOK-595): fixed correct tracking values and enter details pageview tracking

* Fixed on SAS as well


Approved-by: Joakim Jäderberg
2025-12-05 08:01:48 +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)
2b9bc8c3ce Merged in feat/LOY-497-Flag-Profiling-Consent (pull request #3292)
refactor(LOY-497): hide profiling consent behind feature flag

* refactor(LOY-497): hide profiling consent behind feature flag

* chore(LOY-497): up to date consent readme


Approved-by: Matilda Landström
2025-12-05 05:47:11 +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
Anton Gunnarsson
d6623adf9f Merged in fix/next-security-patch (pull request #3291)
fix: Bump Next for security patch

* Bump next for security patch


Approved-by: Linus Flood
Approved-by: Chuma Mcphoy (We Ahead)
Approved-by: Matilda Landström
2025-12-04 09:56:06 +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
Chuma Mcphoy (We Ahead)
30b9d14fb0 Merged in feat/LOY-424-Sidepeek-Past-Stays (pull request #3270)
feat(LOY-424): Load More Past Stays via Sidepeek

* feat(LOY-424): Load More Past Stays via Sidepeek

* chore(LOY-424): use new section header

* fix(LOY-424): remove uneeded nextCursor check


Approved-by: Emma Zettervall
2025-12-03 15:19:25 +00:00
Bianca Widstam
c6fff09c73 Merged in fix/BOOK-529-terms-and-condititions (pull request #3289)
fix(BOOK-529): fix terms and conditions link

* fix(BOOK-529): fix terms and conditions link


Approved-by: Joakim Jäderberg
Approved-by: Matilda Landström
2025-12-03 14:38:31 +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
Joakim Jäderberg
60f4b8d878 Merged in fix/redis-api-package-mismatch (pull request #3278)
Fix/redis api package mismatch

* Migrate scandic-web

* Migrate partner-sas

* Enable any rule in partner-sas

* fix: redis-api package version mismatch

* Merge branch 'master' of bitbucket.org:scandic-swap/web into fix/redis-api-package-mismatch


Approved-by: Anton Gunnarsson
2025-12-03 09:54:30 +00:00
Joakim Jäderberg
a016e18e4a Merged in feature/SW-3539-log-number-of-logins (pull request #3284)
feat(SW-3539): count number of logins

* feat(SW-3539): count number of logins


Approved-by: Anton Gunnarsson
2025-12-03 09:50:59 +00:00
Joakim Jäderberg
99497488f3 Merged in chore/ignore-e2e-tests-in-ci (pull request #3285)
chore: ignore e2e tests when running yarn test

* chore: ignore e2e tests when running yarn test
2025-12-03 08:52:08 +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
Joakim Jäderberg
22d00bb363 Merged in feature/add-login-test-2 (pull request #3261)
e2e tests for my pages

* feature/add-e2e-tests-for-mypages

* remove unneccesary awaits


Approved-by: Linus Flood
2025-12-03 07:59:11 +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