diff --git a/dappnode/hooks/use-get-exit-requests.ts b/dappnode/hooks/use-get-exit-requests.ts index bcac7831..e22e34ce 100644 --- a/dappnode/hooks/use-get-exit-requests.ts +++ b/dappnode/hooks/use-get-exit-requests.ts @@ -6,6 +6,7 @@ import { fetchWithRetry } from 'dappnode/utils/fetchWithRetry'; const useGetExitRequests = () => { const { backendUrl } = useDappnodeUrls(); const [exitRequests, setExitRequests] = useState(); + const [isLoading, setIsLoading] = useState(false); const nodeOperator = useActiveNodeOperator(); @@ -20,6 +21,7 @@ const useGetExitRequests = () => { const getExitRequests = async () => { try { + setIsLoading(true); console.debug(`GETting validators exit requests from indexer API`); const url = `${backendUrl}/api/v0/events_indexer/exit_requests?operatorId=${nodeOperator?.id}`; const options = { @@ -44,14 +46,16 @@ const useGetExitRequests = () => { ); setExitRequests(filteredData); + setIsLoading(false); } catch (e) { console.error( `Error GETting validators exit requests from indexer API: ${e}`, ); + setIsLoading(false); } }; - return { exitRequests, getExitRequests }; + return { exitRequests, getExitRequests, isLoading }; }; export default useGetExitRequests; diff --git a/dappnode/status/warnings.tsx b/dappnode/status/warnings.tsx index 27ab7de8..4b16a067 100644 --- a/dappnode/status/warnings.tsx +++ b/dappnode/status/warnings.tsx @@ -20,7 +20,11 @@ import { useGetInfraStatus } from 'dappnode/hooks/use-get-infra-status'; export const Warnings: FC = () => { const { brainUrl, stakersUiUrl, MEVPackageConfig } = useDappnodeUrls(); const { missingKeys, keysLoading, error: errorBrain } = useMissingKeys(); - const { exitRequests, getExitRequests } = useGetExitRequests(); + const { + exitRequests, + getExitRequests, + isLoading: exitsLoading, + } = useGetExitRequests(); const [isImportModalOpen, setIsImportModalOpen] = useState(false); const { ECStatus, CCStatus, isCCLoading, isECLoading } = useGetInfraStatus(); const { @@ -93,14 +97,19 @@ export const Warnings: FC = () => { return ( 0}>
{numWarnings > 0 ? (

- You have {numWarnings}{' '} + You have {numWarnings} warning/s

) : ( @@ -129,68 +138,65 @@ export const Warnings: FC = () => {

Your Consensus Client is not installed!

Please, select and sync a client from the Stakers tab.

Set Consensus Client - {' '} + - - - 0 && !errorBrain}> - -

- {' '} - {missingKeys.length} keys - are not imported in Web3Signer -

- {missingKeys.map((key) => ( - -
- - - ))} - - - - - - - - + + 0 && !errorBrain}> -

Your Brain API is not Up!

-

Please, if Web3Signer is already installed, re-install it

- Set Web3Signer -
-
+

+ {missingKeys.length} keys are + not imported in Web3Signer +

+ {missingKeys.map((key) => ( + +
+ + + ))} + - 0}> - - - -

- - {validatorsExitRequests.length} - {' '} - Validator/s requested to exit -

-
- {validatorsExitRequests.map((val) => ( - -

{val.index}

- -
- ))} - Exit validators -
+
+ + + + +

Your Brain API is not Up!

+

Please, if Web3Signer is already installed, re-install it

+ Set Web3Signer +
+
+ + 0}> + + + +

+ + {validatorsExitRequests.length} + + Validator/s requested to exit +

+
+ {validatorsExitRequests.map((val) => ( + +

{val.index}

+ +
+ ))} + Exit validators +
+