Commit Graph

32 Commits

Author SHA1 Message Date
Christian Andolf 6fad2a6022 fix: handle non loaded surprises in case they're returned as null from server 2025-05-19 10:59:55 +02:00
Christian Andolf 84d4faf6df fix(LOY-199): add missing benefits link 2025-05-19 09:15:50 +02:00
Anton Gunnarsson 94a00d40b7 Merged in feat/sw-2526-update-sas-error-handling-after-api-changes (pull request #1886)
SW-2526 - Update error handling for link SAS account

* Update error handling for link SAS account

* Capture schema validation error and send to Sentry

* Add cases for unhandled otp errors


Approved-by: Joakim Jäderberg
2025-05-12 11:48:31 +00:00
Anton Gunnarsson 60af31762b Merged in fix/make-user-loyalty-optional (pull request #2044)
fix: Make loyalty optional on user

* Optional user loyalty

* merge


Approved-by: Joakim Jäderberg
Approved-by: Linus Flood
2025-05-12 09:00:11 +00:00
Christian Andolf 2b32a9c1ff chore: rename functions to make more sense 2025-05-09 09:57:55 +02:00
Christian Andolf 485fddfa3d fix: make sure of design system button and inherent typography props 2025-05-09 09:57:40 +02:00
Christian Andolf 494f44f216 Merged in feat/LOY-198-dtmc-card-animation (pull request #2010)
feat(LOY-198): dtmc card animation when hovering

Approved-by: Chuma Mcphoy (We Ahead)
2025-05-08 14:55:06 +00:00
Christian Andolf 53c21bb601 feat(LOY-199): add benefits link to dtmc modal 2025-05-08 14:25:16 +02:00
Christian Andolf d53b07b907 feat(LOY-198): dtmc card animation when hovering 2025-05-08 11:59:20 +02:00
Christian Andolf 62eef660fe feat(LOY-197): add screen wake lock to dtmc 2025-05-07 14:01:51 +02:00
Christian Andolf 0066c058e3 fix(LOY-196): change svg color to be derived from css and variables instead 2025-05-07 10:48:08 +02:00
Christian Andolf 8ca0aee25e fix(LOY-196): replace employee number with dummy value
add support for className to modal
2025-05-07 10:32:32 +02:00
Christian Andolf 9b22459837 feat(LOY-196): add modal to dtmc button containing card 2025-05-06 15:08:54 +02:00
Christian Andolf 7359ab4afd feat(LOY-195): digital team member card button on my pages overview 2025-05-06 14:46:12 +02:00
Christian Andolf d6b70edfa3 chore: replace old border-radius variables with new tokens 2025-05-05 11:11:37 +02:00
Anton Gunnarsson 8f67e20300 Merged in fix/sw-2453-refresh-data-on-tier-match (pull request #1866)
Refresh page if tier match happens on My Pages SAS page

* Refresh page if tier match happens on My Pages SAS page


Approved-by: Joakim Jäderberg
2025-04-28 07:28:58 +00:00
Christian Andolf 8a9107cdf2 fix: now using the correct method to instantiate motion since its constructor is deprecated in favor of the create method 2025-04-16 14:11:24 +02:00
Anton Gunnarsson 700141f45e Merged in fix/sw-2413-tier-expiration-validation (pull request #1806)
SW-2413 Update tier expiration validation

* Update tier expiration validation

* Set tierExpires default to null


Approved-by: Christian Andolf
Approved-by: Joakim Jäderberg
Approved-by: Linus Flood
2025-04-16 08:32:20 +00:00
Anton Gunnarsson 3449ccec52 Merged in feat/sw-2232-sas-api-updates (pull request #1786)
SW-2232 Adapt SAS router to API changes

* Adapt sas procedures to api changes

* Remove debug logs

* Capture performLevelUpgrade error

* More sentry logging

* Merge branch 'master' into feat/sw-2232-sas-api-updates


Approved-by: Joakim Jäderberg
2025-04-14 13:42:58 +00:00
Michael Zetterberg 440e1f92df feat(SW-706): make eslint rule 'formatjs/no-literal-string-in-jsx' pass 2025-04-14 11:30:06 +00:00
Anton Gunnarsson c56a0b8ce9 Merged in feat/sw-1975-get-profile-v2 (pull request #1651)
Use get Profile V2 endpoint

Approved-by: Linus Flood
2025-04-08 06:26:00 +00:00
Christian Andolf 5e55b60807 fix: add new feature flag for surprises 2025-04-07 14:26:13 +02:00
Matilda Landström 1239f0c662 Merged in feat/SW-1711-SW-2077-icons (pull request #1709)
Fix(SW-1711)/(SW-2077): Export icons individually

* fix(SW-1711): export icons individually


Approved-by: Michael Zetterberg
Approved-by: Erik Tiekstra
2025-04-07 07:25:25 +00:00
Matilda Landström 5de2a993a7 Merged in feat/SW-1711-switch-icons (pull request #1558)
Switches out all the old icons to new ones, and moves them to the design system. The new icons are of three different types: Materialise Symbol, Nucleo, and Customized. Also adds further mapping between facilities/amenities and icons.

Approved-by: Michael Zetterberg
Approved-by: Erik Tiekstra
2025-03-27 09:42:52 +00:00
Christian Andolf f272dde1ef chore: remove unused filter modal
remove old cms model

refactor reward types
2025-03-26 09:55:26 +01:00
Christian Andolf 45d57a9c89 fix(LOY-175): fix issues of getting correct expiration date on reward coupon 2025-03-26 09:55:26 +01:00
Christian Andolf b86347b4f4 refactor(LOY-175): rewrite reward types according to new api endpoints 2025-03-26 09:55:26 +01:00
Christian Andolf ac8df04c49 fix(LOY-192): fix toasts for surprises in webviews 2025-03-20 16:27:24 +01:00
Anton Gunnarsson 29f0eb4f21 Merged in feat/sw-1732-trigger-tier-match (pull request #1408)
SW-1732 Trigger SAS tier match

* Add endpoint for SAS tier match

* Add comment about future fix

* Move tier match to background request on my-pages/*

* Log result from tier match

* Clean up name etc

* Fix tier matched toast

Approved-by: Joakim Jäderberg
2025-03-13 14:12:31 +00:00
Christian Andolf b45157818f feat(LOY-154): add expiration date to rewards 2025-03-11 16:25:33 +01:00
Chuma Mcphoy (We Ahead) 738c0e223f Merged in feat/LOY-156-localize-user-languages (pull request #1452)
feat(LOY-156): Improve language handling and localization in profile page

* feat(LOY-156): Improve language handling and localization in profile page

* refactor(LOY-156): Improve language display using Intl.DisplayNames

* feat(LOY-156): Enhance country display with localized country names

* refactor(LOY-156): Move countries data to a dedicated constants file & more type safe country mapping

* feat(LOY-156): Update isValidLang to use languageSchema + German translation for membership terms and conditions

* chore(LOY-156): language handling in profile component


Approved-by: Christian Andolf
2025-03-03 12:55:05 +00:00
Anton Gunnarsson 80100e7631 Merged in monorepo-step-1 (pull request #1080)
Migrate to a monorepo setup - step 1

* Move web to subfolder /apps/scandic-web

* Yarn + transitive deps

- Move to yarn
- design-system package removed for now since yarn doesn't
support the parameter for token (ie project currently broken)
- Add missing transitive dependencies as Yarn otherwise
prevents these imports
- VS Code doesn't pick up TS path aliases unless you open
/apps/scandic-web instead of root (will be fixed with monorepo)

* Pin framer-motion to temporarily fix typing issue

https://github.com/adobe/react-spectrum/issues/7494

* Pin zod to avoid typ error

There seems to have been a breaking change in the types
returned by zod where error is now returned as undefined
instead of missing in the type. We should just handle this
but to avoid merge conflicts just pin the dependency for
now.

* Pin react-intl version

Pin version of react-intl to avoid tiny type issue where formatMessage
does not accept a generic any more. This will be fixed in a future
commit, but to avoid merge conflicts just pin for now.

* Pin typescript version

Temporarily pin version as newer versions as stricter and results in
a type error. Will be fixed in future commit after merge.

* Setup workspaces

* Add design-system as a monorepo package

* Remove unused env var DESIGN_SYSTEM_ACCESS_TOKEN

* Fix husky for monorepo setup

* Update netlify.toml

* Add lint script to root package.json

* Add stub readme

* Fix react-intl formatMessage types

* Test netlify.toml in root

* Remove root toml

* Update netlify.toml publish path

* Remove package-lock.json

* Update build for branch/preview builds


Approved-by: Linus Flood
2025-02-26 10:36:17 +00:00