Commit Graph

20 Commits

Author SHA1 Message Date
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
Anton Gunnarsson
c27290717b Merged in fix/sw-2767-expire-text-align-right (pull request #2181)
Align tier match expire date right

* Align tier match expire date right


Approved-by: Christian Andolf
2025-05-23 08:15:39 +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
d6b70edfa3 chore: replace old border-radius variables with new tokens 2025-05-05 11:11:37 +02:00
Anton Gunnarsson
d8a48735a4 Merged in fix/sw-2557-sas-english-copy-fixes (pull request #1915)
Fixes for English copy in SAS flow

* Update noBoost message

* Update unlink warning copy


Approved-by: Linus Flood
2025-05-02 12:18:27 +00:00
Anton Gunnarsson
f4fe2e3a4a Merged in fix/sw-2548-invalid-tier-expiry-for-sas-eb-basic (pull request #1908)
Handle invalid tier expiry 1900-01-01 from SAS

* Handle invalid tier expiry 1900-01-01 from SAS

* Set correct sasTierExpirationDate


Approved-by: Linus Flood
2025-04-30 08:11:35 +00: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
f87ea51b11 Merged in feature/sw-1881-boosted-by-scandic (pull request #1780)
Show boosted by scandic in SAS Linked Accounts

* Add boostedByScandic property to SAS membership

* Use get profile with extended partner data

* Display correct tier when EB is boosted by SF


Approved-by: Joakim Jäderberg
2025-04-14 13:14:01 +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
5cb19dfccd Merged in feat/sw-1313-show-sas-points (pull request #1682)
SW-1313 - Add support for getting SAS EB points

Approved-by: Joakim Jäderberg
2025-04-08 11:03:38 +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
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
Anton Gunnarsson
67905198c6 Merged in fix/sas-english-copy (pull request #1695)
Update english copy for SAS related flows

* Update english copy for SAS related flows

* Add new copy to all languages

* Add use client directive to loading to use translations


Approved-by: Joakim Jäderberg
2025-04-02 11:49:12 +00:00
Anton Gunnarsson
30c01a6000 Merged in feat/feature-flag-sas-point-transfer (pull request #1686)
Add feature flag for SAS point transfer

* Add feature flag for specifically SAS point transfer


Approved-by: Linus Flood
2025-04-01 07:55:46 +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
Anton Gunnarsson
8d1e9954d4 Merged in fix/sas-unlink-missing-intl (pull request #1534)
Add missing intl keys for SAS unlink flow

Approved-by: Linus Flood
2025-03-19 09:12:36 +00:00
Anton Gunnarsson
d0b6f3f8b3 Merged in feat/sw-1314-transfer-sas-points (pull request #1508)
SW-1314 Transfer SAS points

Approved-by: Linus Flood
2025-03-18 10:07:05 +00: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
Anton Gunnarsson
393546d35d Merged in feat/sw-1291-show-sas-membership-data (pull request #1503)
Show SAS membership data in Linked Accounts

* Rip out old styling

* Desktop version of new linked accounts design

* Use new design system tokens

* Refactor SASLinkedAccount to handle all states

* Improve small screen styling

* Add intl etc

* Skeletons

* Tiny fixes

* Add i18n keys to all languages


Approved-by: Linus Flood
2025-03-10 10:13:18 +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