From c3073a7d65bc27d6c5c193e2f41d7d71bda7d842 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Mon, 8 Apr 2019 08:20:01 +0200
Subject: [PATCH] Combine controller/session when the same (#917)

---
 packages/app-staking/src/Overview/Address.tsx | 56 +++++++++----------
 1 file changed, 27 insertions(+), 29 deletions(-)

diff --git a/packages/app-staking/src/Overview/Address.tsx b/packages/app-staking/src/Overview/Address.tsx
index 80227f0bdf..4436f5dc97 100644
--- a/packages/app-staking/src/Overview/Address.tsx
+++ b/packages/app-staking/src/Overview/Address.tsx
@@ -91,10 +91,7 @@ class Address extends React.PureComponent<Props, State> {
           withCopy={false}
           withNonce={false}
         >
-          <div className='staking--accounts-info'>
-            {this.renderControllerId()}
-            {this.renderSessionId()}
-          </div>
+          {this.renderKeys()}
           {this.renderNominators()}
           {this.renderOffline()}
         </AddressRow>
@@ -131,34 +128,35 @@ class Address extends React.PureComponent<Props, State> {
     this.setState({ badgeExpanded: !badgeExpanded });
   }
 
-  private renderControllerId () {
+  private renderKeys () {
     const { t } = this.props;
-    const { bondedId } = this.state;
-
-    if (!bondedId) {
-      return null;
-    }
+    const { bondedId, sessionId } = this.state;
+    const isSame = bondedId === sessionId;
 
     return (
-      <div>
-        <label className='staking--label'>{t('controller')}</label>
-        <AddressMini value={bondedId} />
-      </div>
-    );
-  }
-
-  private renderSessionId () {
-    const { t } = this.props;
-    const { sessionId } = this.state;
-
-    if (!sessionId) {
-      return null;
-    }
-
-    return (
-      <div>
-        <label className='staking--label'>{t('session')}</label>
-        <AddressMini value={sessionId} />
+      <div className='staking--accounts-info'>
+        {bondedId
+          ? (
+            <div>
+              <label className='staking--label'>{
+                isSame
+                  ? t('controller/session')
+                  : t('controller')
+              }</label>
+              <AddressMini value={bondedId} />
+            </div>
+          )
+          : null
+        }
+        {!isSame && sessionId
+          ? (
+            <div>
+              <label className='staking--label'>{t('session')}</label>
+              <AddressMini value={sessionId} />
+            </div>
+          )
+          : null
+        }
       </div>
     );
   }