Skip to content

Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍

Bugfix/visibility of Try Premium button (#8187)

Thomas Kaul2869eed07a32
diff --git a/apps/client/src/app/components/user-account-membership/user-account-membership.html b/apps/client/src/app/components/user-account-membership/user-account-membership.html
index ae23dc9860..f18da13ed9 100644
--- a/apps/client/src/app/components/user-account-membership/user-account-membership.html
+++ b/apps/client/src/app/components/user-account-membership/user-account-membership.html
@@ -50,7 +50,7 @@
}
}
<div class="align-items-center d-flex justify-content-center mt-4">
- @if (!user?.subscription?.expiresAt) {
+ @if (!user?.subscription?.subscribedAt) {
<a
class="mx-1"
mat-stroked-button
diff --git a/apps/client/src/app/services/user/user.service.ts b/apps/client/src/app/services/user/user.service.ts
index 38e9bebc99..2fc6d399a6 100644
--- a/apps/client/src/app/services/user/user.service.ts
+++ b/apps/client/src/app/services/user/user.service.ts
@@ -151,6 +151,16 @@ export class UserService extends ObservableStore<UserStoreState> {
user.settings.retirementDate = parseISO(user.settings.retirementDate);
}
+ if (user.subscription?.expiresAt) {
+ user.subscription.expiresAt = parseISO(user.subscription.expiresAt);
+ }
+
+ if (user.subscription?.subscribedAt) {
+ user.subscription.subscribedAt = parseISO(
+ user.subscription.subscribedAt
+ );
+ }
+
this.setState({ user }, UserStoreActions.GetUser);
if (
diff --git a/libs/common/src/lib/interfaces/user.interface.ts b/libs/common/src/lib/interfaces/user.interface.ts
index ff0f6646f5..aa079c1219 100644
--- a/libs/common/src/lib/interfaces/user.interface.ts
+++ b/libs/common/src/lib/interfaces/user.interface.ts
@@ -27,6 +27,7 @@ export interface User {
subscription: {
expiresAt?: Date;
offer: SubscriptionOffer;
+ subscribedAt?: Date;
type: SubscriptionType;
};
tags: (Tag & { isUsed: boolean })[];