Make sure accounts is always an Array (#26)

* make sure accounts is always array * use await instead of yield * Use Array.isArray instead of array.length
MetaMask · Nov 19, 2018 · e2098be · e2098be
1 parent c1360f3
commit e2098be
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/KeyringController.ts b/src/KeyringController.ts
@@ -317,8 +317,10 @@ export class KeyringController extends BaseController<BaseConfig, KeyringState>
 	async fullUpdate() {
 		const keyrings = await Promise.all(
 			this.keyring.keyrings.map(async (keyring: KeyringObject, index: number) => {
+				const keyringAccounts = await keyring.getAccounts();
+				const accounts = Array.isArray(keyringAccounts) ? keyringAccounts.map((address) => toChecksumAddress(address)) : [];
 				return {
-					accounts: await keyring.getAccounts().map((address) => toChecksumAddress(address)),
+					accounts,
 					index,
 					type: keyring.type
 				};