Commit Graph

5350 Commits

Author SHA1 Message Date
Joakim Jäderberg
f77520cd04 Merged in chore/remove-unused-useRoomContext (pull request #2747)
chore: delete unused useRoomContext

* chore: delete unused useRoomContext

* merge


Approved-by: Matilda Landström
2025-09-02 11:58:37 +00:00
Erik Tiekstra
52e900bad8 fix(SW-3383): Less strict string validation for header external links
Approved-by: Matilda Landström
2025-09-02 08:39:56 +00:00
Matilda Landström
89d16c71ff Merged in feat/SW-3364-destination-list (pull request #2744)
feat(SW-3364): update destination list

* feat(SW-3364): update destination list


Approved-by: Erik Tiekstra
2025-09-02 08:36:41 +00:00
Hrishikesh Vaipurkar
0a4bf40a15 Merged in chore/SW-3321-move-selectratecontext-to- (pull request #2729)
chore(SW-3321): Moved Select rate context to booking-flow package

* chore(SW-3321): Moved Select rate context to booking-flow package

* chore(SW-3321): Optimised code


Approved-by: Joakim Jäderberg
2025-09-02 07:40:01 +00:00
Hrishikesh Vaipurkar
1804f7b7cd Merged in chore/SW-3356-move-textarea-from-tempds-to-ds (pull request #2745)
chore(SW-3356): Moved TextArea to design system

* chore(SW-3356): Moved TextArea to design system


Approved-by: Joakim Jäderberg
2025-09-02 07:39:20 +00:00
Anton Gunnarsson
ecd567f54f Merged in feat/sw3370-move-phone-utils (pull request #2743)
feat(SW-3370): Move phone utils to common

* Move phone utils to common

* Update lock file


Approved-by: Joakim Jäderberg
2025-09-02 06:53:58 +00:00
Anton Gunnarsson
65c6bc4c59 Merged in feat/sw-3369-move-loadingspinner (pull request #2742)
feat(SW-3369): Move LoadingSpinner to design-system

* Move LoadingSpinner to design-system


Approved-by: Joakim Jäderberg
2025-09-02 06:46:58 +00:00
Chuma Mcphoy (We Ahead)
914871607d Merged in feat/LOY-315-Membership-Status-Card (pull request #2712)
Feat(LOY-315): Membership Overview Card

* fix(LOY-315): new divider variants

* feat(LOY-315): Add MembershipOverviewCard

* refactor(LOY-315): abstract sasbooststatus

* fix(LOY-315): correct space vars

* fix(LOY-315): date formatting fixes


Approved-by: Erik Tiekstra
2025-09-01 13:42:50 +00:00
Anton Gunnarsson
9e3294b113 Merged in chore/move-bookingwidget-to-parallel-route (pull request #2738)
chore: Render partner-sas BookingWidget in parallel route

* Render BookingWidget in parallel route


Approved-by: Joakim Jäderberg
2025-09-01 12:46:42 +00:00
Anton Gunnarsson
1673006169 Merged in chore/set-branch-env-in-partner-sas (pull request #2737)
chore: Add BRANCH and GIT_SHA to partner-sas

* Add BRANCH and GIT_SHA to next config env setup


Approved-by: Bianca Widstam
2025-09-01 09:05:32 +00:00
Anton Gunnarsson
87402a2092 Merged in feat/sw-2873-move-selecthotel-to-booking-flow (pull request #2727)
feat(SW-2873): Move select-hotel to booking flow

* crude setup of select-hotel in partner-sas

* wip

* Fix linting

* restructure tracking files

* Remove dependency on trpc in tracking hooks

* Move pageview tracking to common

* Fix some lint and import issues

* Add AlternativeHotelsPage

* Add SelectHotelMapPage

* Add AlternativeHotelsMapPage

* remove next dependency in tracking store

* Remove dependency on react in tracking hooks

* move isSameBooking to booking-flow

* Inject searchParamsComparator into tracking store

* Move useTrackHardNavigation to common

* Move useTrackSoftNavigation to common

* Add TrackingSDK to partner-sas

* call serverclient in layout

* Remove unused css

* Update types

* Move HotelPin type

* Fix todos

* Merge branch 'master' into feat/sw-2873-move-selecthotel-to-booking-flow

* Merge branch 'master' into feat/sw-2873-move-selecthotel-to-booking-flow

* Fix component


Approved-by: Joakim Jäderberg
2025-09-01 08:37:00 +00:00
Matilda Landström
93a90bef9d Merged in feat/SW-2038-static-map-button (pull request #2715)
feat(SW-2038): refactor and create wrapper for static map and button

* feat(SW-2038): refactor and create wrapper for static map and button

* feature: use button from design-system over creating a new one

* remove unused fragment

* fix(SW-2038): add removed css

* fix(SW-2038): update fake button component

* fix(SW-2038): move FakeButton to design system


Approved-by: Erik Tiekstra
Approved-by: Joakim Jäderberg
2025-09-01 08:16:27 +00:00
Erik Tiekstra
19063da08a feat(SW-3040): Sorting hotel listing when all hotels from a city/country are chosen
Approved-by: Matilda Landström
2025-09-01 07:52:53 +00:00
Erik Tiekstra
ec66a5647a feat(SW-3173): Added support for one or two columns for the list inside the RTE
Approved-by: Matilda Landström
2025-09-01 07:52:32 +00:00
Bianca Widstam
c7f00aca4d Merged in fix/SW-2844-fix-gap-mobile-menu (pull request #2732)
* fix(SW-2844): remove gap mobile safari


Approved-by: Joakim Jäderberg
Approved-by: Hrishikesh Vaipurkar
2025-09-01 07:28:48 +00:00
Matilda Landström
fbfd62b239 Merged in fix/SW-3328-campaign-page-fix (pull request #2726)
Fix/SW-3328 campaign page design fix

* fix(SW-3328): align essentials text

* fix(SW-3328): campaign page design fix

* fix(SW-3328): update hero width

* fix(SW-3328): change burgundy code text


Approved-by: Erik Tiekstra
2025-08-29 13:55:15 +00:00
Erik Tiekstra
92cb3f3663 fix(SW-3307): Filtered out duplicate facilities from hotel response
Approved-by: Matilda Landström
2025-08-29 13:00:25 +00:00
Joakim Jäderberg
a0fa238b27 Merged in fix/left-align-ameneties (pull request #2734)
* left align sho all ameneties
2025-08-29 11:48:40 +00:00
Joakim Jäderberg
2a9313362f Merged in feature/SW-3327-move-hotel-info-card-to-design-system (pull request #2730)
Feature/SW-3327 move hotel info card to design system

* wip

* wip

* wip

* wip moving hotelinfocard

* add controls for HotelInfoCard in storybook

* merge


Approved-by: Anton Gunnarsson
2025-08-29 10:09:48 +00:00
Joakim Jäderberg
a0580de52f Merged in redirect-update-2025-08-29 (pull request #2733)
* rerun update


Approved-by: Anton Gunnarsson
2025-08-29 09:47:05 +00:00
Bianca Widstam
bd9e250ac9 Merged in fix/SW-2363-mobile-align-add-calendar-button (pull request #2728)
fix(SW-2363): align calendar and manage booking button in confirmation page

* fix(SW-2363): align calendar and manage booking button in confirmation page


Approved-by: Matilda Landström
2025-08-28 14:15:18 +00:00
Erik Tiekstra
2e655619d1 feat(SW-3121): Added support for campaign text inside the hero of campaign pages
* fix: making sure the cacheKey for getHotelsByHotelIds is not sorting the original array

Approved-by: Matilda Landström
2025-08-28 13:46:48 +00:00
Bianca Widstam
8a53e97e5f Merged in fix/SW-3325-hotelcard-mobile-show-alert-left-align (pull request #2725)
fix(SW-3325): show alert in hotel card mobile and left align text

* fix(SW-3325): show alert in hotel card mobile and left align text


Approved-by: Joakim Jäderberg
2025-08-28 12:04:43 +00:00
Joakim Jäderberg
784c353b1e Merged in update-redirects-2025-08-28 (pull request #2723)
* update redirects
* format redirect-json to allow new lines

Approved-by: Bianca Widstam
2025-08-28 11:52:32 +00:00
Bianca Widstam
5af320eb92 Merged in localize/sync (pull request #2722)
Localize/sync

* sync/localize

* localize


Approved-by: Anton Gunnarsson
2025-08-28 09:15:04 +00:00
Joakim Jäderberg
13e1594b2a Merged in fix/SW-3308-hotelcard-disappears-to-early (pull request #2704)
revert: delay marking a hotel card as non-hovered

* fix: delay marking a hotel card as non-hovered


Approved-by: Hrishikesh Vaipurkar
2025-08-28 08:27:11 +00:00
Bianca Widstam
0e00e8eaf1 Merged in fix/SW-3021-vouchers (pull request #2719)
fix(SW-3021): add pluralization support for vouchers

* fix(SW-3021): add pluralization support for vouchers


Approved-by: Anton Gunnarsson
2025-08-28 08:27:03 +00:00
Erik Tiekstra
997f928f2b fix(SW-3028): Using hero heading instead of heading for campaign hero on hotel pages
Approved-by: Matilda Landström
2025-08-28 08:12:52 +00:00
Erik Tiekstra
fd48f86c90 feat/SW-3108 external links
* feat(SW-3108): Added external link options to shortcuts
* feat(SW-3108): Added external link options to header

Approved-by: Matilda Landström
2025-08-28 07:25:17 +00:00
Erik Tiekstra
1a10afdbad fix(SW-3305): Added preamble to carousel cards block
Approved-by: Matilda Landström
Approved-by: Chuma Mcphoy (We Ahead)
2025-08-28 07:22:07 +00:00
Hrishikesh Vaipurkar
56db65d49a Merged in bug/SW-3319-tracking-remove-duplicate-webview (pull request #2711)
fix(SW-3319): Removed duplicate webview key in pagename and sitesections

* fix(SW-3319): Removed duplicate webview key in pagename and sitesections


Approved-by: Erik Tiekstra
Approved-by: Matilda Landström
2025-08-28 06:49:12 +00:00
Matilda Landström
cfaee8f123 Merged in feat/SW-3276-hotel-page-phone-number (pull request #2703)
feat(SW-3276): update hotel page intro section

* feat(SW-3276): update hotel page intro section

* fix(SW-3276): update Link component


Approved-by: Erik Tiekstra
2025-08-28 06:30:32 +00:00
Joakim Jäderberg
4ed1cd1843 Merged in fix/storybook-static-folder (pull request #2718)
Storybook Avatar: Use images from public folder

* make sure we import files from the correct folder


Approved-by: Chuma Mcphoy (We Ahead)
2025-08-27 14:09:10 +00:00
Joakim Jäderberg
72f4f72a17 Merged in SW-3317-move-toast-to-design-system (pull request #2716)
SW-3317 move toast to design system

* chore: Move toast to design-system and add interaction tests

* Move toast to design-system and add storybook tests

* Merge branch 'master' of bitbucket.org:scandic-swap/web into SW-3317-move-toast-to-design-system

* merge

* move sonner dependency to @scandic-hotels/design-system


Approved-by: Anton Gunnarsson
2025-08-27 13:03:17 +00:00
Bianca Widstam
34135879a8 Merged in fix/SW-3289-open-side-peek-from-side-mobile (pull request #2717)
fix(SW-3289): sidepeek opens from side on mobile

* fix(SW-3289): sidepeek opens from side on mobile


Approved-by: Anton Gunnarsson
2025-08-27 12:38:29 +00:00
Anton Gunnarsson
e4a66499e5 Merged in feat/sw-3322-move-base-tracking-to-common (pull request #2713)
feat(SW-3322): Move base tracking to common package

* Move base tracking to common package

* Update lock file


Approved-by: Joakim Jäderberg
2025-08-27 12:29:46 +00:00
Joakim Jäderberg
45a8fd8c43 Merged in fix/linting-booking-flow (pull request #2709)
Fix/linting booking flow

* fix import issues and add lint check no-extraneous-dependencies
* fix use type HotelType instead of string
* add no-extraneous-dependencies lint check to booking-flow

Approved-by: Anton Gunnarsson
2025-08-27 12:02:37 +00:00
Joakim Jäderberg
80c3327419 Merged in fix/linting (pull request #2708)
Fix/linting

* fix import issues and add lint check no-extraneous-dependencies
* fix use type HotelType instead of string

Approved-by: Anton Gunnarsson
2025-08-27 09:22:37 +00:00
Hrishikesh Vaipurkar
67bdf5bbcf Merged in chore/SW-3298-move-sidepeekselfcontrolled- (pull request #2710)
chore(SW-3298): Moved SidePeekSelfControlled to design system

* chore(SW-3298): Moved SidePeekSelfControlled to design system


Approved-by: Anton Gunnarsson
2025-08-26 14:29:54 +00:00
Bianca Widstam
5f8d77e54a Merged in fix/SW-1655-tripadvisor-icon-map (pull request #2695)
fix(SW-1655): update design tripadvisor on hotel map card

* fix(SW-1655): update design tripadvisor on hotel map card

* fix(SW-1655): update radius

* fix(SW-1655): use tripadvisor chip, create different variants

* fix(SW-1655): update variants, storybook, and global css


Approved-by: Joakim Jäderberg
2025-08-26 13:08:28 +00:00
Bianca Widstam
4d4c90b800 Merged in fix/SW-3283-select-rate-booking-code (pull request #2699)
fix(SW-3283): add booking code when selecting rate and reset state when removing booking code

* fix(SW-3283): add booking code when selecting rate and reset state when removing booking code

* feat: add removeBookingCode action to SelectRateContext

* fix(SW-3283): add booking code when selecting rate and reset state when removing booking code

* fix(SW-3283): merge


Approved-by: Joakim Jäderberg
2025-08-26 13:03:46 +00:00
Anton Gunnarsson
c53e6ef187 Merged in chore/move-use-scroll-to-top (pull request #2705)
chore: Move useScrollToTop to common package

* Move useScrollToTop to common package


Approved-by: Joakim Jäderberg
2025-08-26 11:48:54 +00:00
Erik Tiekstra
4c3ddea5c0 fix(SW-2143): Fixed layout issues on destination pages, also fixed background colors
Approved-by: Matilda Landström
2025-08-26 11:38:15 +00:00
Matilda Landström
7e9ecdd6c5 Merged in fix/zod-validation (pull request #2706)
fix: make strings nullable

* fix: make strings nullable


Approved-by: Erik Tiekstra
2025-08-26 11:27:07 +00:00
Hrishikesh Vaipurkar
44fce176e9 Merged in chore/SW-3246-move-alert-to-design-system (pull request #2698)
chore(SW-3246): Moved Alert component into design system

* chore(SW-3246): Moved Alert component into design system

* chore(SW-3246): Optimsed code and imports

* chore(SW-3246): Moved type AlertTypeEnum and other to common package


Approved-by: Anton Gunnarsson
2025-08-26 11:22:38 +00:00
Matilda Landström
4c9605ef3f Merged in fix/SW-2528 (pull request #2688)
fix(SW-2528): get correct restaurant type

* fix(SW-2528): get correct type


Approved-by: Erik Tiekstra
2025-08-26 06:38:40 +00:00
Erik Tiekstra
8180271b0f fix(SW-3203): Added property id to pointOfInterestSchema to handle identical names
Approved-by: Matilda Landström
Approved-by: Chuma Mcphoy (We Ahead)
2025-08-26 05:58:25 +00:00
Erik Tiekstra
091c46f85c feat(SW-1558): Added link to static map on hotel pages
Approved-by: Matilda Landström
2025-08-26 05:58:01 +00:00
Chuma Mcphoy (We Ahead)
7561e996c6 Merged in feat/LOY-311-New-Avatar-Component (pull request #2694)
Feat(LOY-311) Create avatar design system component

* feat(LOY-311): Creat & use New Avatar Design System Component

* refactor(LOY-311): replace avatar used in app header with design system component

* fix(LOY-311): use correct space vars


Approved-by: Erik Tiekstra
2025-08-25 14:41:50 +00:00
Bianca Widstam
87f597ae1a Merged in fix/SW-3303-campaign-rate-naming (pull request #2702)
fix(SW-3303): campaign rate should have ratedefinition title

* fix(SW-3303): campaign rate should have ratedefinition title


Approved-by: Matilda Landström
2025-08-25 13:23:44 +00:00