Bianca Widstam
5ac7e5deac
Merged in fix/hotjar-suppress (pull request #3211 )
...
Fix/hotjar suppress
* fix(hotjar): suppress personal info on my pages
* fix(hotjar): suppress more data
Approved-by: Linus Flood
2025-11-27 13:09:37 +00:00
Chuma Mcphoy (We Ahead)
494bfe10f3
Merged in feat/profile-consent-feature-branch (pull request #2900 )
...
feat(LOY-268): Feature branch for profiling consent work
* feat: Add feature branch for profile and consent work
* Merged in feat/LOY-268-profile-consent-banner-comp (pull request #2908 )
Feat/LOY-358 profile consent banner component
* feat: Add feature branch for profile and consent work
* feat(LOY-268): create banner
* feat(LOY-268): Create personalization banner component
Approved-by: Chuma Mcphoy (We Ahead)
* feat(LOY-268): create banner
* feat(LOY-268): Create personalization banner component
* Merged in feat/profile-consent-contentstack (pull request #2921 )
Feat(LOY-389): Profile consent in Contentstack
* feat(LOY-268): create banner
* feat(LOY-268): Create personalization banner component
* chore(LOY-348): add profiling consent as CS entry
* chore(LOY-348): add banner as dynamic content
Approved-by: Chuma Mcphoy (We Ahead)
* Merged in feat/LOY-347-Profile-consent-modal-phase-1 (pull request #2901 )
Feat(LOY-347): Profiling Consent Modal (phase 1)
* feat(LOY-347): Profile Consent Modal base functionality
* feat(LOY-347): Add Icon
* feat(LOY-347): Add Benefit Cards to Profile consent modal
* feat(LOY-347): Add accordion to profile consent modal
* fix(LOY-347): scroll behaviour
* Fix(LOY-347): fade in/out animations of profile consent modal
* fix(LOY-347): White Ellipsis Around Icons
* feat(LOY-347): Implement ability to open modal from banner
* fix(LOY-347): minor fixes
* fix(LOY-347): replace old spa icon
* fix(LOY-347): re-add env vars
* fix(LOY-347): File renaming and cleanup
* chore(LOY-347): Update readme
* fix(LOY-347): use correct space var
* fix(LOY-347): Add TODO comment for adding link to accordion
Approved-by: Matilda Landström
* Merged in fix/LOY-386-profiling-consent-modal-contentstack (pull request #2930 )
Fix(LOY-386): profiling consent modal contentstack
* feat(LOY-347): Profile Consent Modal base functionality
* feat(LOY-347): Add Icon
* feat(LOY-347): Add Benefit Cards to Profile consent modal
* feat(LOY-347): Add accordion to profile consent modal
* fix(LOY-347): scroll behaviour
* Fix(LOY-347): fade in/out animations of profile consent modal
* fix(LOY-347): White Ellipsis Around Icons
* feat(LOY-347): Implement ability to open modal from banner
* fix(LOY-347): minor fixes
* fix(LOY-347): replace old spa icon
* fix(LOY-347): re-add env vars
* fix(LOY-347): File renaming and cleanup
* fix(LOY-386): Use contentstack content for profile consent modal
* fix(LOY-386): beneift cards schema transform
* chore(LOY-386): remove usememo
* fix(LOY-386): fix modalcontent check
* fix(LOY-386): remove uneeded vars
Approved-by: Matilda Landström
* Merged in feat/LOY-412-profiling-consent-in-signup (pull request #2976 )
Feat(LOY-412): profiling consent in signup
* feat(LOY-268): create banner
* feat(LOY-268): Create personalization banner component
* Merged in feat/profile-consent-contentstack (pull request #2921 )
Feat(LOY-389): Profile consent in Contentstack
* feat(LOY-268): create banner
* feat(LOY-268): Create personalization banner component
* chore(LOY-348): add profiling consent as CS entry
* chore(LOY-348): add banner as dynamic content
Approved-by: Chuma Mcphoy (We Ahead)
* Merged in feat/LOY-347-Profile-consent-modal-phase-1 (pull request #2901 )
Feat(LOY-347): Profiling Consent Modal (phase 1)
* feat(LOY-347): Profile Consent Modal base functionality
* feat(LOY-347): Add Icon
* feat(LOY-347): Add Benefit Cards to Profile consent modal
* feat(LOY-347): Add accordion to profile consent modal
* fix(LOY-347): scroll behaviour
* Fix(LOY-347): fade in/out animations of profile consent modal
* fix(LOY-347): White Ellipsis Around Ico…
* Merged in fix/lokalise-ids (pull request #3013 )
fix: add ids to translations in Profiling Consent
* fix: add ids to translations
Approved-by: Erik Tiekstra
Approved-by: Chuma Mcphoy (We Ahead)
* Merged in LOY-436-my-pages-profiling-consent (pull request #3011 )
LOY-436: Profiling Consent on My Profile, no api
Approved-by: Chuma Mcphoy (We Ahead)
* Merged in feat/LOY-418-profiling-consent-ui-text-update (pull request #3080 )
Feat/LOY-418: Profiling consent ui and text update
* chore(LOY-418): update /consent buttons
* chore(LOY-418): update legal texts
Approved-by: Chuma Mcphoy (We Ahead)
* Merged in feat/LOY-268-profiling-consent-api (pull request #3088 )
Approved-by: Chuma Mcphoy (We Ahead)
* Merged in feat/LOY-413-Signup-API-Profiling-Consent (pull request #3105 )
Feat/LOY-413 Signup API Profiling Consent
* feat(LOY-413): signup profiling consent
* chore(LOY-413): remove todo
* fix(LOY-413): only pass in profilingConsent if true
* fix(LOY-413): proper spread of profilingConsent in signup input
Approved-by: Christel Westerberg
* Merged in fix/LOY-413-use-v2-for-signup-call (pull request #3112 )
fix(LOY-413): use v2 endpoint for profile POST in signup
* fix(LOY-413): use v2 endpoint for profile POST in signup
Approved-by: Erik Tiekstra
* Merged in feat/LOY-268-profiling-consent-improvements (pull request #3094 )
Feat/LOY-268: Profiling consent improvements
* Merged in feat/profile-consent-contentstack (pull request #2921 )
Feat(LOY-389): Profile consent in Contentstack
* feat(LOY-268): create banner
* feat(LOY-268): Create personalization banner component
* chore(LOY-348): add profiling consent as CS entry
* chore(LOY-348): add banner as dynamic content
Approved-by: Chuma Mcphoy (We Ahead)
* Merged in feat/LOY-347-Profile-consent-modal-phase-1 (pull request #2901 )
Feat(LOY-347): Profiling Consent Modal (phase 1)
* feat(LOY-347): Profile Consent Modal base functionality
* feat(LOY-347): Add Icon
* feat(LOY-347): Add Benefit Cards to Profile consent modal
* feat(LOY-347): Add accordion to profile consent modal
* fix(LOY-347): scroll behaviour
* Fix(LOY-347): fade in/out animations of profile consent modal
* fix(LOY-347): White Ellipsis Around Icons
* feat(LOY-347): Implement ability to open modal from banner
* fix(LOY-347): min…
* Merged in fix/update-graphql (pull request #3130 )
fix: update graphql
* fix: update graphql
Approved-by: Chuma Mcphoy (We Ahead)
* Merged in feat/LOY-414-prof-consent-tracking (pull request #3127 )
Feat/LOY-414 profile consent tracking + credit card ui update
* chore(LOY-414): create track link function
* chore(LOY-414): add cta tracking
* chore(LOY-414): add profileConsent to userInfo datalayer
* chore(LOY-414): update credit card ui
* chore(LOY-414): update tracking specs
* chore(LOY-414): add pageView tracking to modal
Approved-by: Chuma Mcphoy (We Ahead)
* fix: remove old flag
* Merged in fix/LOY-268-prof-consent-button-fix (pull request #3162 )
fix(LOY-268): add button as link
* fix(LOY-268): add button as link
Approved-by: Chuma Mcphoy (We Ahead)
Approved-by: Matilda Landström
2025-11-14 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
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
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
Hrishikesh Vaipurkar
d3368e9b85
Merged in feat/SW-2782-create-sas-branded-header (pull request #2878 )
...
feat(SW-2782): Updated header as per design, added language switcher and user menu
* feat(SW-2782): Updated header as per design, added language switcher and user menu
* feat(SW-2782): Updated UI as per design
* feat(SW-2782): Optimised code with use of Popover and modal from RAC
Approved-by: Anton Gunnarsson
2025-10-06 08:46:26 +00:00
Anton Gunnarsson
00b124d15a
Merged in feat/sw-3226-move-buttonlink-to-design-system (pull request #2613 )
...
feat(SW-3226): Move ButtonLink to design-system
* Move ButtonLink to design-system
* Fix Button import
Approved-by: Linus Flood
2025-08-11 10:53:00 +00:00
Anton Gunnarsson
00bcdaaa28
Merged in feat/sw-2865-move-navigation-router-to-trpc-package (pull request #2427 )
...
feat(SW-2862): Move navigation router to trpc package
* Fix most errors in scandic-web
Just 100 left...
* Move Props type out of trpc
* Fix CategorizedFilters types
* Move more schemas in hotel router
* Fix deps
* fix getNonContentstackUrls
* Fix import error
* Fix entry error handling
* Fix generateMetadata metrics
* Fix alertType enum
* Fix duplicated types
* lint:fix
* Merge branch 'master' into feat/sw-2863-move-contentstack-router-to-trpc-package
* Fix broken imports
* Move booking router to trpc package
* Move partners router to trpc package
* Move autocomplete router to trpc package
* Move booking router to trpc package
* Remove translations from My Pages navigation trpc procedure
* Move navigation router to trpc package
* Merge branch 'master' into feat/sw-2862-move-booking-router-to-trpc-package
* Merge branch 'feat/sw-2862-move-booking-router-to-trpc-package' into feat/sw-2865-move-navigation-router-to-trpc-package
* Merge branch 'master' into feat/sw-2865-move-navigation-router-to-trpc-package
* Merge branch 'master' into feat/sw-2865-move-navigation-router-to-trpc-package
* Merge branch 'master' into feat/sw-2865-move-navigation-router-to-trpc-package
Approved-by: Linus Flood
2025-06-27 06:54:49 +00:00
Anton Gunnarsson
bbcabfa0ba
Merged in feat/sw-2864-move-hotels-router-to-trpc-package (pull request #2410 )
...
feat (SW-2864): Move booking router to trpc package
* Add env to trpc package
* Add eslint to trpc package
* Apply lint rules
* Use direct imports from trpc package
* Add lint-staged config to trpc
* Move lang enum to common
* Restructure trpc package folder structure
* WIP first step
* update internal imports in trpc
* Fix most errors in scandic-web
Just 100 left...
* Move Props type out of trpc
* Fix CategorizedFilters types
* Move more schemas in hotel router
* Fix deps
* fix getNonContentstackUrls
* Fix import error
* Fix entry error handling
* Fix generateMetadata metrics
* Fix alertType enum
* Fix duplicated types
* lint:fix
* Merge branch 'master' into feat/sw-2863-move-contentstack-router-to-trpc-package
* Fix broken imports
* Move booking router to trpc package
* Merge branch 'master' into feat/sw-2864-move-hotels-router-to-trpc-package
Approved-by: Linus Flood
2025-06-26 09:02:59 +00:00
Anton Gunnarsson
002d093af4
Merged in feat/sw-2863-move-contentstack-router-to-trpc-package (pull request #2389 )
...
feat(SW-2863): Move contentstack router to trpc package
* Add exports to packages and lint rule to prevent relative imports
* Add env to trpc package
* Add eslint to trpc package
* Apply lint rules
* Use direct imports from trpc package
* Add lint-staged config to trpc
* Move lang enum to common
* Restructure trpc package folder structure
* WIP first step
* update internal imports in trpc
* Fix most errors in scandic-web
Just 100 left...
* Move Props type out of trpc
* Fix CategorizedFilters types
* Move more schemas in hotel router
* Fix deps
* fix getNonContentstackUrls
* Fix import error
* Fix entry error handling
* Fix generateMetadata metrics
* Fix alertType enum
* Fix duplicated types
* lint:fix
* Merge branch 'master' into feat/sw-2863-move-contentstack-router-to-trpc-package
* Fix broken imports
* Merge branch 'master' into feat/sw-2863-move-contentstack-router-to-trpc-package
Approved-by: Linus Flood
2025-06-26 07:53:01 +00:00
Anton Gunnarsson
846fd904a6
Merged in feat/sw-2859-set-up-shared-trpc-package (pull request #2319 )
...
feat(SW-2859): Create trpc package
* Add isEdge, safeTry and dataCache to new common package
* Add eslint and move prettier config
* Clean up tests
* Create trpc package and move initialization
* Move errors and a few procedures
* Move telemetry to common package
* Move tokenManager to common package
* Add Sentry to procedures
* Clean up procedures
* Fix self-referencing imports
* Add exports to packages and lint rule to prevent relative imports
* Add env to trpc package
* Add eslint to trpc package
* Apply lint rules
* Use direct imports from trpc package
* Add lint-staged config to trpc
* Move lang enum to common
* Restructure trpc package folder structure
* Fix lang imports
Approved-by: Linus Flood
2025-06-18 12:14:20 +00:00
Christian Andolf
9551a629fa
refactor: move divider to design system
...
remove not used variants and duplicate colors
2025-06-13 11:27:50 +02:00
Christian Andolf
7fdffb8e1d
feat(LOY-243): add change name disclaimer to profile
2025-06-09 12:46:28 +02:00
Anton Gunnarsson
cbf9e7b7c2
Merged in chore/next15 (pull request #1999 )
...
chore (SW-834): Upgrade to Next 15
* wip: apply codemod and upgrade swc plugin
* wip: design-system to react 19, fix issues from async (search)params
* wip: fix remaining issues from codemod
serverClient is now async because context use headers()
getLang is now async because it uses headers()
* Minor cleanup
* Inline react-material-symbols package
Package is seemingly not maintained any more and doesn't support
React 19. This copies the package source into `design-system`,
makes the necessary changes for 19 and export it for others to use.
* Fix missing awaits
* Disable modal exit animations
Enabling modal exit animations via isExiting prop is causing
modals to be rendered in "hidden" state and never unmount.
Seems to be an issue with react-aria-components,
see https://github.com/adobe/react-spectrum/issues/7563 .
Can probably be fixed by rewriting to a solution similar to
https://react-spectrum.adobe.com/react-aria/examples/framer-modal-sheet.html
* Remove unstable cache implementation and use in memory cache locally
* Fix ref type in SelectFilter
* Use cloneElement to add key prop to element
Approved-by: Linus Flood
2025-06-02 11:11:50 +00:00
Christian Andolf
aa06a0654d
fix: cleanup profile pages in renaming to follow naming convention
...
cleanup profile page html to be valid
replace old temp design system components with new ones
divider is now correctly an hr element
less section elements to be valid html
2025-05-23 09:20:21 +02:00
