From 0778eb8d87c5b106c171f4e2209589ace5d438a9 Mon Sep 17 00:00:00 2001
From: Jaco <jacogr@gmail.com>
Date: Tue, 15 Jun 2021 14:42:35 +0300
Subject: [PATCH] Interleave even with 0 current bids (#5603)

* Interleave even with 0 current bids

* keys

* Interleave single only when raises

* Adjust key
---
 .../page-parachains/src/Auctions/Auction.tsx  | 44 +++++++++++++------
 .../page-parachains/src/Auctions/WinRange.tsx |  4 +-
 2 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/packages/page-parachains/src/Auctions/Auction.tsx b/packages/page-parachains/src/Auctions/Auction.tsx
index eba0fbcd92..3e53fefa1d 100644
--- a/packages/page-parachains/src/Auctions/Auction.tsx
+++ b/packages/page-parachains/src/Auctions/Auction.tsx
@@ -92,20 +92,36 @@ function Auction ({ auctionInfo, campaigns, className, winningData }: Props): Re
       header={headerRef.current}
       noBodyTag
     >
-      {auctionInfo && newRaise && winningData?.map(({ blockNumber, winners }, round) => (
-        <tbody key={round}>
-          {interleave(winners, round !== 0 || winningData.length !== 1).map((value, index) => (
-            <WinRange
-              auctionInfo={auctionInfo}
-              blockNumber={blockNumber}
-              isFirst={index === 0}
-              isLatest={round === 0}
-              key={`${blockNumber.toString()}:${value.key}`}
-              value={value}
-            />
-          ))}
-        </tbody>
-      ))}
+      {auctionInfo && newRaise && winningData && (
+        winningData.length
+          ? winningData.map(({ blockNumber, winners }, round) => (
+            <tbody key={round}>
+              {interleave(winners, round !== 0 || winningData.length !== 1).map((value, index) => (
+                <WinRange
+                  auctionInfo={auctionInfo}
+                  blockNumber={blockNumber}
+                  isFirst={index === 0}
+                  isLatest={round === 0}
+                  key={`${blockNumber.toString()}:${value.key}`}
+                  value={value}
+                />
+              ))}
+            </tbody>
+          ))
+          : newRaise && (newRaise.length !== 0) && (
+            <tbody key='latest-crowd'>
+              {interleave([], false).map((value, index) => (
+                <WinRange
+                  auctionInfo={auctionInfo}
+                  isFirst={index === 0}
+                  isLatest
+                  key={`latest-crowd:${value.key}`}
+                  value={value}
+                />
+              ))}
+            </tbody>
+          )
+      )}
     </Table>
   );
 }
diff --git a/packages/page-parachains/src/Auctions/WinRange.tsx b/packages/page-parachains/src/Auctions/WinRange.tsx
index f7ebefa2df..d697dd7e8b 100644
--- a/packages/page-parachains/src/Auctions/WinRange.tsx
+++ b/packages/page-parachains/src/Auctions/WinRange.tsx
@@ -14,7 +14,7 @@ import { useTranslation } from '../translate';
 
 interface Props {
   auctionInfo: AuctionInfo;
-  blockNumber: BN;
+  blockNumber?: BN;
   className?: string;
   isFirst: boolean;
   isLatest: boolean;
@@ -30,7 +30,7 @@ function WinRanges ({ auctionInfo, blockNumber, className = '', isFirst, isLates
         {isFirst && (
           <h1>{isLatest
             ? t<string>('latest')
-            : <>#{formatNumber(blockNumber.isZero() ? auctionInfo.endBlock : blockNumber)}</>
+            : <>#{formatNumber((!blockNumber || blockNumber.isZero()) ? auctionInfo.endBlock : blockNumber)}</>
           }</h1>
         )}
       </td>