Fix mapping pro subscription

tonkeeper · Apr 15, 2024 · ea18a74 · ea18a74
1 parent 729d0ef
commit ea18a74
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 17 deletions.
diff --git a/packages/core/src/entries/pro.ts b/packages/core/src/entries/pro.ts
@@ -37,7 +37,7 @@ export interface ProSubscriptionInvalid {
 export function isTrialSubscription(
     subscription: ProSubscription
 ): subscription is ProSubscriptionTrial {
-    return subscription.isTrial;
+    return subscription.isTrial && subscription.valid;
 }
 
 export function isValidSubscription(

diff --git a/packages/core/src/service/proService.ts b/packages/core/src/service/proService.ts
@@ -88,31 +88,30 @@ export const loadProState = async (
     const subscriptionDTO = await ProServiceService.proServiceVerify();
 
     let subscription: ProSubscription;
-    if (subscriptionDTO.is_trial) {
-        subscription = {
-            valid: true,
-            isTrial: true,
-            usedTrial: true,
-            trialUserId: user.tg_id!,
-            trialEndDate: new Date(subscriptionDTO.next_charge! * 1000)
-        };
-    } else {
-        if (subscriptionDTO.valid) {
+    if (subscriptionDTO.valid) {
+        if (subscriptionDTO.is_trial) {
             subscription = {
                 valid: true,
-                isTrial: false,
-                usedTrial: subscriptionDTO.used_trial,
-                nextChargeDate: new Date(subscriptionDTO.next_charge! * 1000)
+                isTrial: true,
+                usedTrial: true,
+                trialUserId: user.tg_id!,
+                trialEndDate: new Date(subscriptionDTO.next_charge! * 1000)
             };
         } else {
             subscription = {
-                valid: false,
+                valid: true,
                 isTrial: false,
-                usedTrial: subscriptionDTO.used_trial
+                usedTrial: subscriptionDTO.used_trial,
+                nextChargeDate: new Date(subscriptionDTO.next_charge! * 1000)
             };
         }
+    } else {
+        subscription = {
+            valid: false,
+            isTrial: false,
+            usedTrial: subscriptionDTO.used_trial
+        };
     }
-
     return {
         subscription,
         hasWalletAuthCookie: !!user.pub_key,