From 72f5614f5d4fb283b3db8165ab6f6129d368eb68 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Fri, 24 May 2019 13:15:30 +0200
Subject: [PATCH] Ensumer correcly encoded address in json (#134)

---
 packages/ui-keyring/package.json                     | 2 +-
 packages/ui-keyring/src/observable/genericSubject.ts | 5 ++++-
 packages/ui-util/package.json                        | 2 +-
 yarn.lock                                            | 8 ++++----
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/packages/ui-keyring/package.json b/packages/ui-keyring/package.json
index 71ff8e38..107f34b7 100644
--- a/packages/ui-keyring/package.json
+++ b/packages/ui-keyring/package.json
@@ -17,7 +17,7 @@
   },
   "devDependencies": {
     "@polkadot/keyring": "^0.91.1",
-    "@polkadot/types": "^0.79.1",
+    "@polkadot/types": "^0.80.0-beta.2",
     "@polkadot/util": "^0.91.1"
   },
   "peerDependencies": {
diff --git a/packages/ui-keyring/src/observable/genericSubject.ts b/packages/ui-keyring/src/observable/genericSubject.ts
index 13b70ffd..d58e332e 100644
--- a/packages/ui-keyring/src/observable/genericSubject.ts
+++ b/packages/ui-keyring/src/observable/genericSubject.ts
@@ -39,7 +39,10 @@ export default function genericSubject (keyCreator: (address: string) => string,
       current = { ...current };
 
       current[address] = {
-        json,
+        json: {
+          ...json,
+          address
+        },
         option: createOptionItem(address, json.meta.name, !json.meta.isRecent)
       };
 
diff --git a/packages/ui-util/package.json b/packages/ui-util/package.json
index 0142d35c..fcccc3bb 100644
--- a/packages/ui-util/package.json
+++ b/packages/ui-util/package.json
@@ -12,7 +12,7 @@
     "@babel/runtime": "^7.4.5"
   },
   "devDependencies": {
-    "@polkadot/types": "^0.79.1"
+    "@polkadot/types": "^0.80.0-beta.2"
   },
   "peerDependencies": {
     "@polkadot/types": "*"
diff --git a/yarn.lock b/yarn.lock
index f06d6f6c..c77c2220 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1840,10 +1840,10 @@
   resolved "https://registry.yarnpkg.com/@polkadot/ts/-/ts-0.1.56.tgz#ffd6e9c95704a7fb90b918193b9dc5c440114b27"
   integrity sha512-wnt4zXxZXyz6WaubTO/I+nUElwV2DogFzdl6CrKfVn2PTWp8uHN06W9s40FH57ORtmQfDr9rLRP8Nq+oIyElbg==
 
-"@polkadot/types@^0.79.1":
-  version "0.79.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-0.79.1.tgz#491a53dd23d5ac645d58a8467c1b919d4bb00c09"
-  integrity sha512-u7hcubX5Kl3m3IM+YXyORXlgHUJSb+a/YyzalERF7yRxEUW1fPMRE6935cUQT5kHdRme0aANncjHFGbE6Qn0vg==
+"@polkadot/types@^0.80.0-beta.2":
+  version "0.80.0-beta.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-0.80.0-beta.2.tgz#450baa6b86cd864aba5b49a00c4fcaf1cb2eecb3"
+  integrity sha512-BcWjUYyDm6KgAl+LyVqvmVp7GGfIJtiJDLpZJ9gyc2m3fpqZxqp2ektEpA8bGrxUyQcyqIBGpb0y8ibe1flcPg==
   dependencies:
     "@babel/runtime" "^7.4.5"
     "@polkadot/keyring" "^0.91.1"