scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,412 Commits 1 Branch 0 Tags
bf6ed7778e5f7c06c9f15593fa10654b8b7430c0
Commit Graph

5412 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Jäderberg
bf6ed7778e Merged in feat/syncDefaultMessage (pull request #3022) 
Sync defaultMessage from lokalise

* Enhance translation sync functionality and tests

- Added logging for found component files during sync.
- Introduced tests for handling complex components with replacements.
- Updated regex in syncIntlFormatMessage to support optional second arguments.
- Removed unused test files.

* feat(syncDefaultMessage): add script for syncing default message with lokalise

* feat(syncDefaultMessage): add script for syncing default message with lokalise


Approved-by: Matilda Landström
 2025-10-30 08:38:50 +00:00
Bianca Widstam
3962ecd858 Merged in feat/BOOK-426-campaign-tag-select-hotel (pull request #3037) 
Feat/BOOK-426 campaign tag select hotel

* fix(BOOK-426): do not show campaign tag if a regular booking code is used and the rate is a campaign

* fix(BOOK-426): if no availability show booking code striketrough as default


Approved-by: Erik Tiekstra
 2025-10-30 07:15:12 +00:00
Anton Gunnarsson
6b38d57197 Merged in chore/fix-broken-e2e-test (pull request #3031) 
chore: Fix broken e2e tests

* Update date picker selector


Approved-by: Joakim Jäderberg
 2025-10-29 15:24:09 +00:00
Bianca Widstam
ed833e714b Merged in feat/BOOK-426-add-campaign-tag-select-hotel (pull request #3023) 
Feat/BOOK-426 add campaign tag select hotel

* feat(BOOK-426): introduce campaign tag on select hotel card

* feat(BOOK-426): remove redundant tags

* feat(BOOK-426): fix comments, change to typography

* feat(BOOK-426): fix comments, update to cx


Approved-by: Erik Tiekstra
Approved-by: Matilda Landström
 2025-10-29 14:10:12 +00:00
Erik Tiekstra
5e81ec0eaf fix(BOOK-450): Re added the check for hotel branding feature flag before setting theme 
Approved-by: Bianca Widstam
Approved-by: Matilda Landström
 2025-10-29 14:06:59 +00:00
Matilda Haneling
2c6d9860e1 Merged in feat/book-425-optimize-campaign-rate-card (pull request #3015) 
Feat/book 425 optimize campaign rate card

* feat(BOOK-425): design updates to RateCard

* feat(BOOK-425): design updates to campaign BookingCodeChip

* feat(BOOK-425): fixed breakfast message & booking code chips on select rate and enter detailss

* feat(BOOK-425): fixed booking code chip on Booking Confirmation page

* fixed draft comments

* fixed more comments

* feat(BOOK-425): removed fixed height from RateCard banner

* fixed another variable comment

* fixed more pr comments

* fixed more pr comments

* updated ratecard campaign standard rate title color

* removed deconstructed props


Approved-by: Bianca Widstam
Approved-by: Erik Tiekstra
 2025-10-29 13:54:29 +00:00
Joakim Jäderberg
56b44c16d4 Merged in chore/upgrade-netlify-nextjs-plugin (pull request #3032) 
chore: upgrade @netlify/plugin-nextjs

* chore: upgrade @netlify/plugin-nextjs


Approved-by: Anton Gunnarsson
Approved-by: Matilda Landström
 2025-10-29 13:36:27 +00:00
Erik Tiekstra
4c10989e8e Feat/BOOK-424 campaign banner 
Approved-by: Bianca Widstam
 2025-10-29 12:47:40 +00:00
Christel Westerberg
377c8886ad Merged in fix/STAY-73-opt-in-email (pull request #3028) 
Fix/STAY-73 opt in email

* fix: let user opt-in for modification email when adding ancillaries

* fix: add toast when successfully removing an ancillary


Approved-by: Erik Tiekstra
Approved-by: Elin Svedin
 2025-10-29 12:45:18 +00:00
Erik Tiekstra
333636c81a Merged in feat/BOOK-61-refactor-hotel-page-css-variables (pull request #3014) 
Feat/BOOK-61 refactor hotel page css variables

* feat(BOOK-61): Breadcrumbs

* feat(BOOK-61): intro section

* feat(BOOK-61): show more button

* feat(BOOK-61): rooms section

* feat(BOOK-61): sidepeeks

* feat(BOOK-61): deprecated old Link component

* feat(BOOK-61): added new TextLink component to the design-system

* feat(BOOK-61): replaced deprecated links with new TextLink component

* feat(BOOK-61): miscellaneous changes


Approved-by: Bianca Widstam
Approved-by: Christel Westerberg
 2025-10-29 09:15:03 +00:00
Bianca Widstam
bfe5c5f8bb Merged in lokalize/sync (pull request #3024) 
lokalise sync

* lokalise sync

* lokalise sync and remove duplicate id


Approved-by: Joakim Jäderberg
Approved-by: Anton Gunnarsson
 2025-10-28 10:26:47 +00:00
Joakim Jäderberg
a4f1a55e56 Merged in feat/SW-3549-handle-unlinked-account (pull request #3019) 
fix(SW-3549): update social session management functions for clarity and consistency

* refactor(SW-3549): rename session management functions for clarity and consistency

* merge


Approved-by: Hrishikesh Vaipurkar
 2025-10-28 09:51:30 +00:00
Bianca Widstam
4a6c64f921 Merged in fix/BOOK-111-bookingwidget-scrollable-zoom (pull request #3017) 
fix(BOOK-111): make bookingwidget scrollable for zoomed in accessibility

* fix(BOOK-111): make bookingwidget scrollable for zoomed in accessibility

* fix(BOOK-111): dont scroll bookingwidget if searchlist is open


Approved-by: Erik Tiekstra
 2025-10-28 09:36:21 +00:00
Anton Gunnarsson
642f032512 Merged in fix/update-sas-join-card-text (pull request #2998) 
fix: Update SAS join card text and size

* Update SAS join card text and size


Approved-by: Joakim Jäderberg
 2025-10-28 08:17:04 +00:00
Matilda Landström
649c85e6f5 Merged in feat/Lokalise-fetch (pull request #3021) 
Update from Lokalise 27/10-25

* Update from Lokalise 27/10-25


Approved-by: Chuma Mcphoy (We Ahead)
 2025-10-27 16:00:35 +00:00
Joakim Jäderberg
9c78d6a98a Merged in fix/my-stay-bookingflowconfig-missing (pull request #3020) 
fix: wrap MyStay component in BookingFlowConfig to handle RSC problem where config is not set

* fix: wrap MyStay component in BookingFlowConfig to handle RSC problem where config is not set


Approved-by: Bianca Widstam
 2025-10-27 14:55:00 +00:00
Bianca Widstam
b90d60bb72 Merged in feat/BOOK-81-enable-multiroom-arb-rate (pull request #3010) 
feat(BOOK-81): enable multiroom for arb rates

* feat(BOOK-81): enable multiroom for arb rates


Approved-by: Erik Tiekstra
 2025-10-27 14:44:19 +00:00
Hrishikesh Vaipurkar
98e67f5eda Merged in fix/SW-3550-member-rates-should-only- (pull request #3005) 
fix(SW-3550): Treat unlinked User as non-logged user within booking flow

Approved-by: Joakim Jäderberg
 2025-10-27 14:34:19 +00:00
Chuma Mcphoy (We Ahead)
d259a26b6e Merged in fix/LOY-358-change-sas-boosted-text (pull request #3018) 
fix(LOY-358): change sas boost text

* fix(LOY-358): change sas boost text


Approved-by: Emma Zettervall
 2025-10-27 14:24:58 +00:00
Joakim Jäderberg
3c72d043e2 Merged in fix/select-payment-method-set-form-name (pull request #3012) 
Fix/select payment method set form name

* fix(selectPaymentMethod): Set form name for tests

* fix(selectPaymentMethod): Set form name for tests
 2025-10-27 09:12:25 +00:00
Joakim Jäderberg
108bb2b319 Merged in chore/create-logger-tests (pull request #2996) 
Tests for common/logger

* chore: add tests for createLogger

* chore: add tests for createLogger


Approved-by: Linus Flood
 2025-10-24 13:28:56 +00:00
Joakim Jäderberg
3b3e7308cc Merged in feat/SW-3549-pass-scandic-token (pull request #2989) 
Feat/SW-3549 pass scandic token

* WIP pass scandic token

* pass scandic token when booking

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feat/SW-3549-pass-scandic-token

* pass user token when doing availability search

* undo changes

* merge

* Merged in fix/sw-3551-rsc-bookingflowconfig (pull request #2988)

fix(SW-3551): Fix issue with BookingConfigProvider in RSC

* wip move config to pages

* Move config providing to pages

* Merged in fix/update-promo-error-modal-text (pull request #2990)

fix: update promo error modal text

* fix: update promo error modal text


Approved-by: Emma Zettervall

* Merged in fix/sw-3514-missing-membership-input-for-multiroom (pull request #2991)

fix(SW-3514): Show join Scandic Friends card for SAS multiroom

* Show join card for room 2+


Approved-by: Hrishikesh Vaipurkar

* Merged in feat/lokalise-rebuild (pull request #2993)

Feat/lokalise rebuild

* chore(lokalise): update translation ids

* chore(lokalise): easier to switch between projects

* chore(lokalise): update translation ids

* .

* .

* .

* .

* .

* .

* chore(lokalise): update translation ids

* chore(lokalise): update translation ids

* .

* .

* .

* chore(lokalise): update translation ids

* chore(lokalise): update translation ids

* .

* .

* chore(lokalise): update translation ids

* chore(lokalise): update translation ids

* chore(lokalise): new translations

* merge

* switch to errors for missing id's

* merge

* sync translations


Approved-by: Linus Flood

* Merged in feat/SW-3552-logout-from-social-session-when- (pull request #2994)

feat(SW-3552): Removed scandic session on logout

Approved-by: Joakim Jäderberg

* merge

* replace getRedemptionTokenSafely() with context based instead

* Refactor user verification and error handling across multiple components; implement safeTry utility for safer async calls

* Refactor user verification and error handling across multiple components; implement safeTry utility for safer async calls

* merge

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feat/SW-3549-pass-scandic-token

* add booking scope

remove unused getMembershipNumber()


Approved-by: Anton Gunnarsson
Approved-by: Hrishikesh Vaipurkar
 2025-10-24 13:17:02 +00:00
Bianca Widstam
c473bbc8b0 Merged in fix/BOOK-323-enter-details-scroll-error (pull request #2986) 
Fix/BOOK-323 enter details scroll error

* fix(BOOK-323): scroll to invalid element on submit on enter details

* fix(BOOK-323): update error message design

* fix(BOOK-323): clean up

* fix(BOOK-323): scroll to fields in room in right order

* fix(BOOK-323): add id to translations

* fix(BOOK-323): remove undefined

* fix(BOOK-323): fix submitting state

* fix(BOOK-323): use ref in multiroom for scrolling to right element, add membershipNo

* fix(BOOK-323): fix invalid border country

* fix(BOOK-323): use error message component

* fix(BOOK-323): fix invalid focused styling on mobile

* fix(BOOK-323): remove redundant dependency in callback


Approved-by: Erik Tiekstra
 2025-10-24 11:30:56 +00:00
Joakim Jäderberg
6543ca5dc3 Merged in fix/remove-telemetry-console-log (pull request #3009) 
chore: remove telemetry console.log()

* chore: remove telemetry console.log()


Approved-by: Linus Flood
 2025-10-24 09:37:39 +00:00
Anton Gunnarsson
45d1537bc1 Merged in fix/sw-3562-update-room-sidepeek-copy (pull request #3008) 
fix(SW-3562): Update room sidepeek copy

* Update copy and key


Approved-by: Bianca Widstam
 2025-10-24 08:30:24 +00:00
Erik Tiekstra
11f76a509a fix(BOOK-466): We needed to separate the z-index from window.kindlyChat to also cater for other languages 
Approved-by: Linus Flood
 2025-10-23 13:37:08 +00:00
Erik Tiekstra
8714bc79fd feat(BOOK-116): Added better alt text to static map on hotel pages 
Approved-by: Bianca Widstam
 2025-10-23 13:06:45 +00:00
Anton Gunnarsson
24847bbc1c Merged in fix/sw-3561-swan-eco-icon-broken (pull request #3004) 
fix(SW-3561): Fix broken swan eco icon on partner-sas

* Move swan-eco icons to shared

* Delete unused icons


Approved-by: Linus Flood
 2025-10-23 12:42:46 +00:00
Linus Flood
6374085a36 Merged in feat/sw-3560-sanitize2 (pull request #3001) 
feat(SW-3560): send parameters to sentry logs

* feat(SW-3560): send parameters to sentry logs

* Use flatten instead of sanitize when logging


Approved-by: Joakim Jäderberg
 2025-10-23 11:30:15 +00:00
Anton Gunnarsson
a00cf8d327 Merged in fix/sw-3568-sas-terms-and-conditions-link (pull request #3002) 
feat(SW-3568): Use dependency injected link for SF terms on enter details

* Use dependency injected link for sf terms


Approved-by: Linus Flood
 2025-10-23 11:14:51 +00:00
Erik Tiekstra
89f1fb0023 fix(BOOK-466): Setting chatbot z-index variable to -1 if the chatbot should be hidden to avoid issues when multiple tabs are open 
Approved-by: Linus Flood
 2025-10-23 09:37:47 +00:00
Hrishikesh Vaipurkar
7f2db6f3de Merged in feat/SW-3557-update-ui-colors-after-test- (pull request #2995) 
* feat(SW-3557): Updated colors

Approved-by: Anton Gunnarsson
 2025-10-23 06:54:14 +00:00
Bianca Widstam
76c353058b Merged in fix/BOOK-459-tracking-search (pull request #2984) 
fix(BOOK-459): update searchTerm to city or hotelname

* fix(BOOK-459): update searchTerm to city or hotelname


Approved-by: Erik Tiekstra
 2025-10-22 14:34:59 +00:00
Linus Flood
acdc3dcec1 Merged in fix/book-453-linkconnection (pull request #2972) 
fix(BOOK-453): avoid linkConnection invalid

* fix(BOOK-453): avoid linkConnection invalid

* test

* test

* test

* Merge master
 2025-10-22 12:39:17 +00:00
Anton Gunnarsson
03f17acbbe Merged in feat/sw-3547-update-member-rate-alert-text (pull request #2992) 
feat(SW-3547): Update texts for SAS variant member rate alert

* Update texts for SAS variant


Approved-by: Hrishikesh Vaipurkar
 2025-10-22 12:33:13 +00:00
Hrishikesh Vaipurkar
d6941042de Merged in feat/SW-3552-logout-from-social-session-when- (pull request #2994) 
feat(SW-3552): Removed scandic session on logout

Approved-by: Joakim Jäderberg
 2025-10-22 11:26:09 +00:00
Joakim Jäderberg
aafad9781f Merged in feat/lokalise-rebuild (pull request #2993) 
Feat/lokalise rebuild

* chore(lokalise): update translation ids

* chore(lokalise): easier to switch between projects

* chore(lokalise): update translation ids

* .

* .

* .

* .

* .

* .

* chore(lokalise): update translation ids

* chore(lokalise): update translation ids

* .

* .

* .

* chore(lokalise): update translation ids

* chore(lokalise): update translation ids

* .

* .

* chore(lokalise): update translation ids

* chore(lokalise): update translation ids

* chore(lokalise): new translations

* merge

* switch to errors for missing id's

* merge

* sync translations


Approved-by: Linus Flood
 2025-10-22 11:00:03 +00:00
Anton Gunnarsson
bdfe2ab213 Merged in fix/sw-3514-missing-membership-input-for-multiroom (pull request #2991) 
fix(SW-3514): Show join Scandic Friends card for SAS multiroom

* Show join card for room 2+


Approved-by: Hrishikesh Vaipurkar
 2025-10-22 07:47:53 +00:00
Matilda Landström
7164070d59 Merged in fix/update-promo-error-modal-text (pull request #2990) 
fix: update promo error modal text

* fix: update promo error modal text


Approved-by: Emma Zettervall
 2025-10-22 07:05:05 +00:00
Anton Gunnarsson
c435cdba68 Merged in fix/sw-3551-rsc-bookingflowconfig (pull request #2988) 
fix(SW-3551): Fix issue with BookingConfigProvider in RSC

* wip move config to pages

* Move config providing to pages
 2025-10-22 07:04:21 +00:00
Hrishikesh Vaipurkar
2a28681259 Merged in fix/SW-3526-show-sas-eb-points-unlinked- (pull request #2987) 
fix(SW-3256): Fixed Users with 0 points throws error
Approved-by: Anton Gunnarsson
 2025-10-21 13:01:08 +00:00
Erik Tiekstra
3257054474 feat(BOOK-462): Hiding chatbot on german hotels with Dialogshift widget 
Approved-by: Linus Flood
 2025-10-20 10:43:08 +00:00
Erik Tiekstra
3e3a7fc423 fix(BOOK-418): Refactored StandaloneHotelCardDialog and fixed pricing issue when using redemption or booking codes 
Approved-by: Bianca Widstam
 2025-10-20 10:40:38 +00:00
Anton Gunnarsson
710309b7eb Merged in feat/sw-3545-update-sas-userinfo-tracking (pull request #2982) 
feat(SW-3545): Update partner-sas userinfo tracking

* Update loginType to eurobonus

* Remove tracking booking code properties when disabled

* Add EB user data to tracking

* Fix type issue


Approved-by: Joakim Jäderberg
 2025-10-17 09:35:37 +00:00
Hrishikesh Vaipurkar
c01f440651 Merged in feat/SW-3542-update-color-variables-to- (pull request #2970) 
feat(SW-3542): Updated the color variables for MVP

Approved-by: Joakim Jäderberg
 2025-10-17 09:22:03 +00:00
Anton Gunnarsson
bf19d3960b Merged in chore/remove-lodash (pull request #2983) 
chore: Remove lodash-es

* lodash-es is not edge safe so replace it with native functions


Approved-by: Joakim Jäderberg
 2025-10-17 07:47:20 +00:00
Matilda Landström
bacdc669a3 Merged in fix/Lokalise-EN-edits-2025-10 (pull request #2962) 
Fix/Lokalise English manual updates

* fix: update English keys


Approved-by: Linus Flood
 2025-10-16 15:04:58 +00:00
Erik Tiekstra
038211bf09 feat(BOOK-450): Added theme to hotel page only, reverting previous theme handing on the body tag 
Approved-by: Linus Flood
 2025-10-16 12:54:03 +00:00
Erik Tiekstra
338c93dd56 feat(BOOK-59): Fixes some issues related to css variables from the design system 
Approved-by: Linus Flood
 2025-10-16 12:53:43 +00:00
Joakim Jäderberg
291310e841 Merged in feature/curity-social-login (pull request #2963) 
feat(SW-3541): Do social login after login to SAS

* feat(auth): wip social login via curity

* Setup social login auth flow

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feature/curity-social-login

* Added support for getting scandic tokens and refresh them

* feat: Enhance social login and session management with auto-refresh and improved error handling

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feature/curity-social-login

* wrap layout in suspense

* revert app/layout.tsx

* fix import

* cleanup

* merge

* merge

* dont pass client_secret in the url to curity

* add state validation when doing social login through /authorize

* remove debug logging


Approved-by: Anton Gunnarsson
 2025-10-16 12:47:12 +00:00