scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,603 Commits 2 Branches 0 Tags
651a388fa38dc7d61265f16ae107df4e19dc004d
Commit Graph

59 Commits

Author SHA1 Message Date
Anton Gunnarsson
7e97b74c18 Merged in chore/remove-unused-code (pull request #2229) 
Remove unused code

* Remove unused scandic-web files

* Remove unused exports


Approved-by: Joakim Jäderberg
 2025-05-30 12:41:18 +00:00
Christian Andolf
6f585a2c1e fix(LOY-52): remove spinner on stay cards to prevent loading to spin indefinitely when opening link in a new tab 2025-05-26 17:19:03 +02: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
9af93fecda Update framer-motion 2025-05-22 14:00:38 +02:00
Niclas Edenvin
6a5350d681 Merged in fix/no-my-stay-for-external-bookings (pull request #2126) 
fix: Only link web and app bookings to my stay

Approved-by: Joakim Jäderberg
 2025-05-16 13:35:15 +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
7359ab4afd feat(LOY-195): digital team member card button on my pages overview 2025-05-06 14:46:12 +02:00
Christian Andolf
f681fa7675 Merged in chore/replace-corner-radius-variable-with-new (pull request #1943) 
chore: replace old border-radius variables with new tokens

Approved-by: Erik Tiekstra
 2025-05-05 11:24:48 +00:00
Joakim Jäderberg
5784822a1e Merged in feature/SW-2320-languagebased-hide-for-next-release (pull request #1937) 
Language based alternative to HIDE_FOR_NEXT_RELEASE

Approved-by: Anton Gunnarsson
 2025-05-05 10:53:28 +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
Christian Andolf
5f836b0c82 Merged in fix/prevent-jump-when-hover-card (pull request #1889) 
fix: prevent jumping layout when hovering card

Approved-by: Erik Tiekstra
 2025-04-29 07:42:45 +00:00
Christian Andolf
ffafdd24d1 Merged in fix/reduce-amount-of-section-elements (pull request #1883) 
fix: reduce the amount of section elements being used since most have no headers connected to them

Approved-by: Chuma Mcphoy (We Ahead)
 2025-04-29 07:03:37 +00:00
Christian Andolf
8501a12f8f fix: prevent jumping layout when hovering card 2025-04-28 16:41:50 +02:00
Christian Andolf
8ed74f08a4 fix: make proper use of type predicates and minor cleanup to avoid double ternary and reduce computation 2025-04-28 15:00:38 +02:00
Christian Andolf
32e95fcbbd fix: reduce the amount of section elements being used since most have no headers connected to them 2025-04-28 14:56:02 +02:00
Christian Andolf
265cecc22a Merged in fix/points-color-bug (pull request #1881) 
fix: text color on points is now correct when revisiting the page

Approved-by: Chuma Mcphoy (We Ahead)
 2025-04-28 12:49:02 +00:00
Simon Emanuelsson
ec087a3d15 feat: refactor of my stay 2025-04-28 12:40:52 +00:00
Christian Andolf
05fab4d2f6 fix: text color on points is now correct when revisiting the page 2025-04-28 14:33:03 +02:00
Chuma Mcphoy (We Ahead)
27aef3982e Merged in fix/LOY-222-find-my-booking-urls-for-prod (pull request #1817) 
Fix(LOY-222): Find my booking url handling

* fix(LOY-222): adapt findMyBooking url based on HIDE_FOR_NEXT_RELEASE

* feat(LOY-222): add current web paths for findMyBooking in multiple languages

* refactor(LOY-222): better env and new url constructions

* refactor(LOY-222): decouple env var handling from getCurrentWebUrl

* fix(LOY-222): update findMyBooking URL construction to use baseUrl

* fix(LOY-222): simplify findMyBooking URL handling for new web urls

* fix(LOY-222): Update Finnish path for hotel reservation lookup

* refactor(LOY-222): rename PUBLIC_URL to NEXT_PUBLIC_PUBLIC_URL for consistency


Approved-by: Christian Andolf
Approved-by: Linus Flood
 2025-04-22 07:03:23 +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
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
Christian Andolf
80a738af7b fix: set redeem description nullable in order to handle the transition from string to RTE 2025-04-14 08:57:56 +02: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
Linus Flood
84becd1bb3 Merged in fix/membership-icon-color (pull request #1750) 
fix: correct color on copy membership id icon

* fix: correct color on copy membership id icon


Approved-by: Christian Andolf
 2025-04-07 13:09:36 +00:00
Michael Zetterberg
7c82a565ae feat: improve instantiation of intl 2025-04-07 10:25:37 +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
Chuma Mcphoy (We Ahead)
56d5ad77d1 Merged in fix/SW-2068-correct-public-url-from-my-stays-overview-page (pull request #1694) 
feat(SW-2068): Link to Correct Public URL from within My Stays Overview Page

* feat(SW-2068): Link to Correct Public URL from within My Stays Overview Page

- Added language parameter to previous and upcoming stays queries.
- Updated Client components to utilize the new language hook.
- Refactored EmptyUpcomingStays component to dynamically generate links based on the current language.
- Adjusted user input validation to include optional language parameter.

* refactor(SW-2068): Update EmptyUpcomingStays components to use PUBLIC_URL + add utility to handle TLD based on language

* chore(SW-2068): Clarify TLD

* feat(SW-2068): documentation for getTldForLanguage

* refactor(SW-2068): Simplify booking URL construction in updateStaysBookingUrl

* refactor(SW-2068): Remove incorrect TLD update logic from booking URL construction

* refactor(SW-2068): Centralize booking URL paths using myBookingPath constant

* refactor(SW-2068): Streamline search params in booking URL construction logic in updateStaysBookingUrl


Approved-by: Christian Andolf
 2025-04-02 12:44:02 +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
Linus Flood
34e398d377 Merged in hotfix/mystays-show-more (pull request #1698) 
hotfix: my stays - pass language to trpc

* hotfix: my stays - pass language to trpc


Approved-by: Joakim Jäderberg
 2025-04-01 18:18:47 +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
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
0ae4c5db17 chore(LOY-175): remove references to old reward endpoints 2025-03-26 09:55:26 +01:00
Christian Andolf
d67d04e416 fix(LOY-206): add missing lang input to friends transactions query, handles both server and client side 2025-03-25 09:42:37 +01:00
Chuma Mcphoy (We Ahead)
c4f8ff8bb5 Merged in fix/LOY-173-membership-id-translations (pull request #1593) 
fix(LOY-173): update membership ID label translations

* fix(LOY-173): update membership ID label translations


Approved-by: Christian Andolf
 2025-03-24 07:49:05 +00:00
Chuma Mcphoy (We Ahead)
b0aea68ee5 Merged in fix/LOY-180-hide-filter-modal (pull request #1568) 
fix(LOY-180): remove use of FilterRewardsModal

* fix(LOY-180): remove use of FilterRewardsModal


Approved-by: Christian Andolf
 2025-03-19 12:07:02 +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
Michael Zetterberg
065ebb57c6 fix: more label fixes 2025-03-13 10:25:05 +01:00
Erik Tiekstra
689e9d72cb fix(SW-1886): Removed "firstItem" props from blocks as it generates multiple h1 tags on those pages 
* feat(SW-1886): Removed "firstItem" props from blocks as it generates multiple h1 tags on those pages


Approved-by: Fredrik Thorsson
Approved-by: Simon.Emanuelsson
 2025-03-12 14:09:20 +00:00
Chuma Mcphoy (We Ahead)
1ef6fd02c1 Merged in feat/LOY-55-Filter-Modal (pull request #1509) 
feat(LOY-55): Add FilterRewardsModal

* feat(LOY-55): Add rewards filtering functionality

- Implement dynamic rewards filtering by category and membership level
- Create FilterRewardsModal component for filtering rewards
- Add useFilteredRewards hook to handle filtering logic
- Update rewards schema and constants to support new filtering features
- Remove hardcoded page size and replace with constant

* fix(LOY-55): reuse existing tier to friend map

* refactor(LOY-55): fix checkbox onChange type safety

* refactor(LOY-55): Improve rewards filtering type safety and validation

* refactor(LOY-55): Update filter modal border color using design token


Approved-by: Christian Andolf
 2025-03-12 13:29:35 +00:00
Christian Andolf
b45157818f feat(LOY-154): add expiration date to rewards 2025-03-11 16:25:33 +01:00