Merge branch 'rename-to-expiry'

3 files changed, 14 insertions, 14 deletions

diff --git a/app/components/Account.js b/app/components/Account.js
index 41b26fdfbf..12ef0c1938 100644
--- a/app/components/Account.js
+++ b/app/components/Account.js
@@ -19,10 +19,10 @@ export default class Account extends Component {
   props: AccountProps;
 
   render(): React.Element<*> {
-    const paidUntil = moment(this.props.account.paidUntil);
+    const expiry = moment(this.props.account.expiry);
     const formattedAccountId = formatAccount(this.props.account.accountNumber || '');
-    const formattedPaidUntil = paidUntil.format('hA, D MMMM YYYY').toUpperCase();
-    const isOutOfTime = paidUntil.isSameOrBefore(moment());
+    const formattedExpiry = expiry.format('hA, D MMMM YYYY').toUpperCase();
+    const isOutOfTime = expiry.isSameOrBefore(moment());
 
     return (
       <Layout>
@@ -54,7 +54,7 @@ export default class Account extends Component {
                         <div className="account__out-of-time account__row-value account__row-value--error">OUT OF TIME</div>
                       </Then>
                       <Else>
-                        <div className="account__row-value">{ formattedPaidUntil }</div>
+                        <div className="account__row-value">{ formattedExpiry }</div>
                       </Else>
                     </If>
                   </div>
diff --git a/app/components/Connect.js b/app/components/Connect.js
index c67e72f696..ba74fb311a 100644
--- a/app/components/Connect.js
+++ b/app/components/Connect.js
@@ -13,7 +13,7 @@ import type { HeaderBarStyle } from './HeaderBar';
 import type { ConnectionReduxState } from '../redux/connection/reducers';
 
 export type ConnectProps = {
-  accountPaidUntil: string,
+  accountExpiry: string,
   connection: ConnectionReduxState,
   preferredServer: string,
   onSettings: () => void,
@@ -367,8 +367,8 @@ export default class Connect extends Component {
     }
 
     // No credit?
-    const paidUntil = this.props.accountPaidUntil;
-    if(paidUntil && moment(paidUntil).isSameOrBefore(moment())) {
+    const expiry = this.props.accountExpiry;
+    if(expiry && moment(expiry).isSameOrBefore(moment())) {
       return new BackendError('NO_CREDIT');
     }
 
diff --git a/app/components/Settings.js b/app/components/Settings.js
index df6947a258..7e71c8dbd2 100644
--- a/app/components/Settings.js
+++ b/app/components/Settings.js
@@ -32,13 +32,13 @@ export default class Settings extends Component {
 
   render(): React.Element<*> {
     const isLoggedIn = this.props.account.status === 'ok';
-    let isOutOfTime = false, formattedPaidUntil = '';
-    let paidUntilIso = this.props.account.paidUntil;
+    let isOutOfTime = false, formattedExpiry = '';
+    let expiryIso = this.props.account.expiry;
 
-    if(isLoggedIn && paidUntilIso) {
-      let paidUntil = moment(this.props.account.paidUntil);
-      isOutOfTime = paidUntil.isSameOrBefore(moment());
-      formattedPaidUntil = paidUntil.fromNow(true) + ' left';
+    if(isLoggedIn && expiryIso) {
+      let expiry = moment(this.props.account.expiry);
+      isOutOfTime = expiry.isSameOrBefore(moment());
+      formattedExpiry = expiry.fromNow(true) + ' left';
     }
 
     return (
@@ -68,7 +68,7 @@ export default class Settings extends Component {
                                   <span className="settings__account-paid-until-label settings__account-paid-until-label--error">OUT OF TIME</span>
                                 </Then>
                                 <Else>
-                                  <span className="settings__account-paid-until-label">{ formattedPaidUntil }</span>
+                                  <span className="settings__account-paid-until-label">{ formattedExpiry }</span>
                                 </Else>
                               </If>
                             </div>