From 99ee4afaf83e7fc10c36ad57f3c0ca62b54a43e2 Mon Sep 17 00:00:00 2001
From: Antoine Estienne <estienne.antoine@gmail.com>
Date: Tue, 11 May 2021 13:13:13 +0000
Subject: [PATCH] Add types to injected accounts in keyring load functions
 (#464)

* add types to injected accounts

* Update packages/ui-keyring/src/Keyring.ts

Co-authored-by: Jaco <jacogr@gmail.com>

* Update packages/ui-keyring/src/Keyring.ts

Co-authored-by: Jaco <jacogr@gmail.com>

Co-authored-by: Jaco <jacogr@gmail.com>
---
 packages/ui-keyring/src/Keyring.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/ui-keyring/src/Keyring.ts b/packages/ui-keyring/src/Keyring.ts
index 1bdc6824..987d2b74 100644
--- a/packages/ui-keyring/src/Keyring.ts
+++ b/packages/ui-keyring/src/Keyring.ts
@@ -247,7 +247,7 @@ export class Keyring extends Base implements KeyringStruct {
     this.rewriteKey(json, key, hexAddr, contractKey);
   }
 
-  private loadInjected (address: string, meta: KeyringJson$Meta): void {
+  private loadInjected (address: string, meta: KeyringJson$Meta, type?: KeypairType): void {
     const json = {
       address,
       meta: {
@@ -255,7 +255,7 @@ export class Keyring extends Base implements KeyringStruct {
         isInjected: true
       }
     };
-    const pair = this.keyring.addFromAddress(address, json.meta);
+    const pair = this.keyring.addFromAddress(address, json.meta, null, type);
 
     this.accounts.add(this._store, pair.address, json, pair.type);
   }
@@ -276,7 +276,7 @@ export class Keyring extends Base implements KeyringStruct {
     return true;
   }
 
-  public loadAll (options: KeyringOptions, injected: { address: string; meta: KeyringJson$Meta }[] = []): void {
+  public loadAll (options: KeyringOptions, injected: { address: string; meta: KeyringJson$Meta, type?: KeypairType }[] = []): void {
     super.initKeyring(options);
 
     this._store.all((key: string, json: KeyringJson): void => {
@@ -300,7 +300,7 @@ export class Keyring extends Base implements KeyringStruct {
     injected.forEach((account): void => {
       if (this.allowGenesis(account)) {
         try {
-          this.loadInjected(account.address, account.meta);
+          this.loadInjected(account.address, account.meta, account.type);
         } catch (error) {
           // ignore
         }