From 8a9545b5ed8f9968846d6bb34cb6500066abc17c Mon Sep 17 00:00:00 2001
From: MiZiet <55240109+MiZiet@users.noreply.github.com>
Date: Wed, 1 Sep 2021 11:17:35 +0200
Subject: [PATCH] Change buttons position in account table (#6012)

* Move dotted button next to the row toggle

* Move external links to fast-actions

* Move links to the left

* Move links to the left in contacts

* Run CI

Co-authored-by: Jaco Greeff <jacogr@gmail.com>
---
 .123trigger                                   |  2 +-
 .../page-accounts/src/Accounts/Account.tsx    | 95 +++++++++++--------
 packages/page-accounts/src/Accounts/index.tsx |  2 -
 .../page-addresses/src/Contacts/Address.tsx   | 16 ++--
 .../page-addresses/src/Contacts/index.tsx     |  4 +-
 5 files changed, 68 insertions(+), 51 deletions(-)

diff --git a/.123trigger b/.123trigger
index 2fefacd6ea..e99177e78e 100644
--- a/.123trigger
+++ b/.123trigger
@@ -1,4 +1,4 @@
-20
+21
 0.45.2
 0.71.2
 
diff --git a/packages/page-accounts/src/Accounts/Account.tsx b/packages/page-accounts/src/Accounts/Account.tsx
index 551d140f9f..60a3205046 100644
--- a/packages/page-accounts/src/Accounts/Account.tsx
+++ b/packages/page-accounts/src/Accounts/Account.tsx
@@ -634,44 +634,43 @@ function Account ({ account: { address, meta }, className = '', delegation, filt
             withExtended={false}
           />
         </td>
-        <td className='button'>
-          {isFunction(api.api.tx.balances?.transfer) && (
-            <Button
-              icon='paper-plane'
-              label={t<string>('send')}
-              onClick={toggleTransfer}
+        <td className='fast-actions'>
+          <div className='fast-actions-row'>
+            <LinkExternal
+              className='ui--AddressCard-exporer-link media--1400'
+              data={address}
+              isLogo
+              type='address'
             />
-          )}
-          <Popup
-            className={`theme--${theme}`}
-            isDisabled={!menuItems.length}
-            value={
-              <Menu>
-                {menuItems}
-              </Menu>
-            }
-          />
-        </td>
-        <td className='links media--1400'>
-          <LinkExternal
-            className='ui--AddressCard-exporer-link'
-            data={address}
-            isLogo
-            type='address'
-          />
-        </td>
-        <td className='button'>
-          <div
-            className='table-column-icon'
-            data-testid='row-toggle'
-            onClick={toggleIsExpanded}
-          >
-            <Icon icon={
-              isExpanded
-                ? 'caret-up'
-                : 'caret-down'
-            }
+            {isFunction(api.api.tx.balances?.transfer) && (
+              <Button
+                className='send-button'
+                icon='paper-plane'
+                label={t<string>('send')}
+                onClick={toggleTransfer}
+              />
+            )}
+            <Popup
+              className={`theme--${theme}`}
+              isDisabled={!menuItems.length}
+              value={
+                <Menu>
+                  {menuItems}
+                </Menu>
+              }
             />
+            <div
+              className='table-column-icon'
+              data-testid='row-toggle'
+              onClick={toggleIsExpanded}
+            >
+              <Icon icon={
+                isExpanded
+                  ? 'caret-up'
+                  : 'caret-down'
+              }
+              />
+            </div>
           </div>
         </td>
       </tr>
@@ -707,7 +706,7 @@ function Account ({ account: { address, meta }, className = '', delegation, filt
             withExtended={false}
           />
         </td>
-        <td colSpan={4} />
+        <td colSpan={2} />
       </tr>
     </>
   );
@@ -742,7 +741,27 @@ export default React.memo(styled(Account)`
     cursor: pointer;
   }
 
-  &.isOdd td.button {
+  && td.button {
     padding-bottom: 0.5rem;
   }
+
+  && td.fast-actions {
+    padding-left: 0.2rem;
+    padding-right: 1rem;
+    width: 1%;
+
+    .fast-actions-row {
+      display: flex;
+      align-items: center;
+      justify-content: flex-end;
+
+      & > * + * {
+        margin-left: 0.35rem;
+      }
+
+      .send-button {
+        min-width: 6.5rem;
+      }
+    }
+  }
 `);
diff --git a/packages/page-accounts/src/Accounts/index.tsx b/packages/page-accounts/src/Accounts/index.tsx
index 48e0406f06..08bbb25bbf 100644
--- a/packages/page-accounts/src/Accounts/index.tsx
+++ b/packages/page-accounts/src/Accounts/index.tsx
@@ -76,8 +76,6 @@ function Overview ({ className = '', onStatusChange }: Props): React.ReactElemen
     [t('type')],
     [t('transactions'), 'media--1500'],
     [t('balances'), 'balances'],
-    [],
-    [undefined, 'media--1400'],
     []
   ]);
 
diff --git a/packages/page-addresses/src/Contacts/Address.tsx b/packages/page-addresses/src/Contacts/Address.tsx
index 7c4dfecc50..aa71e5c2ba 100644
--- a/packages/page-addresses/src/Contacts/Address.tsx
+++ b/packages/page-addresses/src/Contacts/Address.tsx
@@ -211,6 +211,14 @@ function Address ({ address, className = '', filter, isFavorite, toggleFavorite
           withExtended={false}
         />
       </td>
+      <td className='links media--1400'>
+        <LinkExternal
+          className='ui--AddressCard-exporer-link'
+          data={address}
+          isLogo
+          type='address'
+        />
+      </td>
       <td className='button'>
         {isFunction(api.api.tx.balances?.transfer) && (
           <Button
@@ -225,14 +233,6 @@ function Address ({ address, className = '', filter, isFavorite, toggleFavorite
           value={PopupDropdown}
         />
       </td>
-      <td className='links media--1400'>
-        <LinkExternal
-          className='ui--AddressCard-exporer-link'
-          data={address}
-          isLogo
-          type='address'
-        />
-      </td>
     </tr>
   );
 }
diff --git a/packages/page-addresses/src/Contacts/index.tsx b/packages/page-addresses/src/Contacts/index.tsx
index b18449fff6..60ece168e9 100644
--- a/packages/page-addresses/src/Contacts/index.tsx
+++ b/packages/page-addresses/src/Contacts/index.tsx
@@ -31,8 +31,8 @@ function Overview ({ className = '', onStatusChange }: Props): React.ReactElemen
     [t('tags'), 'start'],
     [t('transactions'), 'media--1500'],
     [t('balances'), 'expand'],
-    [],
-    [undefined, 'media--1400']
+    [undefined, 'media--1400'],
+    []
   ]);
 
   useEffect((): void => {