Commit Graph

1805 Commits

Author SHA1 Message Date
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
Christel Westerberg
b563a83f10 Merged in fix/STAY-132 (pull request #3283)
fix: align guarantee info button and text to the right regardless of breakpoint

* fix: align guarantee info button and text to the right regardless of breakpoint


Approved-by: Erik Tiekstra
2025-12-03 07:16:51 +00:00
Anton Gunnarsson
d6ed81d90b Merged in fix/sw-3648-fix-hero-gradient (pull request #3277)
fix(SW-3648): Correct hero gradient colors

* Fix hero gradient colors


Approved-by: Linus Flood
2025-12-02 12:28:25 +00:00
Anton Gunnarsson
7c247d7100 Merged in fix/sw-3645-mobile-menu-overlap (pull request #3260)
fix(SW-3645): Use same close button for mobile menus

* Use same close button for mobile menus


Approved-by: Linus Flood
2025-12-02 12:27:57 +00:00
Anton Gunnarsson
5da3e457cb Merged in chore/migrate-from-next-lint (pull request #3263)
chore: Migrate from next lint to eslint

* Migrate scandic-web

* Migrate partner-sas

* Enable any rule in partner-sas


Approved-by: Joakim Jäderberg
Approved-by: Linus Flood
2025-12-02 10:08:56 +00:00
Anton Gunnarsson
be28982e73 Merged in fix/sw-3650-prevent-line-break-in-user-menu (pull request #3274)
fix(SW-3650): Prevent line break in user menu

* Add nowrap to points container


Approved-by: Linus Flood
Approved-by: Matilda Landström
2025-12-02 10:08:47 +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
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
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
Chuma Mcphoy (We Ahead)
48700ffe8f Merged in fix/LOY-298-stays-content (pull request #3256)
fix(LOY-298): empty stays text

* fix(LOY-298): empty stays text


Approved-by: Emma Zettervall
Approved-by: Matilda Landström
2025-12-01 08:32:09 +00:00
Linus Flood
3e7e0b1d7d Merged in feat/lokalise-sync-011225 (pull request #3258)
feat(lokalise): sync 1/12

* feat(lokalise): sync 1/12
2025-12-01 08:14:23 +00: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
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
Christel Westerberg
870512a7ab Merged in fix/STAY-4-late-cancellations (pull request #3247)
fix: show cancellation message for non cancellable flex booking

* fix: show cancellation message for non cancellable flex booking


Approved-by: Chuma Mcphoy (We Ahead)
2025-11-28 14:32:51 +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
Matilda Landström
c29b724317 Merged in refactor/small-cleanup (pull request #3252)
fix: some cleanup

* fix: some cleanup


Approved-by: Emma Zettervall
2025-11-28 13:57:30 +00:00
Joakim Jäderberg
9294f0958b Merged in feat/SW-3639-autologin-sas (pull request #3245)
Feat/SW-3639 autologin sas

* wip

* cleanup

* remove commented code and default lang to EN


Approved-by: Anton Gunnarsson
2025-11-28 13:00:42 +00:00
Joakim Jäderberg
3a6abb73c2 Merged in fix/align-react-versions (pull request #3250)
fix: align react versions

* fix: align react versions


Approved-by: Anton Gunnarsson
2025-11-28 10:03:29 +00:00
Christel Westerberg
6b64cb00d6 Merged in fix/correct-rooms-rebook (pull request #3238)
fix(STAY-130): Make sure we pass correct amount of rooms to rebook url

* fix: Make sure we pass correct amount of rooms to rebook url


Approved-by: Erik Tiekstra
Approved-by: Anton Gunnarsson
Approved-by: Matilda Landström
2025-11-28 09:35:00 +00:00
Linus Flood
9bcb9e8232 Merged in feat/book-623-bw-lang (pull request #3248)
feat(BOOK-623): pass correct lang to booking widget and fix some more error logs

* feat(BOOK-623): pass correct lang to booking widget and fix some more error logs


Approved-by: Joakim Jäderberg
2025-11-28 08:59:39 +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
Bianca Widstam
5ac7e5deac Merged in fix/hotjar-suppress (pull request #3211)
Fix/hotjar suppress

* fix(hotjar): suppress personal info on my pages

* fix(hotjar): suppress more data


Approved-by: Linus Flood
2025-11-27 13:09:37 +00:00
Linus Flood
a2c517db2c Merged in fix/hotel-branding-env (pull request #3239)
Fix/hotel branding env

* feat(env): removed hotel branding env variable

* .


Approved-by: Erik Tiekstra
Approved-by: Anton Gunnarsson
Approved-by: Matilda Landström
2025-11-27 13:08:42 +00:00
Matilda Landström
86e15a58c6 Merged in lokalise-profiling-consent (pull request #3242)
chore: fetch from Lokalise

* chore: fetch from Lokalise

* fix: change to correct label


Approved-by: Linus Flood
2025-11-27 12:52:32 +00:00
Matilda Landström
9ad9e374e8 Merged in fix/LOY-398-fix-language-select (pull request #3227)
fix(LOY-398): fix language select by creating FormSelect wrapper

* fix(LOY-398): fix language select by creating FormSelect wrapper


Approved-by: Erik Tiekstra
Approved-by: Anton Gunnarsson
2025-11-27 12:06:46 +00:00
Hrishikesh Vaipurkar
9937dfd002 Merged in fix/BOOK-408-alt-text-needs-to-be-updated- (pull request #3220)
* fix(BOOK-408): Updated logo aria label
* fix(BOOK-408): Added title for links opening in new tab
* fix(BOOK-408): Added translations handling for title

Approved-by: Anton Gunnarsson
Approved-by: Matilda Landström
2025-11-27 09:40:38 +00:00
Matilda Landström
1dabd3cdc7 Merged in chore/Lokalise-update-20251127 (pull request #3241)
chore: fetch from Lokalise

* chore: fetch from Lokalise


Approved-by: Linus Flood
2025-11-27 08:34:18 +00:00
Matilda Landström
b122f2ff4f Merged in feat/LOY-490-cleanup-profiling-consent (pull request #3237)
Feat/LOY-490 cleanup profiling consent

* chore(LOY-490): cleanup accordion

* xhore(LOY-490): cleanup signup

* fix(LOY-490): use correct tokens

* fi(LOY-490): change button to correct color

* fix(LOY-490): switch deprecated Link


Approved-by: Chuma Mcphoy (We Ahead)
2025-11-27 07:48:34 +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
6ac8267c31 fix(BOOK-204): Added dynamic h1 to startpage
Approved-by: Christel Westerberg
2025-11-26 14:26:11 +00:00
Joakim Jäderberg
4174d43e16 Merged in fix/logging-warmup-background (pull request #3232)
Fix/logging warmup background

* fix: logging in background functions

* fix logging

* fix logging

* fix logging


Approved-by: Linus Flood
2025-11-26 12:21:42 +00:00
Matilda Landström
26f3b5bdd0 Merged in feat/LOY-484-consent-alert (pull request #3184)
feat(LOY-484): Change toast to alert for Profiling Consent

* feat(LOY-484): change toast to alert using context

* refactor(LOY-484): remove uneccesary code

* chore(LOY-484): small UI fixes


Approved-by: Chuma Mcphoy (We Ahead)
2025-11-26 12:13:04 +00:00
Matilda Landström
086319e8b1 Merged in feat/LOY-486-consent-prompt-date (pull request #3221)
Feat/LOY-486 consent prompt date

* chore(LOY-486): update name on date

* chore(LOY-486): open links in new tab

* chore(LOY-486): send prompt date + refactor modal

* chore(LOY-486): update README


Approved-by: Chuma Mcphoy (We Ahead)
2025-11-26 12:11:57 +00:00
Linus Flood
f70c431a5e Merged in fix/sentry-imports (pull request #3228)
feat(sentry): changed imports so they work in netlify functions

* feat(sentry): changed imports so they work in netlify functions


Approved-by: Joakim Jäderberg
2025-11-26 10:06:59 +00:00
Linus Flood
a2d9010c8f Merged in fix/redis-onerror (pull request #3218)
feat(BOOK-603): better logging and delete with unlinke intead of del

* feat(BOOK-603): better logging and delete with unlinke intead of del


Approved-by: Joakim Jäderberg
2025-11-26 09:36:38 +00:00
Erik Tiekstra
a3e4c85ec0 fix(BOOK-476): Footer headings are now h2 instead of h3
Approved-by: Matilda Landström
2025-11-25 13:29:21 +00:00
Erik Tiekstra
e84f2f55ac fix(BOOK-558): Fixed issue where city is not prefilled inside the booking widget
Approved-by: Matilda Landström
2025-11-25 13:29:02 +00:00
Joakim Jäderberg
c3381e8100 Merged in feat/redis-fix (pull request #3209)
Feat/redis fix

* feat(redis): delete multiple keys in one partition scan

* fix(BOOK-603): make it possible to do multiple deletes in redis at once using one partition scan

* filter out invalid keys

* fix: if no valid keys are present return early

* .

* fix: do redis deletes after scanning through all keys

* fix: do redis deletes after scanning through all keys


Approved-by: Linus Flood
2025-11-25 10:19:19 +00:00
Christel Westerberg
2ae3fcb609 Merged in fix/STAY-17-find-my-booking-errors (pull request #3181)
fix: improve error messages in find my booking flow

* fix: improve error messages in find my booking flow


Approved-by: Linus Flood
Approved-by: Erik Tiekstra
2025-11-24 14:46:39 +00:00
Erik Tiekstra
2346daec25 feat(BOOK-577): Added chatbot functionality for SE
Approved-by: Bianca Widstam
2025-11-24 14:18:35 +00:00
Erik Tiekstra
091c1c3780 fix(BOOK-468): Added inert attribute to SidePeekSEO element to ignore tab navigation and screen readers
Approved-by: Linus Flood
2025-11-24 14:12:10 +00:00
Erik Tiekstra
acb50eb75e fix(BOOK-579): Fixed Marski logo color and Nearby text color
Approved-by: Bianca Widstam
2025-11-24 13:58:09 +00:00