From 97f69acd4f70bb4c9058d80fecccfb7efd600d1d Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Sat, 8 Aug 2020 13:32:55 +0200
Subject: [PATCH] Split tip median value (#3376)

---
 packages/page-treasury/src/Overview/Tip.tsx   | 31 ++++++++++---------
 .../page-treasury/src/Overview/TipEndorse.tsx |  3 +-
 packages/page-treasury/src/Overview/Tips.tsx  |  4 +--
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/packages/page-treasury/src/Overview/Tip.tsx b/packages/page-treasury/src/Overview/Tip.tsx
index 194c51a02e..74ebddd0fc 100644
--- a/packages/page-treasury/src/Overview/Tip.tsx
+++ b/packages/page-treasury/src/Overview/Tip.tsx
@@ -9,8 +9,8 @@ import React, { useEffect, useState } from 'react';
 import styled from 'styled-components';
 import { AddressSmall, AddressMini, Expander, Icon, LinkExternal, TxButton } from '@polkadot/react-components';
 import { useAccounts } from '@polkadot/react-hooks';
-import { BlockToTime } from '@polkadot/react-query';
-import { BN_ZERO, formatBalance, formatNumber } from '@polkadot/util';
+import { BlockToTime, FormatBalance } from '@polkadot/react-query';
+import { BN_ZERO, formatNumber } from '@polkadot/util';
 
 import { useTranslation } from '../translate';
 import TipClose from './TipClose';
@@ -94,16 +94,19 @@ function Tip ({ bestNumber, className = '', hash, isMember, members, tip }: Prop
       <TipReason hash={reason} />
       <td className='start all'>
         {tips.length !== 0 && (
-          <Expander summary={t<string>('Tippers ({{count}})', { replace: { count: `${tips.length}${median.isZero() ? '' : `, ${formatBalance(median)}`}` } })}>
-            {tips.map(([tipper, balance]) => (
-              <AddressMini
-                balance={balance}
-                key={tipper.toString()}
-                value={tipper}
-                withBalance
-              />
-            ))}
-          </Expander>
+          <>
+            <Expander summary={t<string>('Tippers ({{count}})', { replace: { count: tips.length } })}>
+              {tips.map(([tipper, balance]) => (
+                <AddressMini
+                  balance={balance}
+                  key={tipper.toString()}
+                  value={tipper}
+                  withBalance
+                />
+              ))}
+            </Expander>
+            <FormatBalance value={median} />
+          </>
         )}
       </td>
       <td className='button together'>
@@ -144,7 +147,7 @@ function Tip ({ bestNumber, className = '', hash, isMember, members, tip }: Prop
           )
         }
       </td>
-      <td className='badge'>
+      <td className='badge ui--media-1700'>
         {isMember && (
           <Icon
             color={isTipper ? 'green' : 'gray'}
@@ -152,7 +155,7 @@ function Tip ({ bestNumber, className = '', hash, isMember, members, tip }: Prop
           />
         )}
       </td>
-      <td className='mini ui--media-1600'>
+      <td className='mini ui--media-1700'>
         <LinkExternal
           data={hash}
           type='tip'
diff --git a/packages/page-treasury/src/Overview/TipEndorse.tsx b/packages/page-treasury/src/Overview/TipEndorse.tsx
index ad6e37c090..67b583ce7a 100644
--- a/packages/page-treasury/src/Overview/TipEndorse.tsx
+++ b/packages/page-treasury/src/Overview/TipEndorse.tsx
@@ -36,11 +36,12 @@ function TipEndorse ({ hash, isMember, isTipped, median, members }: Props): Reac
       <Button
         icon='check'
         isDisabled={!isMember}
-        label={t<string>('Endorse')}
+        label={t<string>('Tip')}
         onClick={toggleOpen}
       />
       <TxButton
         accountId={defaultId}
+        className='ui--media-1600'
         icon='fighter-jet'
         isDisabled={!isMember || !isTipped}
         isIcon
diff --git a/packages/page-treasury/src/Overview/Tips.tsx b/packages/page-treasury/src/Overview/Tips.tsx
index 9847fdc982..1b99a9469c 100644
--- a/packages/page-treasury/src/Overview/Tips.tsx
+++ b/packages/page-treasury/src/Overview/Tips.tsx
@@ -51,8 +51,8 @@ function Tips ({ className = '', hashes, isMember, members }: Props): React.Reac
     [t('reason'), 'start'],
     [],
     [],
-    [undefined, 'badge'],
-    [undefined, 'mini ui--media-1600']
+    [undefined, 'badge ui--media-1700'],
+    [undefined, 'mini ui--media-1700']
   ].filter((v) => v), [t]);
 
   return (