diff --git a/src/actions/livepeer.js b/src/actions/livepeer.js index d689bf3..e448fc2 100644 --- a/src/actions/livepeer.js +++ b/src/actions/livepeer.js @@ -119,14 +119,14 @@ export const getEvents = () => async dispatch => { eventFrom = ""; eventTo = ""; if (eventContainsBond) { - const subtext = "activated their orchestrator"; + const subtext = "activated"; const descriptions = [ tmpAmount.toFixed(2) + " LPT stake", "round " + tmpWhen ] eventDescription = } else { - const subtext = "reactivated their orchestrator"; + const subtext = "reactivated"; const descriptions = [ "round " + tmpWhen ] @@ -154,7 +154,7 @@ export const getEvents = () => async dispatch => { else if (eventContainsRebond) { eventType = "Stake"; eventColour = stakeColour; - const subtext = "changed stake amount"; + const subtext = "changed stake"; const descriptions = [ tmpAmount.toFixed(2) + " LPT" ] @@ -173,7 +173,7 @@ export const getEvents = () => async dispatch => { } else if (eventFrom === eventTo) { eventFrom = ""; - const subtext = "changed stake amount"; + const subtext = "changed stake"; const descriptions = [ tmpAmount.toFixed(2) + " LPT" ] @@ -261,7 +261,7 @@ export const getEvents = () => async dispatch => { if (amount < thresholdFees) { continue; } - const subtext = "withdrew fee rewards"; + const subtext = "withdrew fees"; const descriptions = [ amount.toFixed(4) + " Eth" ] @@ -286,7 +286,7 @@ export const getEvents = () => async dispatch => { eventContainsTranscoderUpdate = true; const amount1 = parseFloat(eventObj.data.rewardCut) / 10000; const amount2 = 100 - (eventObj.data.feeShare / 10000); - const subtext = "changed commission rates"; + const subtext = "changed commission"; const descriptions = [ amount1.toFixed(2) + "% on staking rewards", amount2.toFixed(2) + "% on transcoding fees" @@ -315,9 +315,9 @@ export const getEvents = () => async dispatch => { if (amount1 < thresholdStaking && amount2 < thresholdFees) { continue; } - const subtext = "delegator claimed rewards"; + const subtext = "delegator claimed"; const descriptions = [ - "of " + (eventObj.data.endRound - eventObj.data.startRound + 1) + " rounds", + (eventObj.data.endRound - eventObj.data.startRound + 1) + " rounds", "+" + amount1.toFixed(2) + " LPT rewards", "+" + amount2.toFixed(4) + " Eth fees" ] diff --git a/src/components/BlockViewer.js b/src/components/BlockViewer.js index 10235e6..b8cc510 100644 --- a/src/components/BlockViewer.js +++ b/src/components/BlockViewer.js @@ -6,15 +6,15 @@ const Block = (obj) => { dateObj.setUTCSeconds(thisEpoch); const [thisDate, thisTime] = dateObj.toISOString().split('T'); return ( -
+
-

🔗

+

🔗

- -

UTC 📅{thisDate} - {thisTime.split('.')[0]}

+ + UTC 📅{thisDate} - {thisTime.split('.')[0]}
) diff --git a/src/components/ContractPrices.js b/src/components/ContractPrices.js index 8623292..0f153cf 100644 --- a/src/components/ContractPrices.js +++ b/src/components/ContractPrices.js @@ -94,11 +94,11 @@ const ContractPrices = (obj) => { } return ( -
-
-

Smart contract prices

+
+
+

Smart contract prices

-
+
diff --git a/src/components/OrchAddressViewer.js b/src/components/OrchAddressViewer.js index 5bc6776..b9365c3 100644 --- a/src/components/OrchAddressViewer.js +++ b/src/components/OrchAddressViewer.js @@ -2,11 +2,11 @@ import React from "react"; const Address = (obj) => { return ( -
+
- diff --git a/src/components/OrchDelegatorViewer.js b/src/components/OrchDelegatorViewer.js index d91c5e7..f1cc0b2 100644 --- a/src/components/OrchDelegatorViewer.js +++ b/src/components/OrchDelegatorViewer.js @@ -39,6 +39,7 @@ const OrchDelegatorViewer = (obj) => {

The selected Orchestrator has no Delegators

+
) diff --git a/src/components/OrchInfoViewer.js b/src/components/OrchInfoViewer.js index 1b0bc87..9aab279 100644 --- a/src/components/OrchInfoViewer.js +++ b/src/components/OrchInfoViewer.js @@ -69,22 +69,22 @@ const OrchInfoViewer = (obj) => { } return ( -
-
+
+
-
+ -
+
-
+
-
+
diff --git a/src/components/eventButton.js b/src/components/eventButton.js index 81d6b11..07b50ff 100644 --- a/src/components/eventButton.js +++ b/src/components/eventButton.js @@ -1,20 +1,13 @@ import React from "react"; -import { - getOrchestratorInfo -} from "../actions/livepeer"; -import { useDispatch } from 'react-redux'; import Block from "./BlockViewer"; +import EventButtonAddress from "./eventButtonAddress"; /// Displays a single event. Sets selected Orchestrator info in the redux store const EventButton = (obj) => { - const dispatch = useDispatch(); - - let eventTo; let eventFrom; let eventCaller; - let eventRightAddr; if (obj.eventObj.eventFrom === "0x0000000000000000000000000000000000000000") { obj.eventObj.eventFrom = ""; } @@ -24,52 +17,16 @@ const EventButton = (obj) => { if (obj.eventObj.eventTo || obj.eventObj.eventFrom || obj.eventObj.eventCaller) { if (obj.eventObj.eventTo) { eventTo = -
- - - - - To        :  - -
+ } if (obj.eventObj.eventFrom) { eventFrom = -
- - - - - From  :  - -
+ } if (obj.eventObj.eventCaller) { eventCaller = -
- - - - - Caller :  - -
+ } - eventRightAddr =
- -
} let blockNumber; @@ -78,24 +35,29 @@ const EventButton = (obj) => { } return ( -
+
{blockNumber} -
-
+
+
+
{eventCaller}
-
-
+
+
+
{obj.eventObj.eventDescription}
+
{eventFrom}
{eventTo}
+
+
) } diff --git a/src/components/eventButtonAddress.js b/src/components/eventButtonAddress.js new file mode 100644 index 0000000..7a6edba --- /dev/null +++ b/src/components/eventButtonAddress.js @@ -0,0 +1,26 @@ +import React from "react"; +import { + getOrchestratorInfo +} from "../actions/livepeer"; +import { useDispatch } from 'react-redux'; + +const EventButtonAddress = (obj) => { + const dispatch = useDispatch(); + + return ( +
+ + + + + {obj.name} + +
+ ) +} + +export default EventButtonAddress; \ No newline at end of file diff --git a/src/components/eventViewer.js b/src/components/eventViewer.js index ecc7c12..1264cd7 100644 --- a/src/components/eventViewer.js +++ b/src/components/eventViewer.js @@ -196,20 +196,21 @@ const EventViewer = (obj) => { let showMoreButton; if (hidden == 0) { showMoreButton = -
-
-

+

+
+

☑️ Reached end of results

} else { showMoreButton = -
-
-
@@ -219,7 +220,7 @@ const EventViewer = (obj) => { let filterBit; if (obj.showFilter) { filterBit = -
+
Showing {hidden + unfiltered} out of {limitShown} results
@@ -229,23 +230,25 @@ const EventViewer = (obj) => { } return ( -
+
{filterBit} -
-
+
+
-
+
{eventList} +
{showMoreButton} +
-
-
-
+
diff --git a/src/style.css b/src/style.css index 0f19e3f..ab04aaa 100644 --- a/src/style.css +++ b/src/style.css @@ -239,6 +239,12 @@ svg { align-items: stretch; } +.halfVerticalDivider { + height: 10px; + display: flex; + align-items: stretch; +} + .smallVerticalDivider { height: 5px; display: flex; @@ -254,7 +260,10 @@ svg { align-items: center; justify-content: center; flex-direction: row; - width: auto; +} + +.makeItWide { + width: 50vw; } .forceVertical { @@ -500,6 +509,11 @@ svg { padding-right: 1em; } +.onlyVerticalScroll { + overflow-y: auto; + overflow-x: hidden; +} + .noCursor { cursor: default; @@ -514,8 +528,8 @@ svg { } .roundedOpaqueDark { - background-color: rgba(17, 18, 23, 0.95); - box-shadow: 9px 13px 18px 8px rgba(20, 20, 19, 0.692); + background-color: rgba(5, 5, 10, 0.95); + box-shadow: 9px 13px 18px 8px rgba(5, 5, 10, 0.6); box-sizing: border-box; backdrop-filter: blur(6px); border-radius: 1em;