From 2cd251a0e761ec4eeac20eaa3fe6226dac7824ea Mon Sep 17 00:00:00 2001
From: Vincent <vincent@loki.network>
Date: Thu, 30 Jan 2020 09:57:37 +1100
Subject: [PATCH] local commit

---
 ts/components/session/SessionPasswordModal.tsx  | 4 ++++
 ts/components/session/SessionPasswordPrompt.tsx | 7 +++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ts/components/session/SessionPasswordModal.tsx b/ts/components/session/SessionPasswordModal.tsx
index fe626db39..10fe3dabb 100644
--- a/ts/components/session/SessionPasswordModal.tsx
+++ b/ts/components/session/SessionPasswordModal.tsx
@@ -33,6 +33,10 @@ export class SessionPasswordModal extends React.Component<Props, State> {
     this.closeDialog = this.closeDialog.bind(this);
   }
 
+  public componentDidMount() {
+    setTimeout(() => $('#password-modal-input').focus(), 100);
+  }
+
   public render() {
     const { action, onOk } = this.props;
     const placeholders =
diff --git a/ts/components/session/SessionPasswordPrompt.tsx b/ts/components/session/SessionPasswordPrompt.tsx
index 4cf06c425..89c4df8e4 100644
--- a/ts/components/session/SessionPasswordPrompt.tsx
+++ b/ts/components/session/SessionPasswordPrompt.tsx
@@ -31,9 +31,13 @@ export class SessionPasswordPrompt extends React.PureComponent<{}, State> {
     window.addEventListener('keyup', this.onKeyUp);
   }
 
+  public componentDidMount() {
+    setTimeout(() => $('#password-prompt-input').focus(), 100);
+  }
+
   public render() {
     const showResetElements =
-      this.state.errorCount >= window.CONSTANTS.MAX_LOGIN_TRIES;
+      this.state.errorCount >= window.CONSTANTS.MAX_LOGIN_TRIES; 
 
     const wrapperClass = this.state.clearDataView
       ? 'clear-data-wrapper'
@@ -56,7 +60,6 @@ export class SessionPasswordPrompt extends React.PureComponent<{}, State> {
       <input
         id="password-prompt-input"
         type="password"
-        autoFocus={true}
         defaultValue=""
         placeholder={' '}
         maxLength={window.CONSTANTS.MAX_PASSWORD_LENGTH}