From c2c372794a5e89542a6c096c9674f9e2319777c3 Mon Sep 17 00:00:00 2001
From: ricky <ricky.miller@gmail.com>
Date: Tue, 11 May 2021 13:06:00 -0400
Subject: [PATCH] Key off accounts (#2669)

* Key off accounts

* Key off accounts in ChoosePassword as well
---
 app/components/Views/ChoosePassword/index.js | 2 +-
 app/core/Vault.js                            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/components/Views/ChoosePassword/index.js b/app/components/Views/ChoosePassword/index.js
index 5601e44c747..731396c1a28 100644
--- a/app/components/Views/ChoosePassword/index.js
+++ b/app/components/Views/ChoosePassword/index.js
@@ -418,7 +418,7 @@ class ChoosePassword extends PureComponent {
 		if (hdKeyring.accounts.includes(selectedAddress)) {
 			PreferencesController.setSelectedAddress(selectedAddress);
 		} else {
-			PreferencesController.setSelectedAddress(hdKeyring[0]);
+			PreferencesController.setSelectedAddress(hdKeyring.accounts[0]);
 		}
 	};
 
diff --git a/app/core/Vault.js b/app/core/Vault.js
index 6c3ef8684d1..b001330f5ae 100644
--- a/app/core/Vault.js
+++ b/app/core/Vault.js
@@ -76,6 +76,6 @@ export const recreateVaultWithSamePassword = async (password = '', selectedAddre
 	if (hdKeyring.accounts.includes(selectedAddress)) {
 		PreferencesController.setSelectedAddress(selectedAddress);
 	} else {
-		PreferencesController.setSelectedAddress(hdKeyring[0]);
+		PreferencesController.setSelectedAddress(hdKeyring.accounts[0]);
 	}
 };