Commit Graph

130 Commits

Author SHA1 Message Date
Simon Emanuelsson
9580281421 fix: allow any type of phone number 2025-06-03 11:54:05 +00:00
Arvid Norlin
79e669020a wip: new PhoneCountryCode Select 2025-06-03 11:54:04 +00:00
Christian Andolf
726ea44105 Merged in fix/consistent-link-colors (pull request #2245)
feat: update links default color to match design documents

Approved-by: Michael Zetterberg
2025-06-02 14:38:16 +00:00
Anton Gunnarsson
03468ad824 Merged in fix/refactor-booking-flow-search-params (pull request #2148)
Fix: refactor booking flow search params

* wip: apply codemod and upgrade swc plugin

* wip: design-system to react 19, fix issues from async (search)params

* Prepare new parse function for booking flow search params

* Prepare serialize function for booking flow search params

* Improve handling of comma separated arrays

* Slightly refactor for readability

* Next abstracts URLSearchParams so handle the abstraction instead

* Refactor booking widget to use new search params parsing

* Rename search param functions

* Refactor select-hotel to use new search param parser

* Use new search params parser in select-rate and details

* Fix hotelId type

* Avoid passing down search params into BookingWidget components

* More updates to use new types instead of SearchParams<T>

* Remove types SelectHotelSearchParams and AlternativeSelectHotelSearchParams

* Fix parseBookingWidgetSearchParams return type

* Add error handling to booking search param parsers

* Fix modifyRateIndex handling in details page

* Clean up

* Refactor booking widget search param serializing to util function

* Move start page booking widget search param parsing to page

* Use new search param serializer in HandleErrorCallback

* Delete convertSearchParamsToObj & convertObjToSearchParams


Approved-by: Michael Zetterberg
2025-06-02 13:38:01 +00:00
Christian Andolf
b3b3704c86 feat: update links default color to match design documents 2025-06-02 15:34:40 +02:00
Bianca Widstam
6df8c75d2d Merged in fix/SW-2189-trigger-email-on-blur (pull request #2223)
Fix/SW-2189 trigger on blur

* fix(SW-2189): do not trigger email when typing

* fix(SW-2189): use onblur on multiroom as well


Approved-by: Tobias Johansson
2025-06-02 11:03:36 +00:00
Anton Gunnarsson
7e97b74c18 Merged in chore/remove-unused-code (pull request #2229)
Remove unused code

* Remove unused scandic-web files

* Remove unused exports


Approved-by: Joakim Jäderberg
2025-05-30 12:41:18 +00:00
Niclas Edenvin
44e648e758 Merged in fix/SW-2292-new-hotel-header (pull request #2253)
fix(SW-2292): new design for hotel header on enter details

* fix(SW-2292): new design for hotel header on enter details


Approved-by: Michael Zetterberg
2025-05-28 12:19:11 +00:00
Niclas Edenvin
1d733c5ca3 Merged in fix/SW-2887-complete-booking-button-always-enabled (pull request #2227)
fix(SW-2887): don't disable the booking button
The complete button shouldn’t be disabled based on validation. This was already correct in desktop, but now it’s also correct in mobile.

* fix(SW-2887): don't disable the booking button


Approved-by: Tobias Johansson
Approved-by: Christian Andolf
2025-05-28 08:11:29 +00:00
Christian Andolf
8e1a83ee7d fix(SW-2172): update sidepeek buttons to use new ones for accessibility
updated enter details header overlay to match design

updated change room button to use new one for accessibility

other minor fixes to match design
2025-05-27 12:05:04 +02:00
Simon Emanuelsson
39855d3c8a fix: trigger memberPrice modal for membership number too 2025-05-27 10:22:31 +02:00
Tobias Johansson
f77202f58b Merged in fix/SW-2249-missing-currency (pull request #2159)
fix(SW-2249): Added default currency to summary and price details modal

* fix(SW-2249): Added default currency to summary and price details modal


Approved-by: Hrishikesh Vaipurkar
2025-05-26 06:51:57 +00:00
Simon Emanuelsson
2ddf31cbed fix: remove autofilldetector since rhf update caused watch to behave differently 2025-05-23 13:57:32 +00:00
Niclas Edenvin
c3e00327de Merged in fix/join-card-toc-link (pull request #2197)
fix: correct terms & conditions link in join card

* fix: correct terms & conditions link in join card


Approved-by: Linus Flood
2025-05-22 12:14:31 +00:00
Anton Gunnarsson
f46bc8f920 Update @hookform/resolvers
In v5 the zod resolver will automatically infer the type for `useForm`.
It's not recommended to manually specify types.
See https://github.com/react-hook-form/resolvers/releases/tag/v5.0.0
2025-05-22 14:00:39 +02:00
Simon Emanuelsson
5ca30d02a0 feat: keep inventory of bedselections 2025-05-22 09:37:52 +00:00
Linus Flood
2ec309354e Merged in fix/my-stay-webview-2 (pull request #2191)
fix: webview - mystay - check if we have webviewToken

* fix: webview - mystay - check if we have webviewToken

* Cleanup


Approved-by: Joakim Jäderberg
2025-05-22 08:38:20 +00:00
Tobias Johansson
fe1f4b063d Merged in fix/paymentFail-event-fix (pull request #2189)
fix: infinite loop when bookingStatus isTimeout occurs

* fix: infinite loop when bookingStatus isTimeout occurs


Approved-by: Linus Flood
2025-05-22 07:33:13 +00:00
Linus Flood
ad5ec80645 Merged in feat/sw-2855-urls (pull request #2177)
feat: sw-2855 urls

* feat: sw-2855 urls


Approved-by: Joakim Jäderberg
2025-05-21 09:11:02 +00:00
Michael Zetterberg
f3936f41d8 Merged in fix/label-sync (pull request #2163)
fix: english label sync

* fix: english label sync

* fix: sync from Lokalise


Approved-by: Linus Flood
2025-05-21 04:11:22 +00:00
Bianca Widstam
cdfcc3623b Merged in fix/SW-2837-tracking-pageType-enter-details (pull request #2157)
fix(SW-2837): change page type for enter details

* fix(SW-2837): change page type for enter details


Approved-by: Christian Andolf
2025-05-20 09:43:22 +00:00
Linus Flood
ac892726e0 Merged in fix/enter-details-footer-margin (pull request #2150)
fix: margin to footer on enter details

* fix: margin to footer on enter details
2025-05-19 14:35:48 +00:00
Arvid Norlin
f49a13512a Merged in fix/enter-details-header (pull request #2119)
fix: hide address and decrease title size on smaller devices

* fix(SW-2791): hide address and decrease title size on smaller devices


Approved-by: Tobias Johansson
2025-05-16 08:51:49 +00:00
Bianca Widstam
9aeb38bef4 Merged in fix/SW-2756-hide-chevron-booking-summary (pull request #2102)
fix(SW-2756): hide chevron and remove button click for desktop

* fix(SW-2756): hide chevron and remove button click for desktop


Approved-by: Linus Flood
2025-05-15 05:59:44 +00:00
Simon Emanuelsson
ca29237f2e feat: add no breakfast message to price details modal and to conf page receipt 2025-05-14 11:12:24 +02:00
Tobias Johansson
13261d425c Merged in feat/SW-2703-mobile-summary-improvements (pull request #2060)
Feat/SW-2703 mobile price summary improvements

* feat(SW-2703): fixes to select rate price summary

* feat(SW-2703): fixes enter details summary mobile

* fix: z-index issue related to booking widget popover

* fix

* fix: added accessibility props to overlay div

* fix: added button inside header

* fix: rename aria button


Approved-by: Michael Zetterberg
2025-05-13 09:22:34 +00:00
Matilda Landström
0d84d4374c Merged in fix/SW-2180-room-title (pull request #2028)
Fix(SW-2180): Hide empty brackets next to room title

* fix(SW-2180): hide text when no value


Approved-by: Christian Andolf
2025-05-09 14:36:25 +00:00
Tobias Johansson
02b26e7965 Merged in fix/SW-2668-tracking-room-details-missing (pull request #2015)
fix(SW-2668): added search term and room details to tracking

* fix(SW-2668): added search term and room details to tracking

* fix: change to optional type


Approved-by: Christian Andolf
Approved-by: Matilda Landström
2025-05-08 14:13:51 +00:00
Simon Emanuelsson
a99e434d84 feat: move room charge to top in price details modal 2025-05-08 10:38:44 +00:00
Niclas Edenvin
f8b87f0142 Merged in fix/special-requests-required (pull request #1985)
fix: Don't require special requests

* fix: Don't require special requests

Special requests for room one was wrongly marked as required


Approved-by: Bianca Widstam
2025-05-06 14:07:05 +00:00
Niclas Edenvin
9e0332ba8a Merged in fix/SW-2625 (pull request #1980)
fix(SW-2625): set correct submitting status when validation fails

* fix(SW-2625): set correct submitting status when validation fails


Approved-by: Bianca Widstam
2025-05-06 12:51:41 +00:00
Tobias Johansson
25ae368210 Merged in fix/SW-1353-and-SW-2497-tracking-fixes (pull request #1977)
fix: tracking fixes SW-1353 and SW-2497

* fix: tracking fixes

* fix: remove console log and rename variable


Approved-by: Michael Zetterberg
Approved-by: Arvid Norlin
2025-05-06 11:15:52 +00:00
Michael Zetterberg
c6a0ce86df feat(SW-2605): confirmation page only valid for 1 minute for the session 2025-05-06 11:01:32 +00:00
Matilda Landström
8bff7f2cf2 Merged in fix/SW-2440-breakfast-tracking (pull request #1967)
fix(SW-2440): correct total price

* fix(SW-2440): correct total price

* Merge branch 'fix/SW-2440-breakfast-tracking' of bitbucket.org:scandic-swap/web into fix/SW-2440-breakfast-tracking

* fix(SW-2440): multiply by number of nights for breakfast tracking


Approved-by: Niclas Edenvin
2025-05-06 08:52:20 +00:00
Simon Emanuelsson
4d41d4fd92 feat: autofill all fields on enter details and countryselector clean up 2025-05-06 10:03:24 +02:00
Matilda Landström
5c6f468bd6 Merged in fix/SW-2440-breakfast-tracking (pull request #1947)
Fix/SW-2440 breakfast tracking

* fix(SW-2440): fix confirmation ancillaries tracking

* fix(SW-2440): add breakfast ancillary when preselected


Approved-by: Bianca Widstam
2025-05-05 12:27:25 +00:00
Michael Zetterberg
b910b6a313 feat(SW-2116): Use refId instead of confirmationNumber 2025-05-05 12:26:37 +00:00
Christian Andolf
d6b70edfa3 chore: replace old border-radius variables with new tokens 2025-05-05 11:11:37 +02:00
Niclas Edenvin
4191441f32 Merged in fix/submit-booking-disabled (pull request #1936)
Don't disable payment based on room forms

* Don't disable payment based on room forms


Approved-by: Arvid Norlin
Approved-by: Tobias Johansson
2025-05-05 07:55:25 +00:00
Simon Emanuelsson
91933f47cf feat: comment updates 2025-05-03 22:43:09 +02:00
Tobias Johansson
f56a1ece0f feat(SW-1255): Added loading state to submit button in enter details 2025-05-03 22:18:50 +02:00
Matilda Landström
cd01b34606 fix: update copy 2025-05-03 09:59:55 +00:00
Matilda Landström
e059c5d30d fix: update copy 2025-05-03 09:59:54 +00:00
Matilda Landström
19407d1b09 fix: update copy 2025-05-03 09:59:54 +00:00
Matilda Landström
2a333334ac fix: update copy 2025-05-03 09:59:54 +00:00
Hrishikesh Vaipurkar
e8b17deb52 Merged in fix/SW-2579-aa-tracking-2-times-bed-sel- (pull request #1932)
Fix: SW-2579 Fixed bed selection triggering twice

* Fix: SW-2579 Fixed bed selection triggering twice


Approved-by: Tobias Johansson
2025-05-03 09:21:45 +00:00
Tobias Johansson
71f1e9fe2c Merged in fix/tracking-fixes (pull request #1930)
Fix/tracking fixes

* fix: remove hotelInfo and paymentInfo when user reloads page on confirmation page

* fix: clean session storage item on unmount

* fix: commented out hard navigation hook

* fix: update price calculation on room ancillary in tracking

* fix: update discount calculation

* fix: add space between fns

* fix: allow useSoftNavigation to fire pageview again on same pathname

* fix: prevent bedSelection and breakfastSelection from tracking twice


Approved-by: Hrishikesh Vaipurkar
2025-05-03 07:27:54 +00:00
Niclas Edenvin
fb44990777 Merged in fix/SW-2501-validation-trigger (pull request #1924)
fix(SW-2501): validation trigger

* fix(SW-2501): validation trigger

On enter details, when submitting we want to trigger the validation for
the details forms for each room. This will display error messages for
the form fields with errors if they are not already displayed, so the
user knows which fields has errors.


Approved-by: Tobias Johansson
2025-05-02 13:59:23 +00:00
Linus Flood
6979ac0c3b Merged in revert-pr-1925 (pull request #1927)
Revert "Feat/sw 2323 find booking (pull request #1925)"

Approved-by: Anton Gunnarsson
2025-05-02 13:05:42 +00:00
Hrishikesh Vaipurkar
e6a3e5dbd8 Merged in feat/SW-2398-ui-update-for-booking-codes (pull request #1862)
feat: SW-2398 UI updates booking codes

* feat: SW-2398 UI updates booking codes

* feat: SW-2398 Rate cards UI changes

* feat: SW-2398 Optimized css with vars and chip code

* feat: SW-2398 Optimized code as review comments

* feat: SW-2398 Optimized code

* feat: SW-2398 Optimized code and mobile UX

* feat: SW-2398 Optimized code

* feat: SW-2398 Fixed UI

* feat: SW-2398 Updated animation


Approved-by: Erik Tiekstra
2025-05-02 12:36:22 +00:00