From f70c1fcf64e4628685aba17539d8b1cac28d64b5 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Wed, 27 Mar 2019 08:54:29 +0100
Subject: [PATCH] Display controller only if no bonding (#851)

---
 package.json                               |  6 ++---
 packages/app-staking/src/Account/index.tsx | 19 +++++++-------
 yarn.lock                                  | 30 +++++++++++-----------
 3 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/package.json b/package.json
index 5c45d8fa0d..3dbb99a671 100644
--- a/package.json
+++ b/package.json
@@ -11,10 +11,10 @@
   ],
   "resolutions": {
     "@polkadot/api": "^0.51.1",
-    "@polkadot/keyring": "^0.41.1",
+    "@polkadot/keyring": "^0.42.0-beta.0",
     "@polkadot/types": "^0.51.1",
-    "@polkadot/util": "^0.41.1",
-    "@polkadot/util-crypto": "^0.41.1",
+    "@polkadot/util": "^0.42.0-beta.0",
+    "@polkadot/util-crypto": "^0.42.0-beta.0",
     "babel-core": "^7.0.0-bridge.0",
     "rxjs": "^6.4.0",
     "typescript": "^3.3.4000"
diff --git a/packages/app-staking/src/Account/index.tsx b/packages/app-staking/src/Account/index.tsx
index a3383e93e3..9dfb653f7f 100644
--- a/packages/app-staking/src/Account/index.tsx
+++ b/packages/app-staking/src/Account/index.tsx
@@ -233,18 +233,8 @@ class Account extends React.PureComponent<Props, State> {
     const buttons = [];
 
     if (!stashId) {
-      buttons.push(
-        <Button
-          isPrimary
-          key='controller'
-          onClick={this.toggleController}
-          label={t('Controller')}
-        />
-      );
-
       // only display bonding if we already have a controller
       if (controllerId) {
-        buttons.push(<Button.Or key='bond.or' />);
         buttons.push(
           <Button
             isPrimary
@@ -253,6 +243,15 @@ class Account extends React.PureComponent<Props, State> {
             label={t('Bond')}
           />
         );
+      } else {
+        buttons.push(
+          <Button
+            isPrimary
+            key='controller'
+            onClick={this.toggleController}
+            label={t('Set Controller')}
+          />
+        );
       }
     } else {
       // buttons.push(
diff --git a/yarn.lock b/yarn.lock
index 1fb4eda3b7..2f6e825b16 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1734,14 +1734,14 @@
   dependencies:
     "@babel/runtime" "^7.4.0"
 
-"@polkadot/keyring@^0.41.1":
-  version "0.41.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-0.41.1.tgz#d6c6a179e3546385eccd5b61011d46c3d52eb8cf"
-  integrity sha512-kN3Op1TffWJfcnag+eTiFafx2z9jubjk9abU8fqlFM1qR0TzCOyLboB6JP0bUdSy3nu9+36qGi48HTAd3SOtCQ==
+"@polkadot/keyring@^0.41.1", "@polkadot/keyring@^0.42.0-beta.0":
+  version "0.42.0-beta.0"
+  resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-0.42.0-beta.0.tgz#f43af8a7b0dffc339f0f38517897663f08550660"
+  integrity sha512-wIL42FRknPMdVZhmEvuAm/A1nmIjyF7ZbJnaTFcpMUByww9CnLtsAJRJutclb8YQ+8yr8QDMeLNPxxcAkkY5pQ==
   dependencies:
     "@babel/runtime" "^7.4.0"
-    "@polkadot/util" "^0.41.1"
-    "@polkadot/util-crypto" "^0.41.1"
+    "@polkadot/util" "^0.42.0-beta.0"
+    "@polkadot/util-crypto" "^0.42.0-beta.0"
     "@types/bs58" "^4.0.0"
     bs58 "^4.0.1"
 
@@ -1858,13 +1858,13 @@
   dependencies:
     "@babel/runtime" "^7.3.4"
 
-"@polkadot/util-crypto@^0.41.1":
-  version "0.41.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-0.41.1.tgz#6be426b8df0a48f52ac5f6de4eeff4b95c6962f6"
-  integrity sha512-cNTQxjn3O38uJx79hvBDYu88vkg/8Det88+sO+c9NqQ1PSVBf26kHwDtMZQnUTkGGV8Hn6sLKCYCgkvgXDE+Ww==
+"@polkadot/util-crypto@^0.41.1", "@polkadot/util-crypto@^0.42.0-beta.0":
+  version "0.42.0-beta.0"
+  resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-0.42.0-beta.0.tgz#28474139cb2f974d6b0d645f17aa0a93bd4ac707"
+  integrity sha512-9XQVrZcmFkc60tggec/WqArgg04w+xPmEK9icPU4TGLdevnfAP10bTRo7k4o2cEkE/yMRUxdNYuT4U9x29K+PQ==
   dependencies:
     "@babel/runtime" "^7.4.0"
-    "@polkadot/util" "^0.41.1"
+    "@polkadot/util" "^0.42.0-beta.0"
     "@polkadot/wasm-crypto" "^0.5.1"
     "@polkadot/wasm-dalek-ed25519" "^0.5.1"
     "@polkadot/wasm-schnorrkel" "^0.5.1"
@@ -1880,10 +1880,10 @@
     tweetnacl "^1.0.1"
     xxhashjs "^0.2.2"
 
-"@polkadot/util@^0.40.1", "@polkadot/util@^0.41.1":
-  version "0.41.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-0.41.1.tgz#b67762a0a7408138d843adc7240944e704e819e7"
-  integrity sha512-1mFHxxdXyRgeFk0ygfJklzsf6HiEEMikrpUgr+3Dw5S7KromjPD8EbWkpcZQZ3Png5PTwGyjrx7MYY4Ajiu5xQ==
+"@polkadot/util@^0.40.1", "@polkadot/util@^0.41.1", "@polkadot/util@^0.42.0-beta.0":
+  version "0.42.0-beta.0"
+  resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-0.42.0-beta.0.tgz#0b6d38c675c463ab2b438bbefaa85e6ba0d34f53"
+  integrity sha512-1pNTyastJwJX7slWj0pLHs/h7rXujgrkJMu7qQoHkaKKGTsU27gbmF9/Kyg8aP9QrVlTUKBlo1ROPTMEcNN+dQ==
   dependencies:
     "@babel/runtime" "^7.4.0"
     "@types/bn.js" "^4.11.4"