From 7e2f7ddf1139deb86239bcb2a48e8892f3c8feba Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Sun, 28 Mar 2021 07:54:12 +0200
Subject: [PATCH] Crowdload >= current (#4959)

---
 packages/page-parachains/src/Crowdloan/Fund.tsx  | 4 ++--
 packages/page-parachains/src/Crowdloan/Funds.tsx | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/page-parachains/src/Crowdloan/Fund.tsx b/packages/page-parachains/src/Crowdloan/Fund.tsx
index 5ca934fc7f..1e423be42c 100644
--- a/packages/page-parachains/src/Crowdloan/Fund.tsx
+++ b/packages/page-parachains/src/Crowdloan/Fund.tsx
@@ -112,7 +112,7 @@ function Fund ({ bestNumber, className, isOngoing, value: { childKey, info: { ca
       <td className='address media--1400'><AddressMini value={depositor} /></td>
       {!isOngoing && (
         <td className='all number together'>
-          {isEnded && (
+          {(isRetired || retiring.isTrue) && (
             <>
               {retiringLeft && (
                 <BlockToTime value={retiringLeft} />
@@ -138,7 +138,7 @@ function Fund ({ bestNumber, className, isOngoing, value: { childKey, info: { ca
         />
         <div>{percentage}</div>
       </td>
-      <td className='number'>
+      <td className='number media--1100'>
         {uniqueCount && (
           formatNumber(uniqueCount)
         )}
diff --git a/packages/page-parachains/src/Crowdloan/Funds.tsx b/packages/page-parachains/src/Crowdloan/Funds.tsx
index eab3b48755..4357b04e13 100644
--- a/packages/page-parachains/src/Crowdloan/Funds.tsx
+++ b/packages/page-parachains/src/Crowdloan/Funds.tsx
@@ -23,8 +23,8 @@ function extractLists (value: Campaign[] | null, leasePeriod?: LeasePeriod): [Ca
 
   return value && currentPeriod
     ? [
-      value.filter(({ firstSlot, isCapped, isEnded, isWinner }) => !(isCapped || isEnded || isWinner) && currentPeriod.lt(firstSlot)),
-      value.filter(({ firstSlot, isCapped, isEnded, isWinner }) => (isCapped || isEnded || isWinner) || currentPeriod.gte(firstSlot))
+      value.filter(({ firstSlot, isCapped, isEnded, isWinner }) => !(isCapped || isEnded || isWinner) && currentPeriod.lte(firstSlot)),
+      value.filter(({ firstSlot, isCapped, isEnded, isWinner }) => (isCapped || isEnded || isWinner) || currentPeriod.gt(firstSlot))
     ]
     : [null, null];
 }
@@ -39,7 +39,7 @@ function Funds ({ bestNumber, className, leasePeriod, value }: Props): React.Rea
     [t('ending')],
     [t('periods')],
     [t('raised')],
-    [t('unique')],
+    [t('unique'), 'media--1100'],
     [undefined, 'badge'],
     []
   ]);
@@ -52,7 +52,7 @@ function Funds ({ bestNumber, className, leasePeriod, value }: Props): React.Rea
     [t('ending'), 'media--1200'],
     [t('periods')],
     [t('raised')],
-    [t('unique')],
+    [t('unique'), 'media--1100'],
     [undefined, 'badge'],
     []
   ]);