2 files changed, 6 insertions, 8 deletions
diff --git a/gui/src/main/account-data-cache.ts b/gui/src/main/account-data-cache.ts
index a03728e004..7d3c59e5ef 100644
--- a/gui/src/main/account-data-cache.ts
+++ b/gui/src/main/account-data-cache.ts
@@ -1,6 +1,6 @@
-import moment from 'moment';
-import { hasExpired } from '../shared/account-expiry';
+import { closeToExpiry, hasExpired } from '../shared/account-expiry';
 import { AccountToken, IAccountData } from '../shared/daemon-rpc-types';
+import { DateComponent, dateByAddingComponent } from '../shared/date-helper';
 import log from '../shared/logging';
 import consumePromise from '../shared/promise';
 import { Scheduler } from '../shared/scheduler';
@@ -105,13 +105,12 @@ export default class AccountDataCache {
 
   private calculateRefetchDelay(accountExpiry: string) {
     const currentDate = new Date();
-    const oneMinuteBeforeExpiry = moment(accountExpiry).subtract(1, 'minute');
-    const closeToExpiry = moment(accountExpiry).isSameOrBefore(moment().add(3, 'days'));
+    const oneMinuteBeforeExpiry = dateByAddingComponent(accountExpiry, DateComponent.minute, -1);
 
     if (hasExpired(accountExpiry)) {
       return EXPIRED_ACCOUNT_REFRESH_PERIOD;
-    } else if (oneMinuteBeforeExpiry.isSameOrAfter(currentDate) && closeToExpiry) {
-      return oneMinuteBeforeExpiry.diff(currentDate);
+    } else if (oneMinuteBeforeExpiry >= currentDate && closeToExpiry(accountExpiry)) {
+      return oneMinuteBeforeExpiry.getTime() - currentDate.getTime();
     } else {
       return undefined;
     }
diff --git a/gui/src/main/index.ts b/gui/src/main/index.ts
index efbf9a4aa3..43807de5c3 100644
--- a/gui/src/main/index.ts
+++ b/gui/src/main/index.ts
@@ -10,7 +10,6 @@ import {
   shell,
   Tray,
 } from 'electron';
-import moment from 'moment';
 import * as path from 'path';
 import { sprintf } from 'sprintf-js';
 import * as uuid from 'uuid';
@@ -1339,7 +1338,7 @@ class ApplicationMain {
         this.notificationController.notify(closeToExpiryNotification.getSystemNotification());
 
         const twelveHours = 12 * 60 * 60 * 1000;
-        const remainingMilliseconds = moment(this.accountData.expiry).diff(new Date());
+        const remainingMilliseconds = new Date(this.accountData.expiry).getTime() - Date.now();
         const delay = Math.min(twelveHours, remainingMilliseconds);
         this.accountExpiryNotificationScheduler.schedule(() => this.handleAccountExpiry(), delay);
       }