Linus Flood
4b3dbadf24
Merged in feat/sw-3610-basicProfile (pull request #3144 )
...
Feat(SW-3610): basic profile endpoint on protected layouts
* Basic profile in protected layouts
* .
Approved-by: Anton Gunnarsson
2025-11-13 07:35:16 +00:00
Joakim Jäderberg
dc53ab9245
Merged in chore/upgrade-next (pull request #3124 )
...
Upgrade next@15.5.6
* chore: upgrade next@15.5.6
* chore: upgrade turborepo@2.6.1
* fix typings for scandic-web
* fix: set correct type for pages
* cleanup
* fix more route.ts typing issues
* Merge branch 'master' of bitbucket.org:scandic-swap/web into chore/upgrade-next
* explicitly import the types
Approved-by: Linus Flood
2025-11-13 07:33:56 +00:00
Joakim Jäderberg
47210491c3
Merged in sync-lokalise-2025-10-30 (pull request #3038 )
...
* sync lokalise
* sync defaultMessage
Approved-by: Anton Gunnarsson
2025-10-30 08:47:44 +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
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
5a86cbaafe
Merged in chore/update-eslint-configs (pull request #2812 )
...
chore: Extend eslint configs from @typescript-eslint/recommended
* Change to typescript recommended in scandic-web
* Remove comment
* Change to recommended ts config in partner-sas
* Change to recommended ts lint config in booking-flow
Approved-by: Linus Flood
2025-09-17 07:55:11 +00:00
Bianca Widstam
800948bb94
Merged in fix/STAY-67-redirect-to-webview-after-gla (pull request #2795 )
...
fix(STAY-67): redirect to webview after guarantee on my stay
* fix(STAY-67): redirect to webview after guarantee on my stay
* fix(STAY-67): add callback page for guarantee on webview
Approved-by: Linus Flood
2025-09-15 07:18:58 +00:00
Joakim Jäderberg
7dee6d5083
Merged in chore/move-enter-details (pull request #2778 )
...
Chore/move enter details
Approved-by: Anton Gunnarsson
2025-09-11 07:16:24 +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
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
Joakim Jäderberg
daf765f3d5
Merged in feature/wrap-logging (pull request #2511 )
...
Feature/wrap logging
* feat: change all logging to go through our own logger function so that we can control log levels
* move packages/trpc to using our own logger
* merge
Approved-by: Linus Flood
2025-07-03 12:37:04 +00:00
Linus Flood
7a56d21a3e
Merged in feat/SW-3050-webviews (pull request #2429 )
...
Feat/SW-3050 webviews
Approved-by: Anton Gunnarsson
2025-06-25 07:44:33 +00:00
Linus Flood
800b329998
Merged in fix/my-stay-webview-3 (pull request #2281 )
...
feat/my-stay-webview - check if user else redirect to refresh page
* feat/my-stay-webview - check if user else redirect to refresh page
Approved-by: Joakim Jäderberg
2025-06-04 06:26:42 +00:00