Refactor code

1 files changed, 9 insertions, 5 deletions

diff --git a/gui/src/renderer/lib/account-expiry.ts b/gui/src/renderer/lib/account-expiry.ts
index e781caeffe..5a8e5e8ec2 100644
--- a/gui/src/renderer/lib/account-expiry.ts
+++ b/gui/src/renderer/lib/account-expiry.ts
@@ -5,16 +5,20 @@ import { pgettext } from '../../shared/gettext';
 export default class AccountExpiry {
   private expiry: moment.Moment;
 
-  constructor(expiry: string) {
-    this.expiry = moment(expiry);
+  constructor(isoString: string, locale: string) {
+    this.expiry = moment(isoString).locale(locale);
   }
 
   public hasExpired(): boolean {
-    return this.willHaveExpiredIn(moment());
+    return this.willHaveExpiredAt(new Date());
   }
 
-  public willHaveExpiredIn(time: moment.Moment): boolean {
-    return this.expiry.isSameOrBefore(time);
+  public willHaveExpiredAt(date: Date): boolean {
+    return this.expiry.isSameOrBefore(date);
+  }
+
+  public formattedDate(): string {
+    return this.expiry.format('L LTS');
   }
 
   public remainingTime(): string {