From 9d845e98a2a5cda8aaa22f581e28506a627dca43 Mon Sep 17 00:00:00 2001 From: elijah Date: Tue, 8 Nov 2016 13:55:08 -0800 Subject: ui: auto-initialize provider when logging in from the greeter --- ui/app/models/account.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'ui/app/models/account.js') diff --git a/ui/app/models/account.js b/ui/app/models/account.js index cb008cc0..e93d7572 100644 --- a/ui/app/models/account.js +++ b/ui/app/models/account.js @@ -53,8 +53,8 @@ export default class Account { // // returns a promise, fulfill is passed account object // - login(password) { - return bitmask.bonafide.user.auth(this.address, password).then( + login(password, autoSetupProvider=false) { + return bitmask.bonafide.user.auth(this.address, password, autoSetupProvider).then( response => { if (response.uuid) { this._uuid = response.uuid @@ -145,7 +145,9 @@ export default class Account { Account.list = Account.list.filter(i => { return i.id != account.id }) - if (index >= Account.list.length) { + if (Account.list.length == 0) { + return null + } else if (index >= Account.list.length) { index = index - 1 } else if (index == -1) { index = 0 -- cgit v1.2.3