Commit Graph

5126 Commits

Author SHA1 Message Date
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
Bianca Widstam
42c7fb8510 Merged in fix/SW-3289-sidepeek-cta-hotel (pull request #2697)
fix(SW-3289): add cta to sidepeek hotel

* fix(SW-3289): add cta to sidepeek hotel

* fix(SW-3289): add cta hotel card


Approved-by: Joakim Jäderberg
Approved-by: Matilda Landström
2025-08-25 13:05:58 +00:00
Joakim Jäderberg
c54c1ec540 Merged in SW-3270-move-interactive-map-to-design-system-or-booking-flow (pull request #2681)
SW-3270 move interactive map to design system or booking flow

* wip

* wip

* merge

* wip

* add support for locales in design-system

* add story for HotelCard

* setup alias

* .

* remove tracking from design-system for hotelcard

* pass isUserLoggedIn

* export design-system-new-deprecated.css from design-system

* Add HotelMarkerByType to Storybook

* Add interactive map to Storybook

* fix reactintl in vitest

* rename env variables

* .

* fix background colors

* add storybook stories for <Link />

* merge

* fix tracking for when clicking 'See rooms' in InteractiveMap

* Merge branch 'master' of bitbucket.org:scandic-swap/web into SW-3270-move-interactive-map-to-design-system-or-booking-flow

* remove deprecated comment


Approved-by: Anton Gunnarsson
2025-08-25 11:26:16 +00:00
Anton Gunnarsson
4f8c51298f Merged in chore/improve-e2e-tests-in-sas (pull request #2663)
chore: Increase expect timeout in SAS e2e tests

* Increase expect timeout


Approved-by: Joakim Jäderberg
2025-08-25 07:51:26 +00:00
Hrishikesh Vaipurkar
d6b7361a26 Merged in fix/SW-2786-ios-only-mobile-browsers- (pull request #2626)
fix(SW-2786): Added sizes auto to load images of appropriate size instead of largest

* fix(SW-2786): Added sizes auto to load images of appropriate size instead of largest

* fix(SW-2786): Updated to specific size as auto value is not yet supported by major browsers

* fix(SW-2786): Updated to height as min-height doesn't work for child having 100% correctly


Approved-by: Bianca Widstam
2025-08-22 13:11:32 +00:00
Linus Flood
d16c6b8082 Merged in feat/lokalise-sync-220825 (pull request #2690)
Lokalise sync

* Lokalise sync


Approved-by: Joakim Jäderberg
2025-08-22 13:10:47 +00:00
Linus Flood
208a64e54e Merged in fix/sw-3299-alerts (pull request #2692)
fix(SW-3299): hotel alerts now visible if booking dates starts/ends before the alert period

* fix(SW-3299): hotel alerts now visible if booking dates starts/ends before the alert period


Approved-by: Bianca Widstam
Approved-by: Hrishikesh Vaipurkar
2025-08-22 13:10:38 +00:00
Hrishikesh Vaipurkar
2fcd277206 Merged in fix/SW-2913-start-page-desktop-browsers-book (pull request #2691)
fix(SW-2913): Fixed flicker issue on floating booking widget

* fix(SW-2913): Fixed flicker issue on floating booking widget

* Fix(SW-2913): Flicker issue on iPad resolution


Approved-by: Bianca Widstam
2025-08-22 12:10:15 +00:00
Matilda Landström
d3f57b04eb Merged in fix/SW-3229 (pull request #2689)
fix(SW-3229): change to group on filtering

* fix(SW-3229): change to group on filtering


Approved-by: Erik Tiekstra
2025-08-22 11:54:04 +00:00
Bianca Widstam
d9b858c823 Merged in feat/SW-3289-replace-sidepeek-hotel-reservation (pull request #2686)
feat(SW-3289): replace sidepeek

* fix(SW-3289): replace sidepeek

* fix(SW-3289): add wrapping prop and change prop name to buttonVariant

* fix(SW-3289): replace body with typography

* fix(SW-3289): fix intl message


Approved-by: Joakim Jäderberg
2025-08-22 11:43:39 +00:00
Linus Flood
e2544f9f89 Merged in feat/sw-3192-no-user (pull request #2680)
feat(SW-3192): Checks if user exists, otherwise logout and show error

* feat(SW-3192): Checks if user exists, otherwise logout and show error
2025-08-22 09:47:54 +00:00
Erik Tiekstra
caffa1821f feat(SW-3288): Added sort order on campaign pages to sort campaigns on hotel pages
Approved-by: Matilda Landström
2025-08-22 09:30:45 +00:00
Erik Tiekstra
c7c55bd7b1 Feat/SW-3287 campaign start end
Approved-by: Matilda Landström
2025-08-22 09:18:52 +00:00
Hrishikesh Vaipurkar
ce3b7a6a49 Merged in fix/SW-2846-bedtype-measurements- (pull request #2682)
fix(SW-2846): Updated Bed Option to hide size when custom occupancy type

* fix(SW-2846): Updated Bed Option to hide size when custom occupancy type


Approved-by: Erik Tiekstra
Approved-by: Matilda Landström
2025-08-22 07:45:01 +00:00
Chuma Mcphoy (We Ahead)
6a0675525d Merged in fix/dtmc-debugging (pull request #2683)
Chore: DTMC Logging

* chore: DTMC debugging

* fix: prune dtmc logging

* fix: Add id's from azure in error logging


Approved-by: Linus Flood
Approved-by: Matilda Landström
2025-08-21 13:12:56 +00:00
Erik Tiekstra
2064732e56 Feat/SW-3028 hotel page campaigns
* feat(SW-3028): Added query and typings to fetch campaigns by hotelUid
* feat(SW-3028): Added components for campaigns to the hotel page
* feat(SW-3028): Implemented prioritized campaigns list
* chore(SW-3028): Refactor how campaigns are fetched on hotel pages
* feat(SW-3028): Added offers/campaigns to tab navigation

Approved-by: Matilda Landström
2025-08-21 13:00:34 +00:00
Linus Flood
456e10c674 Merged in feat/webview-hide-overview-back (pull request #2684)
feat(webview): flag to show/hide back to overview-button

* feat(webview): flag to show/hide back to overview-button


Approved-by: Joakim Jäderberg
2025-08-21 12:32:08 +00:00
Hrishikesh Vaipurkar
3f19886171 Merged in fix/SW-3254-error-fromdate_cannot_be_ (pull request #2676)
Fix/SW-3254 error fromdate cannot be

* fix(SW-3254): Implemented date valdaton on select-hotel page

* fix(SW-3254): Updated the browser URL to show proper booking dates

* fix(SW-3254): Fixed select-rate when invalid dates searched

* fix(SW-3254): Forced no availability for past dates

* fix(SW-3254) Optimised code

* fix(SW-3254): Optimised code


Approved-by: Linus Flood
2025-08-21 09:48:31 +00:00
Hrishikesh Vaipurkar
d2bbbc0a47 Merged in fix/SW-2366-alerts-the-list-bullet-display (pull request #2679)
fix(SW-2366): Fixed hotel alerts in booking page as per design

* fix(SW-2366): Fixed hotel alerts in booking page as per design

* fix(SW-2366): Optimise code


Approved-by: Erik Tiekstra
2025-08-21 09:47:54 +00:00
Hrishikesh Vaipurkar
e0cc237b5f Merged in fix/SW-2367-rate-details-mobile-ui-correctio (pull request #2678)
fix(SW-2367): Aligned the check icon in rate terms

* fix(SW-2367): Aligned the check icon in rate terms


Approved-by: Erik Tiekstra
2025-08-20 14:04:58 +00:00
Matilda Landström
eaf6e851ec Merged in fix/SW-1532-make-link-nullable (pull request #2677)
fix/SW-1532: make link nullable

* fix/SW-1532: make link nullable


Approved-by: Erik Tiekstra
2025-08-20 13:32:00 +00:00
Matilda Landström
fe376c63f7 Merged in feat/SW-2847-table (pull request #2665)
fix(SW-2847): move ScrollWrapper to design system and Table component

* fix(SW-2847): move ScrollWrapper to design system and Table component


Approved-by: Erik Tiekstra
2025-08-20 09:41:54 +00:00
Matilda Landström
7891ae3ae6 Merged in feat/SW-3232-site-config-alerts (pull request #2671)
feat(SW-3232): update alert schema

* feat(SW-3232): update alert schema


Approved-by: Erik Tiekstra
2025-08-20 09:18:00 +00:00
Chuma Mcphoy (We Ahead)
720a1c2734 Merged in feat/LOY-264-My-Pages-Overview-Shortcuts (pull request #2672)
Feat(LOY-264): My Pages Overview Shortcuts

* feat(LOY-264): Add My Pages Shortcuts Overview Dynamic Content Component

* fix(LOY-264): more semantic naming + remove comments

* fix(LOY-264): new space variables

* fix(LOY-264): remove unused prop


Approved-by: Matilda Landström
2025-08-20 09:06:25 +00:00
Matilda Landström
789818eefd Merged in feat/SW-3127-meeting-room-sort-order (pull request #2634)
feat(SW-3127): use new sort order attribute

* feat(SW-3127): use new sort order attribute


Approved-by: Erik Tiekstra
2025-08-20 08:46:16 +00:00