Merge branch 'rename-to-expiry'

2 files changed, 5 insertions, 5 deletions

diff --git a/app/lib/backend.js b/app/lib/backend.js
index 6d5c4ebd14..ee11feee9d 100644
--- a/app/lib/backend.js
+++ b/app/lib/backend.js
@@ -163,7 +163,7 @@ export class Backend {
       }).then( accountData => {
         log.info('Log in complete');
 
-        this._store.dispatch(accountActions.loginSuccessful(accountData.paid_until));
+        this._store.dispatch(accountActions.loginSuccessful(accountData.expiry));
 
         // Redirect the user after some time to allow for
         // the 'Login Successful' screen to be visible
@@ -197,7 +197,7 @@ export class Backend {
       .then( accountData => {
         log.info('The stored account number still exists', accountData);
 
-        this._store.dispatch(accountActions.loginSuccessful(accountData.paid_until));
+        this._store.dispatch(accountActions.loginSuccessful(accountData.expiry));
 
         this._store.dispatch(push('/connect'));
       })
diff --git a/app/lib/ipc-facade.js b/app/lib/ipc-facade.js
index 2620f7958c..798b4d2805 100644
--- a/app/lib/ipc-facade.js
+++ b/app/lib/ipc-facade.js
@@ -6,7 +6,7 @@ import { validate } from 'validated/object';
 
 import type { Coordinate2d } from '../types';
 
-export type AccountData = {paid_until: string};
+export type AccountData = {expiry: string};
 export type AccountNumber = string;
 export type Ip = string;
 export type Location = {
@@ -55,10 +55,10 @@ export class RealIpc implements IpcFacade {
   getAccountData(accountNumber: AccountNumber): Promise<AccountData> {
     return this._ipc.send('get_account_data', accountNumber)
       .then(raw => {
-        if (typeof raw === 'object' && raw && raw.paid_until) {
+        if (typeof raw === 'object' && raw && raw.expiry) {
           return raw;
         } else {
-          throw new InvalidReply(raw, 'Expected an object with paid_until');
+          throw new InvalidReply(raw, 'Expected an object with expiry');
         }
       });
   }