From 2653085f5726533f53905cb813f81153145937d4 Mon Sep 17 00:00:00 2001 From: SleepWalker Date: Sat, 19 Nov 2016 17:46:55 +0200 Subject: [PATCH] Restore accounts backward compatibility --- src/components/accounts/AccountSwitcher.jsx | 11 ++++++----- src/components/user/User.js | 4 ++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/components/accounts/AccountSwitcher.jsx b/src/components/accounts/AccountSwitcher.jsx index 3ce1663..29fa069 100644 --- a/src/components/accounts/AccountSwitcher.jsx +++ b/src/components/accounts/AccountSwitcher.jsx @@ -44,11 +44,12 @@ export class AccountSwitcher extends Component { render() { const { accounts, skin, allowAdd, allowLogout, highlightActiveAccount } = this.props; + const activeAccount = accounts.active; let {available} = accounts; if (highlightActiveAccount) { - available = available.filter((account) => account.id !== accounts.active.id); + available = available.filter((account) => account.id !== activeAccount.id); } return ( @@ -65,19 +66,19 @@ export class AccountSwitcher extends Component { )} />
- {accounts.active.username} + {activeAccount.username}
- {accounts.active.email} + {activeAccount.email}
- +
- +
diff --git a/src/components/user/User.js b/src/components/user/User.js index d90ae98..b56c548 100644 --- a/src/components/user/User.js +++ b/src/components/user/User.js @@ -33,6 +33,10 @@ export default class User { // frontend app specific attributes isGuest: true, goal: null, // the goal with wich user entered site + + // TODO: remove me after migration to multy accs + token: '', + refreshToken: '' }; const user = Object.keys(defaults).reduce((user, key) => {