Skip to content

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

Feature/improve subscription interstitial (#4612)

Thomas Kaulb2dcb1e7ac57
diff --git a/apps/api/src/app/user/user.service.ts b/apps/api/src/app/user/user.service.ts
index d9e4198127..cf55b8862d 100644
--- a/apps/api/src/app/user/user.service.ts
+++ b/apps/api/src/app/user/user.service.ts
@@ -356,18 +356,20 @@ export class UserService {
new Date(),
user.createdAt
);
- let frequency = 10;
+ let frequency = 7;
- if (daysSinceRegistration > 365) {
+ if (daysSinceRegistration > 720) {
+ frequency = 1;
+ } else if (daysSinceRegistration > 360) {
frequency = 2;
} else if (daysSinceRegistration > 180) {
frequency = 3;
} else if (daysSinceRegistration > 60) {
frequency = 4;
} else if (daysSinceRegistration > 30) {
- frequency = 6;
+ frequency = 5;
} else if (daysSinceRegistration > 15) {
- frequency = 8;
+ frequency = 6;
}
if (Analytics?.activityCount % frequency === 1) {
diff --git a/apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.component.ts b/apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.component.ts
index d98c54719a..201a639272 100644
--- a/apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.component.ts
+++ b/apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.component.ts
@@ -1,5 +1,14 @@
-import { ChangeDetectionStrategy, Component, Inject } from '@angular/core';
+import {
+ ChangeDetectionStrategy,
+ ChangeDetectorRef,
+ Component,
+ Inject,
+ OnInit
+} from '@angular/core';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import ms from 'ms';
+import { interval, Subject } from 'rxjs';
+import { take, takeUntil, tap } from 'rxjs/operators';
import { SubscriptionInterstitialDialogParams } from './interfaces/interfaces';
@@ -11,20 +20,47 @@ import { SubscriptionInterstitialDialogParams } from './interfaces/interfaces';
templateUrl: 'subscription-interstitial-dialog.html',
standalone: false
})
-export class SubscriptionInterstitialDialog {
- private readonly VARIANTS_COUNT = 2;
+export class SubscriptionInterstitialDialog implements OnInit {
+ private static readonly SKIP_BUTTON_DELAY_IN_SECONDS = 5;
+ private static readonly VARIANTS_COUNT = 2;
+ public remainingSkipButtonDelay =
+ SubscriptionInterstitialDialog.SKIP_BUTTON_DELAY_IN_SECONDS;
public routerLinkPricing = ['/' + $localize`:snake-case:pricing`];
public variantIndex: number;
+ private unsubscribeSubject = new Subject<void>();
+
public constructor(
+ private changeDetectorRef: ChangeDetectorRef,
@Inject(MAT_DIALOG_DATA) public data: SubscriptionInterstitialDialogParams,
public dialogRef: MatDialogRef<SubscriptionInterstitialDialog>
) {
- this.variantIndex = Math.floor(Math.random() * this.VARIANTS_COUNT);
+ this.variantIndex = Math.floor(
+ Math.random() * SubscriptionInterstitialDialog.VARIANTS_COUNT
+ );
+ }
+
+ public ngOnInit() {
+ interval(ms('1 second'))
+ .pipe(
+ take(SubscriptionInterstitialDialog.SKIP_BUTTON_DELAY_IN_SECONDS),
+ tap(() => {
+ this.remainingSkipButtonDelay--;
+
+ this.changeDetectorRef.markForCheck();
+ }),
+ takeUntil(this.unsubscribeSubject)
+ )
+ .subscribe();
}
public closeDialog() {
this.dialogRef.close({});
}
+
+ public ngOnDestroy() {
+ this.unsubscribeSubject.next();
+ this.unsubscribeSubject.complete();
+ }
}
diff --git a/apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html b/apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html
index b9b96f9a82..92d9da835a 100644
--- a/apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html
+++ b/apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html
@@ -51,7 +51,16 @@
</div>
</div>
<div class="justify-content-end" mat-dialog-actions>
- <button i18n mat-button (click)="closeDialog()">Skip</button>
+ <button
+ mat-button
+ [disabled]="remainingSkipButtonDelay > 0"
+ (click)="closeDialog()"
+ >
+ <ng-container i18n>Skip</ng-container>
+ @if (remainingSkipButtonDelay > 0) {
+ ({{ remainingSkipButtonDelay }})
+ }
+ </button>
<a
color="primary"
mat-flat-button
@@ -80,8 +89,16 @@
</div>
</div>
<div class="flex-column" mat-dialog-actions>
- <button class="mb-2 py-4 w-100" i18n mat-button (click)="closeDialog()">
- Skip
+ <button
+ class="mb-2 py-4 w-100"
+ mat-button
+ [disabled]="remainingSkipButtonDelay > 0"
+ (click)="closeDialog()"
+ >
+ <ng-container i18n>Skip</ng-container>
+ @if (remainingSkipButtonDelay > 0) {
+ ({{ remainingSkipButtonDelay }})
+ }
</button>
<a
class="m-0 py-4 w-100"
diff --git a/apps/client/src/app/services/user/user.service.ts b/apps/client/src/app/services/user/user.service.ts
index 99bfdb4580..86b2656d79 100644
--- a/apps/client/src/app/services/user/user.service.ts
+++ b/apps/client/src/app/services/user/user.service.ts
@@ -121,6 +121,7 @@ export class UserService extends ObservableStore<UserStoreState> {
data: {
user
} as SubscriptionInterstitialDialogParams,
+ disableClose: true,
height: this.deviceType === 'mobile' ? '98vh' : '80vh',
width: this.deviceType === 'mobile' ? '100vw' : '50rem'
});