update limit messages

Author: ButteryCrumpet

src/cloud/components/settings/TeamSubLimit.tsx

@@ -74,30 +74,32 @@ const TeamSubLimit = ({
           openSettingsTab('teamUpgrade')
         }}
       >
-        <p className='note-limit'>
-          {translate(lngKeys.SettingsSubLimitUsed, {
-            docsNb: currentSubInfo.info.progressLabel,
-          })}
-        </p>
-        <div className='progress-sm'>
-          <div
-            className={cc([
-              'progress-bar',
-              currentSubInfo.info.trialIsOver && 'over-limit',
-            ])}
-            style={{ width: `${currentSubInfo.info.rate}%` }}
-          />
-        </div>
-        <p className='note-limit'>
-          {translate(lngKeys.SettingsSubLimitTrialDate, {
-            date: format(currentSubInfo.info.endDate, 'dd MMM, yyyy'),
-          })}
-        </p>
+        {!currentSubInfo.info.cancelled && (
+          <>
+            <p className='note-limit'>
+              {translate(lngKeys.SettingsSubLimitUsed, {
+                docsNb: currentSubInfo.info.progressLabel,
+              })}
+            </p>
+            <div className='progress-sm'>
+              <div
+                className={cc([
+                  'progress-bar',
+                  currentSubInfo.info.trialIsOver && 'over-limit',
+                ])}
+                style={{ width: `${currentSubInfo.info.rate}%` }}
+              />
+            </div>
+          </>
+        )}
         <p className='note-limit'>
           {translate(
             currentSubInfo.info.trialIsOver
               ? lngKeys.SettingsSubLimitTrialEnd
-              : lngKeys.SettingsSubLimitTrialUpgrade
+              : lngKeys.SettingsSubLimitTrialUpgrade,
+            {
+              date: format(currentSubInfo.info.endDate, 'dd MMM, yyyy'),
+            }
           )}
         </p>
         <Button

src/cloud/lib/i18n/enUS.ts

@@ -160,7 +160,7 @@ const enTranslation: TranslationSource = {
   [lngKeys.SettingsSubLimitTrialUpgrade]:
     'You can upgrade at anytime during your trial.',
   [lngKeys.SettingsSubLimitTrialEnd]:
-    'Your pro plan trial has ended. Please upgrade now',
+    'Your trial has ended at {{date}}. Please upgrade now.',
   [lngKeys.SettingsSubLimitUnderFreePlan]:
     'Under the free plan, you can create up to {{limit}} docs.',
 

src/cloud/lib/stores/pageStore/store.tsx

@@ -212,6 +212,7 @@ function usePageDataStore(pageProps: any, navigatingBetweenPage: boolean) {
     return {
       trialing: false,
       info: {
+        cancelled: !team.trial,
         trialIsOver: remaining < 1,
         progressLabel: `${max - remaining}/${max}`,
         endDate: end,

src/cloud/lib/stores/pageStore/types.ts

@@ -54,6 +54,7 @@ type SubscriptionTrialInfo = {
 type SubscriptionInactiveInfo = {
   trialing: false
   info: {
+    cancelled: boolean
     trialIsOver: boolean
     progressLabel: string
     rate: number