history.push('/settings')}
diff --git a/frontend/src/components/settings/Settings.jsx b/frontend/src/components/settings/Settings.jsx
index 47c92e74..4c84d7ed 100644
--- a/frontend/src/components/settings/Settings.jsx
+++ b/frontend/src/components/settings/Settings.jsx
@@ -378,7 +378,9 @@ export default function Settings() {
{userProfile.userSubscription && userProfile.userSubscription.status === SubscriptionStatus.CANCELLED && <>
- {t('settings.subscriptionInactive', { serviceName: Config.productName })}
+ {userProfile.userSubscription.isOnGracePeriod ?
+ <>{t('settings.subscriptionGracePeriod', { serviceName: Config.productName, expiresAt: moment(userProfile.userSubscription.gracePeriodEndsAt * 1000).calendar() })}> :
+ <>{t('settings.subscriptionInactive', { serviceName: Config.productName })}>}
>}
> : <>
@@ -388,7 +390,7 @@ export default function Settings() {
- {userProfile.userSubscription && userProfile.userSubscription.type==='stripe' &&
+ {userProfile.userSubscription && userProfile.userSubscription.type==='stripe' && userProfile.userSubscription.status !== SubscriptionStatus.EXPIRING &&