Key off accounts (#2669)

* Key off accounts * Key off accounts in ChoosePassword as well
MetaMask · May 11, 2021 · c2c3727 · c2c3727
1 parent 0312418
commit c2c3727
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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]);
 	}
 };