From 323ecabc6fc8bd66a8a432c1e31033a41db0aa9b Mon Sep 17 00:00:00 2001
From: Henrik Hermansen <henrik.hermansen@sparebank1.no>
Date: Thu, 25 Aug 2016 13:39:36 +0200
Subject: [PATCH] DIG-12261 Bugfix missing X when preset account. UX fix to
 presist focus upon account selection.

---
 CHANGELOG.md            |  7 ++++++-
 src/account-selector.js | 11 ++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed9f843a96..d6d6c85bbc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
-# v.1.4.1
+# v.1.4.2
+* Bugfix: React warning when no selectedAccount or value props are given
+* Bugfix: Missing X (reset) when selectedAccount or value are given
+* UX: Focus will remain in the input when account is selected (except when tab is pressed)
+
+## v.1.4.1
 * Added callback to onAccountSelected with null account when the input is reset by user
 
 ## v.1.4.0
diff --git a/src/account-selector.js b/src/account-selector.js
index a27ef02342..b2384230f8 100644
--- a/src/account-selector.js
+++ b/src/account-selector.js
@@ -34,7 +34,9 @@ export default class AccountSelector extends Component {
   getDefaultState() {
     const {accounts, selectedAccount, value} = {...this.defaultProps, ...this.props};
     const filteredAccounts = this.filterAccounts(accounts, value);
-    return {...this.getBlankState(), selectedAccount, value, filteredAccounts};
+    const showResetButton = !!(selectedAccount || value);
+    const showAccountSuggestions = false;
+    return {showAccountSuggestions, showResetButton, selectedAccount, value, filteredAccounts};
   }
 
   getBlankState() {
@@ -156,10 +158,13 @@ export default class AccountSelector extends Component {
     }, () => onChange(value));
   }
 
-  onAccountSelect(account) {
+  onAccountSelect(account, focus) {
     const {accounts, onChange, onAccountSelected} = this.props;
     const {accountNumber} = account;
     const filteredAccounts = this.filterAccounts(accounts, accountNumber);
+    if (focus) {
+      this._accountInput.focus();
+    }
     this.setState({
       filteredAccounts,
       value: account.name,
@@ -326,7 +331,7 @@ export default class AccountSelector extends Component {
             <AccountSuggestionList
               locale={locale}
               accounts={ filteredAccounts }
-              onSelect={ this.onAccountSelect }
+              onSelect={ (account) => this.onAccountSelect(account, true) }
               selectedAccount={ selectedAccount }
               ref={ assignTo('_suggestionList') }
             />