summaryrefslogtreecommitdiff
path: root/ui/app/components
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2016-09-29 11:56:44 -0700
committerelijah <elijah@riseup.net>2016-09-29 11:58:51 -0700
commite7281dd47f375c1b0a72ae85505319c4d87fb524 (patch)
tree8cc4c3967eebefd26eaaedabbfd41ea4cde0390d /ui/app/components
parentbf6571764fc0d7c0ef0153e3e5e9174221aa167d (diff)
[feat] ui - improved account list, show multiple login sessions
Diffstat (limited to 'ui/app/components')
-rw-r--r--ui/app/components/login.js2
-rw-r--r--ui/app/components/main_panel/index.js1
2 files changed, 1 insertions, 2 deletions
diff --git a/ui/app/components/login.js b/ui/app/components/login.js
index 562ab5a..059551f 100644
--- a/ui/app/components/login.js
+++ b/ui/app/components/login.js
@@ -356,7 +356,7 @@ class Login extends React.Component {
}
doLogin() {
- let account = Account.find(this.state.username)
+ let account = Account.find_or_add(this.state.username)
account.login(this.state.password).then(
account => {
this.setState({loading: false})
diff --git a/ui/app/components/main_panel/index.js b/ui/app/components/main_panel/index.js
index a05f307..775dff6 100644
--- a/ui/app/components/main_panel/index.js
+++ b/ui/app/components/main_panel/index.js
@@ -32,7 +32,6 @@ export default class MainPanel extends React.Component {
componentWillMount() {
if (this.props.initialAccount) {
- Account.add(this.props.initialAccount)
this.setState({
account: this.props.initialAccount,
accounts: Account.list