Remove tooSoon property from CloseToAccountExpiryNotificationContext

2 files changed, 6 insertions, 9 deletions

diff --git a/gui/src/main/index.ts b/gui/src/main/index.ts
index 668b975b46..cef8eda51b 100644
--- a/gui/src/main/index.ts
+++ b/gui/src/main/index.ts
@@ -1227,21 +1227,21 @@ class ApplicationMain {
       const closeToExpiryNotification = new CloseToAccountExpiryNotificationProvider({
         accountExpiry: this.accountData.expiry,
         locale: this.locale,
-        tooSoon: this.accountExpiryNotificationScheduler.isRunning,
       });
 
       if (expiredNotification.mayDisplay()) {
         this.accountExpiryNotificationScheduler.cancel();
         this.notificationController.notify(expiredNotification.getSystemNotification());
-      } else if (closeToExpiryNotification.mayDisplay()) {
+      } else if (
+        !this.accountExpiryNotificationScheduler.isRunning &&
+        closeToExpiryNotification.mayDisplay()
+      ) {
         this.notificationController.notify(closeToExpiryNotification.getSystemNotification());
 
         const twelveHours = 12 * 60 * 60 * 1000;
         const remainingMilliseconds = moment(this.accountData.expiry).diff(new Date());
         const delay = Math.min(twelveHours, remainingMilliseconds);
-        this.accountExpiryNotificationScheduler.schedule(() => {
-          this.handleAccountExpiry();
-        }, delay);
+        this.accountExpiryNotificationScheduler.schedule(() => this.handleAccountExpiry(), delay);
       }
     }
   }
diff --git a/gui/src/shared/notifications/close-to-account-expiry.ts b/gui/src/shared/notifications/close-to-account-expiry.ts
index 3cf3d82826..b30aff2542 100644
--- a/gui/src/shared/notifications/close-to-account-expiry.ts
+++ b/gui/src/shared/notifications/close-to-account-expiry.ts
@@ -13,7 +13,6 @@ import {
 interface CloseToAccountExpiryNotificationContext {
   accountExpiry: string;
   locale: string;
-  tooSoon?: boolean;
 }
 
 export class CloseToAccountExpiryNotificationProvider
@@ -25,9 +24,7 @@ export class CloseToAccountExpiryNotificationProvider
       moment().add(3, 'days'),
     );
 
-    return (
-      !hasExpired(this.context.accountExpiry) && willHaveExpiredInThreeDays && !this.context.tooSoon
-    );
+    return !hasExpired(this.context.accountExpiry) && willHaveExpiredInThreeDays;
   }
 
   public getSystemNotification(): SystemNotification {