Commit Graph

102 Commits

Author SHA1 Message Date
Christian Andolf
409ba5bf4c Merged in feat/LOY-134-add-informative-reward-modal (pull request #1307)
feat(LOY-134): display informative rewards and modal

Approved-by: Chuma Mcphoy (We Ahead)
2025-02-13 10:13:35 +00:00
Joakim Jäderberg
6f51130e48 Merged in feature/hardcoded-mypages-links (pull request #1325)
Feature/hardcoded mypages links

* feat: wip use hardcoded links

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feature/hardcoded-mypages-links

* feat: use hardcoded links for my pages to support dynamic links

* cleanup

* code fixes

* refactor: restructure MyPagesMobileDropdown component for improved readability

* use util timeout function


Approved-by: Christian Andolf
Approved-by: Linus Flood
2025-02-13 09:28:30 +00:00
Christian Andolf
509c83868d feat(LOY-134): display informative rewards and modal 2025-02-13 10:16:02 +01:00
Linus Flood
cac090df34 Merged in fix/translations-my-points (pull request #1324)
Fix/translations my points

* feat: my points - fixed translations

* feat: my points - fixed translations

* Revert test script
2025-02-12 14:32:29 +00:00
Joakim Jäderberg
3d11cfb50a Merged in feature/sas-mypages (pull request #1302)
Feature/sas mypages

* feat: Add SAS partner page under my pages
* fix: feature toggle SAS Partner page in my pages
* add translations for SAS account page
* use 'flex-start' instead of 'start'
* fix: flatten css
* fix: don't use <SectionContainer /> on linkedAccounts page
2025-02-11 12:55:00 +00:00
Anton Gunnarsson
6eb01750e8 Merged in fix/move-sas-comparison-to-dynamic-content (pull request #1279)
Move SASTierComparison block to DynamicContent

Approved-by: Erik Tiekstra
2025-02-11 09:36:41 +00:00
Linus Flood
0800c877a3 Merged in fix/hotjar-suppress-fixes (pull request #1192)
fix: hotjar - suppress personal data

* fix: hotjar - suppress personal data

* More suppressing
2025-02-04 06:47:36 +00:00
Christian Andolf
a5776d7256 fix: sticky table header no longer has transparent background 2025-02-03 14:00:57 +01:00
Christian Andolf
137d2cf499 fix(LOY-104): reduce text in tables to not break mobile design
adjusted padding to show points required on one row
2025-01-30 16:36:29 +01:00
Christian Andolf
091b851d41 fix(LOY-39): fix redeem back button to actually go back to initial step 2025-01-27 16:43:35 +01:00
Christian Andolf
633d259ce0 fix(LOY-39): refetch rewards when redeemed
update expiration date text

possible to redeem rewards with coupon code
2025-01-20 09:53:17 +01:00
Erik Tiekstra
5018cba623 feat(SW-1269): added dynamic content to collection page 2025-01-14 14:56:18 +01:00
Michael Zetterberg
dd71ff8fa7 fix(i18n): prepare for Lokalise 2025-01-14 13:11:06 +01:00
Chuma McPhoy
c976d187be fix(LOY-62): conditionally render ScriptedRewardText based on showRedeem flag 2025-01-14 10:17:22 +01:00
Chuma McPhoy
655103a0b5 refactor(LOY-62): revert to switch case for ScriptedRewardText label text 2025-01-14 10:17:22 +01:00
Chuma McPhoy
da31539610 refactor(LOY-62): implement code review feedback 2025-01-14 10:17:22 +01:00
Chuma McPhoy
e0d8315565 fix(LOY-62): use correct voucher rewardType value 2025-01-14 10:17:22 +01:00
Chuma McPhoy
dc7e6df006 chore(LOY-62): Add case and translations for vouchers 2025-01-14 10:17:22 +01:00
Chuma McPhoy
0edd615925 feat(LOY-62): Add ScriptedRewardText component 2025-01-14 10:17:22 +01:00
Michael Zetterberg
0477d2375b chore: refactor points 2025-01-13 13:37:12 +01:00
Michael Zetterberg
d2ce9c0d7c fix(i18n): prepare for Lokalise 2025-01-13 13:35:03 +01:00
Christian Andolf
56276a6f19 fix: added some missing redeem flow translations and fixed copy on button 2025-01-09 16:54:29 +01:00
Christian Andolf
9452f24df9 feat(LOY-63): add promo code badge to campaign redeem 2025-01-09 09:47:26 +01:00
Christian Andolf
6941c1d006 fix(LOY-63): move redeem flows to separate folder
add use client directive
2025-01-09 09:47:26 +01:00
Christian Andolf
9584478b34 feat(LOY-63): redeem campaign 2025-01-09 09:47:26 +01:00
Arvid Norlin
0c7c6ea21a feat: add Price details modal 2024-12-20 09:28:06 +01:00
Linus Flood
ec0a87aed7 feat/sw-1266: mask private info in hotjar recordings 2024-12-19 11:00:00 +01:00
Linus Flood
711bf4b2d3 feat/valid-session: check valid user/session from token instead of making a slow request to api 2024-12-17 15:15:55 +01:00
Chuma McPhoy
01c0d5c35e fix(LOY-64): lowercase s on membershipbadge 2024-12-13 14:57:16 +01:00
Chuma McPhoy
9d9084f60d fix(LOY-64): memoize getCurrentRewards call 2024-12-13 14:57:16 +01:00
Chuma McPhoy
079d8dbf33 fix(LOY-64): lint fix 2024-12-13 14:57:16 +01:00
Chuma McPhoy
9247ea0e9c fix(LOY-64): abstract membershipbadge to its own component 2024-12-13 14:57:16 +01:00
Chuma McPhoy
839655d4df fix(LOY-64): use memberId in conditonal 2024-12-13 14:57:16 +01:00
Chuma McPhoy
aa9e2e0a1b chore(LOY-64): remove unused import 2024-12-13 14:57:16 +01:00
Chuma McPhoy
c33f125332 chore(LOY-64): better organisation of reward types and data 2024-12-13 14:57:16 +01:00
Chuma McPhoy
87ff783c87 fix(LOY-64): remove uneeded css 2024-12-13 14:57:16 +01:00
Chuma McPhoy
457f2b942d feat(LOY-64): add ActiveRedeemedBadge UI for on site tier rewards 2024-12-13 14:57:16 +01:00
Christian Andolf
e08e960209 chore: add consistent type imports 2024-12-12 11:47:44 +01:00
Christian Andolf
4b51b5aff6 Merged in fix/hide-cs-rewards-flag (pull request #1065)
fix: hide new cs rewards model behind feature flag

Approved-by: Michael Zetterberg
Approved-by: Chuma Mcphoy (We Ahead)
2024-12-11 08:55:46 +00:00
Chuma McPhoy
7b7b5717d5 fix(LOY-10): proper formatting 2024-12-11 09:40:41 +01:00
Chuma McPhoy
4aab9c01ef fix(LOY-10): remove unsused import 2024-12-11 09:40:41 +01:00
Chuma McPhoy
f403ac62df fix(LOY-10): use RewardIcon in redeem modal 2024-12-11 09:40:41 +01:00
Chuma McPhoy
c94d36afb2 fix(LOY-10): type import 2024-12-11 09:40:41 +01:00
Chuma McPhoy
5933380bd8 fix(LOY-10): provide fallback icon for current rewards 2024-12-11 09:40:41 +01:00
Chuma McPhoy
5464efb7a8 fix(LOY-10): remove uneeded css and icon wrapper 2024-12-11 09:40:41 +01:00
Chuma McPhoy
6babb667e4 fix(LOY-10): move types to type folder 2024-12-11 09:40:41 +01:00
Chuma McPhoy
d897bd81ac chore(LOY-10): rename folder to CurrentRewards 2024-12-11 09:40:41 +01:00
Chuma McPhoy
13551417ed feat(LOY-10): dynamic icons based on reward id 2024-12-11 09:40:41 +01:00
Christian Andolf
0d607d7cc7 fix: hide new cs rewards model behind feature flag 2024-12-10 16:26:20 +01:00
Chuma McPhoy
80f7e8e7f8 fix(LOY-53): scroll to top of current rewards on page change 2024-12-10 09:48:59 +01:00