Rename account.account -> account.accountNumber

7 files changed, 16 insertions, 16 deletions

diff --git a/app/components/Account.js b/app/components/Account.js
index b592bbd850..06947be7f2 100644
--- a/app/components/Account.js
+++ b/app/components/Account.js
@@ -23,8 +23,8 @@ export default class Account extends Component {
   onLogout = () => this.props.onLogout();
 
   render(): React.Element<*> {
-    let paidUntil = moment(this.props.account.paidUntil);
-    let formattedAccountId = formatAccount(this.props.account.account || '');
+    const paidUntil = moment(this.props.account.paidUntil);
+    const formattedAccountId = formatAccount(this.props.account.accountNumber || '');
     const formattedPaidUntil = paidUntil.format('hA, D MMMM YYYY').toUpperCase();
     const isOutOfTime = paidUntil.isSameOrBefore(moment());
 
diff --git a/app/components/Login.js b/app/components/Login.js
index dc0f9e9baa..0427832973 100644
--- a/app/components/Login.js
+++ b/app/components/Login.js
@@ -28,9 +28,9 @@ export default class Login extends Component {
   onFocus = () => this.setState({ isActive: true });
   onBlur = () => this.setState({ isActive: false });
   onLogin = () => {
-    const { account } = this.props.account;
-    if(account && account.length > 0) {
-      this.props.onLogin(account);
+    const { accountNumber } = this.props.account;
+    if(accountNumber && accountNumber.length > 0) {
+      this.props.onLogin(accountNumber);
     }
   }
 
@@ -90,10 +90,10 @@ export default class Login extends Component {
     return classes.join(' ');
   }
 
-  submitClass(s: LoginState, account: ?string): string {
+  submitClass(s: LoginState, accountNumber: ?string): string {
     const classes = ['login-form__submit'];
 
-    if(account && account.length > 0) {
+    if(accountNumber && accountNumber.length > 0) {
       classes.push('login-form__submit--active');
     }
 
@@ -114,7 +114,7 @@ export default class Login extends Component {
   }
 
   render(): React.Element<*> {
-    const { account, status, error } = this.props.account;
+    const { accountNumber, status, error } = this.props.account;
     const title = this.formTitle(status);
     const subtitle = this.formSubtitle(status, error);
 
@@ -129,7 +129,7 @@ export default class Login extends Component {
 
     const inputWrapClass = this.inputWrapClass(status);
     const footerClass = this.footerClass(status);
-    const submitClass = this.submitClass(status, account);
+    const submitClass = this.submitClass(status, accountNumber);
 
     const autoFocusRef = input => {
       if(isFailed && input) {
@@ -181,7 +181,7 @@ export default class Login extends Component {
                     onBlur={ this.onBlur }
                     onChange={ this.onInputChange }
                     onEnter={ this.onLogin }
-                    value={ account || '' }
+                    value={ accountNumber || '' }
                     disabled={ isConnecting }
                     autoFocus={ true }
                     ref={ autoFocusRef } />
diff --git a/app/containers/LoginPage.js b/app/containers/LoginPage.js
index 0b09e673b5..c9dbe385f8 100644
--- a/app/containers/LoginPage.js
+++ b/app/containers/LoginPage.js
@@ -13,7 +13,7 @@ const mapDispatchToProps = (dispatch, props) => {
   return {
     onSettings: () => dispatch(push('/settings')),
     onLogin: (account) => login(backend, account),
-    onChange: (account) => loginChange({ account }),
+    onChange: (accountNumber) => loginChange({ accountNumber }),
     onFirstChangeAfterFailure: () => loginChange({ status: 'none', error: null }),
     onExternalLink: (type) => shell.openExternal(links[type])
   };
diff --git a/app/lib/backend-redux-actions.js b/app/lib/backend-redux-actions.js
index 0ca63b0aab..bf5f2cc59d 100644
--- a/app/lib/backend-redux-actions.js
+++ b/app/lib/backend-redux-actions.js
@@ -61,7 +61,7 @@ export default function mapBackendEventsToReduxActions(backend: Backend, store:
   const onLogout = () => {
     store.dispatch(accountActions.loginChange({
       status: 'none',
-      account: '',
+      accountNumber: '',
       paidUntil: null,
       error: null
     }));
diff --git a/app/lib/backend.js b/app/lib/backend.js
index bf3a1382f1..076a49ca32 100644
--- a/app/lib/backend.js
+++ b/app/lib/backend.js
@@ -135,7 +135,7 @@ export class Backend {
     log.info('Attempting to login with account number', account);
 
     // emit: logging in
-    this._emit('logging', { account }, null);
+    this._emit('logging', { accountNumber: account }, null);
 
     this._ipc.getAccountData(account)
       .then( response => {
diff --git a/app/redux/account/reducers.js b/app/redux/account/reducers.js
index fb85008930..06dfb05941 100644
--- a/app/redux/account/reducers.js
+++ b/app/redux/account/reducers.js
@@ -8,7 +8,7 @@ import type { BackendError } from '../../lib/backend';
 
 export type LoginState = 'none' | 'connecting' | 'failed' | 'ok';
 export type AccountReduxState = {
-  account: ?string,
+  accountNumber: ?string,
   paidUntil: ?string, // ISO8601
   location: ?Coordinate2d,
   country: ?string,
@@ -18,7 +18,7 @@ export type AccountReduxState = {
 };
 
 const initialState: AccountReduxState = {
-  account: null,
+  accountNumber: null,
   paidUntil: null,
   location: null,
   country: null,
diff --git a/app/redux/connection/reducers.js b/app/redux/connection/reducers.js
index 1b9da89125..bf44281602 100644
--- a/app/redux/connection/reducers.js
+++ b/app/redux/connection/reducers.js
@@ -1,6 +1,6 @@
 // @flow
 import { handleActions } from 'redux-actions';
-import actions from './actions.js';
+import actions from './actions';
 
 import type { ReduxAction } from '../store';