Commit Graph

46 Commits

Author SHA1 Message Date
Christel Westerberg
1b8cc891c9 fix: refactor away subtitleParam 2024-09-06 11:37:00 +02:00
Tobias Johansson
fd9d6d5a1c fix: wrong prop name 2024-09-05 11:38:13 +02:00
Tobias Johansson
238de4cd3a Merged in feat/CJ-17-points-expiration-table (pull request #527)
Feat/CJ-17 points expiration table

* feat(CJ-17): Added point expiration table and refactored to use Table component

* feat(CJ-17): Use Table component inside Row

* fix(CJ-117): Added missing css class and update date formatting

* fix(CJ-117): Added copy of membershipLevel route with a protectedProcedure


Approved-by: Christel Westerberg
2024-09-05 09:28:25 +00:00
Tobias Johansson
bc3233ff64 Merged in feat/SW-196-design-fixes (pull request #547)
Feat/SW-196 design fixes

* feat(SW-196): Updated copy My credit cards -> My payment cards

* fix: update design system version

* feat(SW-196): Update Header component to use Preamble instead of Subtitle

* feat(SW-196): Minor design fixes


Approved-by: Christel Westerberg
2024-09-03 08:43:13 +00:00
Tobias Johansson
fb581ad489 fix: hide clickable booking url in webview 2024-08-23 11:01:07 +02:00
Tobias Johansson
159114a082 Merged in feat/SW-165-fixes (pull request #460)
Feat/SW-165 fixes

* fix(SW-165): update translations for reward labels

* fix(SW-165): Fix sorting and filtering of transactions and hide fields when BALFWD

* fix(SW-165): update condition


Approved-by: Michael Zetterberg
2024-08-22 14:34:55 +00:00
Tobias Johansson
1ec1033267 Merged in feat/SW-165-correct-labels (pull request #427)
Feat/SW-165 correct labels

* feat(SW-165): sort friend transactions and return additional properties

* feat(SW-165): Added points being calculated label

* feat(SW-165): added transactionDate for transactions without checkinDate

* feat(SW-165): Updated description copy for various reward types

* feat(SW-165): filter out expired transactions

* feat(SW-165): removed Mobile table and unified them into Table instead

* feat(SW-165): Added bookingUrl to friend transactions

* fix(SW-165): style fixes

* fix(SW-165): fix issues from merge

* fix(SW-165): remove comment

* fix(SW-165): fixed booking urls not being set and smaller fixes

* fix(SW-165): added comment regarding 'BALFWD'


Approved-by: Michael Zetterberg
Approved-by: Christel Westerberg
2024-08-21 13:54:55 +00:00
Arvid Norlin
cadcf2a13f chore: remove redundant css rule 2024-08-21 09:44:28 +02:00
Arvid Norlin
7e719bc475 chore: move typings 2024-08-21 09:44:28 +02:00
Arvid Norlin
0453728696 chore: make pagination scale somewhat better on small devices awaiting design feedback on ellipsises 2024-08-21 09:44:28 +02:00
Arvid Norlin
b0358ffa0e chore: break out pagination component 2024-08-21 09:44:28 +02:00
Arvid Norlin
a14157696e fix: remove initialData to avoid page load issues 2024-08-21 09:44:28 +02:00
Arvid Norlin
f96712538e refactor: implement trpc client pattern for EarnAndBurn Journey 2024-08-21 09:44:28 +02:00
Arvid Norlin
1bcd3b81e1 chore: move totalPages to meta 2024-08-21 09:44:28 +02:00
Arvid Norlin
8c75b9bcd7 wip: initial stab trpc pagination 2024-08-21 09:44:25 +02:00
Arvid Norlin
6c15f1ae3a chore: remove destructuring of intl.formatMessage 2024-08-21 09:43:51 +02:00
Arvid Norlin
6f293be3a7 feat(SW-164): Add pagination for friendship transactions 2024-08-21 09:43:51 +02:00
Niclas Edenvin
e67212bd94 Merged in feature/refactor-lang (pull request #387)
feat: SW-238 Avoid prop drilling of lang

Approved-by: Michael Zetterberg
2024-08-14 11:00:20 +00:00
Michael Zetterberg
bc84122a40 fix(SW-236): properly handle expired token in webviews
Trying out a new pattern for errors in data fetching.

Next.js is not a fan of throwing errors. Instead it recommends returning
different shapes for each state. Ref:
https://nextjs.org/docs/app/building-your-application/routing/error-handling#handling-expected-errors-from-server-components

It requires some more detailing and a bit more refactoring in non webview part,
but it is a start. This webview specific implementation should not break web.
2024-08-13 16:54:33 +02:00
Arvid Norlin
1230df86d0 chore: remove obsolete CurrentPointsBalance component since unused 2024-08-10 08:23:54 +02:00
Michael Zetterberg
49ec390599 fix(SW-234): better empty state message for no transactions 2024-08-09 12:40:29 +02:00
Simon Emanuelsson
c94b83464f fix(SW-113): add colors to negative and positive point transactions 2024-08-06 14:11:10 +02:00
Matilda Landström
801a041404 Merged in feat/best-friend-hero (pull request #338)
Feat(SW-170): Update overview hero

Approved-by: Christel Westerberg
2024-07-12 06:45:44 +00:00
Christel Westerberg
9ede5e4210 fix: remove pagination from friends endpoints since it is no longer supported 2024-07-11 15:00:46 +02:00
Christel Westerberg
6b5606fc8b fix: design review comments 2024-07-10 16:01:28 +02:00
Matilda Landström
c6ad107e49 Merged in feat/section-header-link (pull request #314)
Feat(WEB-359): Update section link for mobile

Approved-by: Chuma Mcphoy (We Ahead)
Approved-by: Arvid Norlin
2024-07-04 10:42:01 +00:00
Michael Zetterberg
1a6a31bfe9 fix: bg for tables 2024-06-20 08:02:09 +02:00
Michael Zetterberg
2002604711 fix: bg color on earn and burn table rows 2024-06-20 07:44:27 +02:00
Matilda Landström
edb45b4ac7 chore: update colors to new design 2024-06-19 17:52:19 +02:00
Simon Emanuelsson
d84efcbb0f feat(WEB-162): final design edit profile page 2024-06-19 14:51:00 +02:00
Christel Westerberg
ceee9fd154 refactor: break out Section container 2024-06-18 16:21:06 +02:00
Matilda Landström
9931d9edef Merged in feat/membership-information (pull request #233)
Feat(WEB-307) Display correct membership information

* fix: fix typo

* chore: update fetch of user membership

* chore: update components to use api data

* chore: remove lang as static value

* fix: adapt to dev updates

* fix: adapt to code from dev

* fix: break out MembershipLevel into its a React component

* fix: add enum to zod validation

* refactor: rename tier to level

* refactor: remove unnecessary casts

* refactor: change toString() to hideEmpty=false

* refactor: remove toString()

* refactor: remove hideEmpty from title and subtitle

* fix: update currentLevel with data

* fix: fix from rebase


Approved-by: Michael Zetterberg
2024-06-18 13:14:09 +00:00
Simon Emanuelsson
aca9221ea6 feat: loosen up the zod validations and return null instead of throwing 2024-06-18 12:28:05 +02:00
Christel Westerberg
b4f57d5ae3 refactor: breakout section header 2024-06-14 08:29:36 +02:00
Arvid Norlin
85aab88aec chore: improve typings 2024-06-10 11:51:22 +02:00
Arvid Norlin
24810eaee6 implement logic to select compared levels based on membershipLevel 2024-06-10 10:49:57 +02:00
Simon Emanuelsson
de79c2dc80 feat(WEB-220): label translations 2024-06-05 13:25:10 +02:00
Arvid Norlin
470e308480 chore: css fixes 2024-05-23 15:42:52 +02:00
Arvid Norlin
6cb1ee5385 chore: remove mock data 2024-05-23 15:25:08 +02:00
Arvid Norlin
1d481ba86d fix: adjust earn and burn mobile view 2024-05-23 14:59:26 +02:00
Arvid Norlin
672b1176d6 feat: add initial mobile layout for earn and burn 2024-05-23 14:59:26 +02:00
Arvid Norlin
90bd302715 fix: adjust table scaling 2024-05-23 14:59:26 +02:00
Arvid Norlin
607334aad5 fix: temp disable features using unavailable data 2024-05-23 14:59:26 +02:00
Arvid Norlin
795fe400cb fix: update friendTransaction model according to API 2024-05-23 14:59:26 +02:00
Arvid Norlin
9ef9de840c feat: add data handling to EarnAndBurn 2024-05-23 14:59:26 +02:00
Arvid Norlin
7ad8726633 feat: add initial support for points page 2024-05-23 14:59:26 +02:00