From 21268de56ff62ce2c58837d183d698e3959b6e7f Mon Sep 17 00:00:00 2001 From: Marco van Dijk Date: Sun, 8 May 2022 16:22:25 +0200 Subject: [PATCH] Also display round number at blocks for now. Probably good to go to a table style view soon --- src/components/BlockViewer.js | 9 +++++++++ src/components/eventButton.js | 4 +++- src/components/eventViewer.js | 4 +++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/components/BlockViewer.js b/src/components/BlockViewer.js index e469b8a..5a25935 100644 --- a/src/components/BlockViewer.js +++ b/src/components/BlockViewer.js @@ -7,6 +7,14 @@ const Block = (obj) => { const thisLocalDate = dateObj.toLocaleString(); const thisOffset = (-dateObj.getTimezoneOffset() / 60); + let currentRoundString; + if (obj.currentRound) { + currentRoundString = +

+ Round {obj.currentRound} +

+ } + return (
@@ -15,6 +23,7 @@ const Block = (obj) => {

🔗

+ {currentRoundString}

📅 {thisLocalDate} diff --git a/src/components/eventButton.js b/src/components/eventButton.js index 8131f41..3ba362e 100644 --- a/src/components/eventButton.js +++ b/src/components/eventButton.js @@ -172,9 +172,11 @@ const EventButton = (obj) => { } } + let blockNumber; if (obj.isFirstOfBlock) { - blockNumber = + console.log(obj); + blockNumber = } return ( diff --git a/src/components/eventViewer.js b/src/components/eventViewer.js index 2ec59ea..881a3b5 100644 --- a/src/components/eventViewer.js +++ b/src/components/eventViewer.js @@ -73,6 +73,7 @@ const EventViewer = (obj) => { let transferTicketEventsIdx = obj.transferTicketEvents.length - 1; let redeemTicketEventsIdx = obj.redeemTicketEvents.length - 1; let roundsIdx = obj.rounds.length - 1; + let currentRound; if (!filterActivated) { filtered += activateEventsIdx + 1; @@ -222,7 +223,7 @@ const EventViewer = (obj) => { if (thisObj.blockTime > latestTime) { latestTime = thisObj.blockTime; thisEvent = thisObj; - latestType = "round" + latestType = "round"; } } @@ -455,6 +456,7 @@ const EventViewer = (obj) => { eventObj={thisEvent} type={latestType} isFirstOfBlock={prevBlock} + currentRound={roundsIdx >= 0 ? obj.rounds[roundsIdx].number : null} time={thisEvent.blockTime} setSearchTerm={obj.setSearchTerm} monthlyStats={obj.monthlyStats}