From 8eb1c0c7d56a9b582eecf1af6e14dd38115a41c1 Mon Sep 17 00:00:00 2001 From: Marco van Dijk Date: Thu, 21 Apr 2022 22:46:59 +0200 Subject: [PATCH] disable auto refresh && show index in list --- src/actions/livepeer.js | 40 ++++++++++++++++++++++++++--------- src/components/WinnerMonth.js | 1 + src/components/WinnerStat.js | 3 +++ src/pages/loadingScreen.js | 20 +++++++++--------- 4 files changed, 44 insertions(+), 20 deletions(-) diff --git a/src/actions/livepeer.js b/src/actions/livepeer.js index 964939a..8306e90 100644 --- a/src/actions/livepeer.js +++ b/src/actions/livepeer.js @@ -267,7 +267,9 @@ export const getAllUpdateEvents = () => async dispatch => { const response = await apiUtil.getAllUpdateEvents(); const data = await response.json(); if (response.ok) { - return dispatch(setAllUpdateEvents(data)); + if (data && data.length){ + return dispatch(setAllUpdateEvents(data)); + } } return dispatch(receiveErrors(data)); }; @@ -276,7 +278,9 @@ export const getAllRewardEvents = () => async dispatch => { const response = await apiUtil.getAllRewardEvents(); const data = await response.json(); if (response.ok) { - return dispatch(setAllRewardEvents(data)); + if (data && data.length){ + return dispatch(setAllRewardEvents(data)); + } } return dispatch(receiveErrors(data)); }; @@ -285,7 +289,9 @@ export const getAllClaimEvents = () => async dispatch => { const response = await apiUtil.getAllClaimEvents(); const data = await response.json(); if (response.ok) { - return dispatch(setAllClaimEvents(data)); + if (data && data.length){ + return dispatch(setAllClaimEvents(data)); + } } return dispatch(receiveErrors(data)); }; @@ -294,7 +300,9 @@ export const getAllWithdrawStakeEvents = () => async dispatch => { const response = await apiUtil.getAllWithdrawStakeEvents(); const data = await response.json(); if (response.ok) { - return dispatch(setAllWithdrawStakeEvents(data)); + if (data && data.length){ + return dispatch(setAllWithdrawStakeEvents(data)); + } } return dispatch(receiveErrors(data)); }; @@ -303,7 +311,9 @@ export const getAllWithdrawFeesEvents = () => async dispatch => { const response = await apiUtil.getAllWithdrawFeesEvents(); const data = await response.json(); if (response.ok) { - return dispatch(setAllWithdrawFeesEvents(data)); + if (data && data.length){ + return dispatch(setAllWithdrawFeesEvents(data)); + } } return dispatch(receiveErrors(data)); }; @@ -312,7 +322,9 @@ export const getAllTransferTicketEvents = () => async dispatch => { const response = await apiUtil.getAllTransferTicketEvents(); const data = await response.json(); if (response.ok) { - return dispatch(setAllTransferTicketEvents(data)); + if (data && data.length){ + return dispatch(setAllTransferTicketEvents(data)); + } } return dispatch(receiveErrors(data)); }; @@ -321,7 +333,9 @@ export const getAllRedeemTicketEvents = () => async dispatch => { const response = await apiUtil.getAllRedeemTicketEvents(); const data = await response.json(); if (response.ok) { - return dispatch(setAllRedeemTicketEvents(data)); + if (data && data.length){ + return dispatch(setAllRedeemTicketEvents(data)); + } } return dispatch(receiveErrors(data)); }; @@ -330,7 +344,9 @@ export const getAllActivateEvents = () => async dispatch => { const response = await apiUtil.getAllActivateEvents(); const data = await response.json(); if (response.ok) { - return dispatch(setAllActivateEvents(data)); + if (data && data.length){ + return dispatch(setAllActivateEvents(data)); + } } return dispatch(receiveErrors(data)); }; @@ -339,7 +355,9 @@ export const getAllUnbondEvents = () => async dispatch => { const response = await apiUtil.getAllUnbondEvents(); const data = await response.json(); if (response.ok) { - return dispatch(setAllUnbondEvents(data)); + if (data && data.length){ + return dispatch(setAllUnbondEvents(data)); + } } return dispatch(receiveErrors(data)); }; @@ -348,7 +366,9 @@ export const getAllStakeEvents = () => async dispatch => { const response = await apiUtil.getAllStakeEvents(); const data = await response.json(); if (response.ok) { - return dispatch(setAllStakeEvents(data)); + if (data && data.length){ + return dispatch(setAllStakeEvents(data)); + } } return dispatch(receiveErrors(data)); }; \ No newline at end of file diff --git a/src/components/WinnerMonth.js b/src/components/WinnerMonth.js index f24167e..a7a57de 100644 --- a/src/components/WinnerMonth.js +++ b/src/components/WinnerMonth.js @@ -338,6 +338,7 @@ const WinnerMonth = (obj) => { thisStake={thisStake} thisCommission={thisCommission} address={orch.address} + thisIndex={i + 1} seed={obj.seed + "win" + orch.address + i} />
diff --git a/src/components/WinnerStat.js b/src/components/WinnerStat.js index 93283c5..b96191e 100644 --- a/src/components/WinnerStat.js +++ b/src/components/WinnerStat.js @@ -91,6 +91,9 @@ const Winner = (obj) => { return (
+
+

{obj.thisIndex}

+
diff --git a/src/pages/loadingScreen.js b/src/pages/loadingScreen.js index b393925..486f608 100644 --- a/src/pages/loadingScreen.js +++ b/src/pages/loadingScreen.js @@ -28,16 +28,6 @@ const Startup = (obj) => { dispatch(getQuotes()); dispatch(getBlockchainData()); dispatch(getCurrentOrchestratorInfo()); - dispatch(getAllUpdateEvents()); - dispatch(getAllRewardEvents()); - dispatch(getAllClaimEvents()); - dispatch(getAllWithdrawStakeEvents()); - dispatch(getAllWithdrawFeesEvents()); - dispatch(getAllTransferTicketEvents()); - dispatch(getAllRedeemTicketEvents()); - dispatch(getAllActivateEvents()); - dispatch(getAllUnbondEvents()); - dispatch(getAllStakeEvents()); }); } @@ -65,6 +55,16 @@ const Startup = (obj) => { dispatch(getAllDelInfo()); dispatch(getAllOrchScores()); dispatch(getAllMonthlyStats()); + dispatch(getAllUpdateEvents()); + dispatch(getAllRewardEvents()); + dispatch(getAllClaimEvents()); + dispatch(getAllWithdrawStakeEvents()); + dispatch(getAllWithdrawFeesEvents()); + dispatch(getAllTransferTicketEvents()); + dispatch(getAllRedeemTicketEvents()); + dispatch(getAllActivateEvents()); + dispatch(getAllUnbondEvents()); + dispatch(getAllStakeEvents()); }); }