[#541] fix dashboard infinte loading

IntersectMBO · Mar 27, 2024 · 3f62209 · 3f62209
1 parent 4eec162
commit 3f62209
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/govtool/frontend/src/components/organisms/DashboardCards.tsx b/govtool/frontend/src/components/organisms/DashboardCards.tsx
@@ -22,11 +22,16 @@ export const DashboardCards = () => {
   } = useCardano();
   const { screenWidth } = useScreenDimension();
 
-  const { currentDelegation } = useGetAdaHolderCurrentDelegationQuery(stakeKey);
-  const { votingPower } = useGetAdaHolderVotingPowerQuery(stakeKey);
-  const { voter } = useGetVoterInfo();
+  const { currentDelegation, isCurrentDelegationLoading }
+    = useGetAdaHolderCurrentDelegationQuery(stakeKey);
+  const { votingPower, powerIsLoading } = useGetAdaHolderVotingPowerQuery(stakeKey);
+  const { voter, isVoterLoading } = useGetVoterInfo();
 
-  if (!currentDelegation || !voter || !votingPower) {
+  if (
+    (currentDelegation === undefined && isCurrentDelegationLoading)
+    || (votingPower === undefined && powerIsLoading)
+    || (voter === undefined && isVoterLoading)
+  ) {
     return (
       <Box
         sx={{

diff --git a/govtool/frontend/src/components/organisms/DashboardCards/DRepDashboardCard.tsx b/govtool/frontend/src/components/organisms/DashboardCards/DRepDashboardCard.tsx
@@ -14,7 +14,7 @@ import { VoterInfo } from "@/models";
 type DRepDashboardCardProps = {
   dRepIDBech32: string;
   pendingTransaction: PendingTransaction;
-  voter: VoterInfo;
+  voter: VoterInfo | undefined;
 };
 
 export const DRepDashboardCard = ({

diff --git a/govtool/frontend/src/components/organisms/DashboardCards/ListGovActionsDashboardCard.tsx b/govtool/frontend/src/components/organisms/DashboardCards/ListGovActionsDashboardCard.tsx
@@ -6,7 +6,7 @@ import { DashboardActionCard } from "@molecules";
 import { VoterInfo } from "@/models";
 
 type ListGovActionsDashboardCardsProps = {
-  voter: VoterInfo;
+  voter: VoterInfo | undefined;
 };
 
 export const ListGovActionsDashboardCards = ({ voter }: ListGovActionsDashboardCardsProps) => {

diff --git a/govtool/frontend/src/components/organisms/DashboardCards/SoleVoterDashboardCard.tsx b/govtool/frontend/src/components/organisms/DashboardCards/SoleVoterDashboardCard.tsx
@@ -11,7 +11,7 @@ import { VoterInfo } from "@/models";
 
 type SoleVoterDashboardCardProps = {
   pendingTransaction: PendingTransaction;
-  voter: VoterInfo;
+  voter: VoterInfo | undefined;
   votingPower: number;
 };
 

diff --git a/govtool/frontend/src/hooks/queries/useGetVoterInfoQuery.ts b/govtool/frontend/src/hooks/queries/useGetVoterInfoQuery.ts
@@ -7,7 +7,7 @@ import { getVoterInfo } from "@services";
 export const useGetVoterInfo = () => {
   const { dRepID, pendingTransaction } = useCardano();
 
-  const { data } = useQuery({
+  const { data, isLoading } = useQuery({
     queryKey: [
       QUERY_KEYS.useGetDRepInfoKey,
       (pendingTransaction.registerAsDrep ||
@@ -19,5 +19,5 @@ export const useGetVoterInfo = () => {
     queryFn: () => getVoterInfo(dRepID),
   });
 
-  return { voter: data };
+  return { voter: data, isVoterLoading: isLoading };
 };