From f8eb3a23d2d826b8d44adb7acf61df1eb6e77c31 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Thu, 1 Apr 2021 00:25:13 +0300
Subject: [PATCH] Flatten single lease period (#4994)

* Display formatted leases

* Flatten single lease period
---
 packages/page-parachains/src/Auctions/Auction.tsx  | 2 +-
 packages/page-parachains/src/Auctions/WinRange.tsx | 6 +++++-
 packages/page-parachains/src/Crowdloan/Fund.tsx    | 8 +++++++-
 packages/page-parachains/src/Crowdloan/Funds.tsx   | 4 ++--
 packages/page-parachains/src/Overview/Periods.tsx  | 6 +++++-
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/packages/page-parachains/src/Auctions/Auction.tsx b/packages/page-parachains/src/Auctions/Auction.tsx
index 45ea154d43..74d3711fec 100644
--- a/packages/page-parachains/src/Auctions/Auction.tsx
+++ b/packages/page-parachains/src/Auctions/Auction.tsx
@@ -28,7 +28,7 @@ function Auction ({ auctionInfo, campaigns, className, winningData }: Props): Re
     [t('bids'), 'start', 3],
     [t('bidder'), 'address'],
     [t('crowdloan')],
-    [t('periods')],
+    [t('leases')],
     [t('value')]
   ]);
 
diff --git a/packages/page-parachains/src/Auctions/WinRange.tsx b/packages/page-parachains/src/Auctions/WinRange.tsx
index adb2d65257..696ce7950e 100644
--- a/packages/page-parachains/src/Auctions/WinRange.tsx
+++ b/packages/page-parachains/src/Auctions/WinRange.tsx
@@ -39,7 +39,11 @@ function WinRanges ({ auctionInfo, blockNumber, className = '', isFirst, isLates
       <td className='address'><AddressMini value={accountId} /></td>
       <td className='all number'>{isCrowdloan ? t<string>('Yes') : t<string>('No')}</td>
       <td className='all number'>
-        <Digits value={`${formatNumber(firstSlot)} - ${formatNumber(lastSlot)}`} />
+        <Digits value={
+          firstSlot.eq(lastSlot)
+            ? formatNumber(firstSlot)
+            : `${formatNumber(firstSlot)} - ${formatNumber(lastSlot)}`
+        } />
       </td>
       <td className='number'><FormatBalance value={value} /></td>
     </tr>
diff --git a/packages/page-parachains/src/Crowdloan/Fund.tsx b/packages/page-parachains/src/Crowdloan/Fund.tsx
index 0e3137eeba..eb47e710af 100644
--- a/packages/page-parachains/src/Crowdloan/Fund.tsx
+++ b/packages/page-parachains/src/Crowdloan/Fund.tsx
@@ -142,7 +142,13 @@ function Fund ({ bestNumber, className, isOngoing, leasePeriod, value: { childKe
         )}
         #{formatNumber(end)}
       </td>
-      <td className='number'><Digits value={`${formatNumber(firstSlot)} - ${formatNumber(lastSlot)}`} /></td>
+      <td className='number'>
+        <Digits value={
+          firstSlot.eq(lastSlot)
+            ? formatNumber(firstSlot)
+            : `${formatNumber(firstSlot)} - ${formatNumber(lastSlot)}`
+        } />
+      </td>
       <td className='number together'>
         <FormatBalance
           value={raised}
diff --git a/packages/page-parachains/src/Crowdloan/Funds.tsx b/packages/page-parachains/src/Crowdloan/Funds.tsx
index df4f94bea5..a0b3efd385 100644
--- a/packages/page-parachains/src/Crowdloan/Funds.tsx
+++ b/packages/page-parachains/src/Crowdloan/Funds.tsx
@@ -37,7 +37,7 @@ function Funds ({ bestNumber, className, leasePeriod, value }: Props): React.Rea
     [undefined, 'media--1400'],
     [],
     [t('ending')],
-    [t('periods')],
+    [t('leases')],
     [t('raised')],
     [t('unique'), 'media--1100'],
     [undefined, 'badge'],
@@ -50,7 +50,7 @@ function Funds ({ bestNumber, className, leasePeriod, value }: Props): React.Rea
     [],
     [t('retired')],
     [t('ending'), 'media--1200'],
-    [t('periods')],
+    [t('leases')],
     [t('raised')],
     [t('unique'), 'media--1100'],
     [undefined, 'badge'],
diff --git a/packages/page-parachains/src/Overview/Periods.tsx b/packages/page-parachains/src/Overview/Periods.tsx
index dc13493780..9ce1b8d3b9 100644
--- a/packages/page-parachains/src/Overview/Periods.tsx
+++ b/packages/page-parachains/src/Overview/Periods.tsx
@@ -32,7 +32,11 @@ function Periods ({ className, fromFirst, leasePeriod, periods }: Props): React.
 
           return all;
         }, [])
-        .map(([a, b]) => `${formatNumber(a)} - ${formatNumber(b)}`)
+        .map(([a, b]) =>
+          a.eq(b)
+            ? formatNumber(a)
+            : `${formatNumber(a)} - ${formatNumber(b)}`
+        )
         .join(', '),
     [leasePeriod?.currentPeriod, periods]
   );