[#522] fix bugs in usePendingTransaction

IntersectMBO · Mar 25, 2024 · bb26945 · bb26945
1 parent 4f56941
commit bb26945
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 55 deletions.
diff --git a/govtool/frontend/src/context/pendingTransaction/types.ts b/govtool/frontend/src/context/pendingTransaction/types.ts
@@ -15,14 +15,14 @@ export type TransactionType =
 export type TransactionStateWithoutResource = {
   type: TransactionTypeWithoutResource;
   transactionHash: string;
-  time: Date;
+  time: string;
   resourceId?: never;
 };
 
 export type TransactionStateWithResource = {
   type: TransactionTypeWithResource;
   transactionHash: string;
-  time: Date;
+  time: string;
   resourceId: string;
 };
 

diff --git a/govtool/frontend/src/context/pendingTransaction/usePendingTransaction.ts b/govtool/frontend/src/context/pendingTransaction/usePendingTransaction.ts
@@ -20,15 +20,13 @@ const DB_SYNC_REFRESH_TIME = 3 * 1000; // 3 SECONDS
 const DB_SYNC_MAX_ATTEMPTS = 10;
 
 type UsePendingTransactionProps = {
-  dRepID: string;
   isEnabled: boolean;
   stakeKey: string | undefined;
 };
 
 export const usePendingTransaction = ({
   isEnabled,
   stakeKey,
-  dRepID,
 }: UsePendingTransactionProps) => {
   const { t } = useTranslation();
   const { openModal, closeModal } = useModal<StatusModalState>();
@@ -57,11 +55,10 @@ export const usePendingTransaction = ({
       const fromLocalStorage = getItemFromLocalStorage(
         `${PENDING_TRANSACTION_KEY}_${stakeKey}`
       );
-      setTransaction(
-        fromLocalStorage
-          ? { ...fromLocalStorage, time: new Date(fromLocalStorage.time) }
-          : null
-      );
+      setTransaction({
+        ...fromLocalStorage,
+        resourceId: fromLocalStorage?.resourceId ?? undefined,
+      });
     }
   }, [isEnabled, stakeKey]);
 
@@ -84,9 +81,7 @@ export const usePendingTransaction = ({
         if (isEnabled) {
           const desiredResult = getDesiredResult(
             type,
-            dRepID,
             resourceId,
-            stakeKey
           );
           const queryKey = getQueryKey(type, transaction);
 
@@ -120,7 +115,7 @@ export const usePendingTransaction = ({
     if (isEnabled && transaction) {
       addWarningAlert(t("alerts.transactionInProgress"), 10000);
     }
-  }, [transaction]);
+  }, [isEnabled, transaction]);
 
   const isPendingTransaction = useCallback(() => {
     if (transaction) {
@@ -144,14 +139,17 @@ export const usePendingTransaction = ({
 
   const updateTransaction = (data: Omit<TransactionState, "time">) => {
     const newTransaction = {
-      time: new Date(),
+      time: new Date().toISOString(),
       ...data,
     } as TransactionState;
 
     setTransaction(newTransaction);
     setItemToLocalStorage(
       `${PENDING_TRANSACTION_KEY}_${stakeKey}`,
-      JSON.stringify(newTransaction)
+      {
+        ...newTransaction,
+        resourceId: newTransaction.resourceId || null,
+      }
     );
   };
 
@@ -162,5 +160,5 @@ export const usePendingTransaction = ({
   };
 };
 
-const isTransactionExpired = (time: Date): boolean =>
-  Date.now() - time.getTime() > TIME_TO_EXPIRE_TRANSACTION;
+const isTransactionExpired = (time: string): boolean =>
+  Date.now() - new Date(time).getTime() > TIME_TO_EXPIRE_TRANSACTION;
diff --git a/govtool/frontend/src/context/pendingTransaction/utils.tsx b/govtool/frontend/src/context/pendingTransaction/utils.tsx
@@ -4,17 +4,14 @@ import { TransactionType, TransactionState } from "./types";
 
 export const getDesiredResult = (
   type: TransactionType,
-  dRepID: string,
   resourceId: string | undefined,
-  stakeKey?: string
 ) => {
   switch (type) {
     case "delegate": {
       // current delegation
-      if (resourceId === dRepID) return dRepID;
       if (resourceId === "no confidence") return "drep_always_no_confidence";
       if (resourceId === "abstain") return "drep_always_abstain";
-      return stakeKey;
+      return resourceId;
     }
     case "registerAsDrep":
     case "registerAsSoleVoter":
@@ -38,9 +35,9 @@ export const getQueryKey = (
     case "retireAsDrep":
     case "registerAsSoleVoter":
     case "retireAsSoleVoter":
-      return [QUERY_KEYS.useGetDRepInfoKey, transaction];
+      return [QUERY_KEYS.useGetDRepInfoKey, transaction?.transactionHash];
     case "delegate":
-      return [QUERY_KEYS.getAdaHolderCurrentDelegationKey, transaction];
+      return [QUERY_KEYS.getAdaHolderCurrentDelegationKey, transaction?.transactionHash];
     default:
       return undefined;
   }
@@ -58,7 +55,7 @@ export const refetchData = async (
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const data = await queryClient.getQueryData<any>(queryKey);
 
-  if (type === "delegate") return data.currentDelegation;
+  if (type === "delegate") return data;
   if (type === "registerAsDrep" || type === "retireAsDrep") return data.isRegisteredAsDRep;
   if (type === "registerAsSoleVoter" || type === "retireAsSoleVoter") return data.isRegisteredAsSoleVoter;
   return undefined;

diff --git a/govtool/frontend/src/context/wallet.tsx b/govtool/frontend/src/context/wallet.tsx
@@ -1,6 +1,5 @@
 // TODO: enable eslint and fix all the errors with wallet refactor
 /* eslint-disable */
-// @ts-nocheck
 import {
   createContext,
   useCallback,
@@ -71,7 +70,8 @@ import { getUtxos } from './getUtxos';
 import { useModal, useSnackbar } from '.';
 import {
   PendingTransaction,
-  TransactionType,
+  TransactionStateWithResource,
+  TransactionStateWithoutResource,
   usePendingTransaction,
 } from './pendingTransaction';
 
@@ -97,6 +97,16 @@ type TreasuryProps = {
   url: string;
 };
 
+type BuildSignSubmitConwayCertTxArgs = {
+  certBuilder?: CertificatesBuilder;
+  govActionBuilder?: VotingProposalBuilder;
+  votingBuilder?: VotingBuilder;
+  voterDeposit?: string;
+} & (
+  | Pick<TransactionStateWithoutResource, 'type' | 'resourceId'>
+  | Pick<TransactionStateWithResource, 'type' | 'resourceId'>
+  );
+
 interface CardanoContext {
   address?: string;
   disconnectWallet: () => Promise<void>;
@@ -119,24 +129,15 @@ interface CardanoContext {
     type,
     votingBuilder,
     voterDeposit,
-  }: {
-    certBuilder?: CertificatesBuilder;
-    govActionBuilder?: VotingProposalBuilder;
-    resourceId?: string;
-    type: TransactionType;
-    votingBuilder?: VotingBuilder;
-    voterDeposit?: string;
-  }) => Promise<string>;
+  }: BuildSignSubmitConwayCertTxArgs) => Promise<string>;
   buildDRepRegCert: (
     url?: string,
     hash?: string,
-    hash?: string,
   ) => Promise<CertificatesBuilder>;
   buildVoteDelegationCert: (vote: string) => Promise<CertificatesBuilder>;
   buildDRepUpdateCert: (
     url?: string,
     hash?: string,
-    hash?: string,
   ) => Promise<CertificatesBuilder>;
   buildDRepRetirementCert: (
     voterDeposit: string,
@@ -147,7 +148,6 @@ interface CardanoContext {
     index: number,
     cip95MetadataURL?: string,
     cip95MetadataHash?: string,
-    cip95MetadataHash?: string,
   ) => Promise<VotingBuilder>;
   pendingTransaction: PendingTransaction;
   isPendingTransaction: () => boolean;
@@ -186,7 +186,6 @@ const CardanoProvider = (props: Props) => {
   const [stakeKey, setStakeKey] = useState<string | undefined>(undefined);
   const [stakeKeys, setStakeKeys] = useState<string[]>([]);
   const [isMainnet, setIsMainnet] = useState<boolean>(false);
-  const { openModal, closeModal } = useModal<StatusModalState>();
   const [registeredStakeKeysListState, setRegisteredPubStakeKeysState] =
     useState<string[]>([]);
   const [error, setError] = useState<string | undefined>(undefined);
@@ -201,7 +200,7 @@ const CardanoProvider = (props: Props) => {
   const epochParams = getItemFromLocalStorage(PROTOCOL_PARAMS_KEY);
 
   const { isPendingTransaction, updateTransaction, pendingTransaction } =
-    usePendingTransaction({ dRepID, isEnabled, stakeKey });
+    usePendingTransaction({ isEnabled, stakeKey });
 
   const getChangeAddress = async (enabledApi: CardanoApiWallet) => {
     try {
@@ -430,14 +429,7 @@ const CardanoProvider = (props: Props) => {
       type,
       votingBuilder,
       voterDeposit,
-    }: {
-      certBuilder?: CertificatesBuilder;
-      govActionBuilder?: VotingProposalBuilder;
-      resourceId?: string;
-      type: TransactionType;
-      votingBuilder?: VotingBuilder;
-      voterDeposit?: string;
-    }) => {
+    }: BuildSignSubmitConwayCertTxArgs) => {
       await checkIsMaintenanceOn();
       const isPendingTx = isPendingTransaction();
       if (isPendingTx) return;

diff --git a/govtool/frontend/src/hooks/queries/useGetAdaHolderCurrentDelegationQuery.ts b/govtool/frontend/src/hooks/queries/useGetAdaHolderCurrentDelegationQuery.ts
@@ -4,13 +4,13 @@ import { getAdaHolderCurrentDelegation } from "@services";
 import { QUERY_KEYS } from "@consts";
 import { useCardano } from "@context";
 
-export const useGetAdaHolderCurrentDelegationQuery = (stakeKey?: string) => {
+export const useGetAdaHolderCurrentDelegationQuery = (stakeKey: string | undefined) => {
   const { pendingTransaction } = useCardano();
 
   const { data, isLoading } = useQuery({
     queryKey: [
       QUERY_KEYS.getAdaHolderCurrentDelegationKey,
-      pendingTransaction.delegate,
+      pendingTransaction.delegate?.transactionHash,
     ],
     queryFn: () => getAdaHolderCurrentDelegation({ stakeKey }),
     enabled: !!stakeKey,

diff --git a/govtool/frontend/src/hooks/queries/useGetDRepListQuery.ts b/govtool/frontend/src/hooks/queries/useGetDRepListQuery.ts
@@ -10,10 +10,10 @@ export const useGetDRepListQuery = () => {
   const { data, isLoading } = useQuery({
     queryKey: [
       QUERY_KEYS.useGetDRepListKey,
-      pendingTransaction.registerAsSoleVoter ||
+      (pendingTransaction.registerAsSoleVoter ||
         pendingTransaction.registerAsDrep ||
         pendingTransaction.retireAsSoleVoter ||
-        pendingTransaction.retireAsDrep,
+        pendingTransaction.retireAsDrep)?.transactionHash,
     ],
     queryFn: getDRepList,
   });

diff --git a/govtool/frontend/src/hooks/queries/useGetDRepVotesQuery.ts b/govtool/frontend/src/hooks/queries/useGetDRepVotesQuery.ts
@@ -11,7 +11,7 @@ export const useGetDRepVotesQuery = (filters: string[], sorting: string) => {
   const { data, isLoading, refetch, isRefetching } = useQuery({
     queryKey: [
       QUERY_KEYS.useGetDRepVotesKey,
-      pendingTransaction.vote,
+      pendingTransaction.vote?.transactionHash,
       filters,
       sorting,
     ],

diff --git a/govtool/frontend/src/hooks/queries/useGetProposalsInfiniteQuery.ts b/govtool/frontend/src/hooks/queries/useGetProposalsInfiniteQuery.ts
@@ -33,7 +33,7 @@ export const useGetProposalsInfiniteQuery = ({
       dRepID,
       filters,
       isEnabled,
-      pendingTransaction.vote,
+      pendingTransaction.vote?.transactionHash,
       sorting,
     ],
     fetchProposals,

diff --git a/govtool/frontend/src/hooks/queries/useGetProposalsQuery.ts b/govtool/frontend/src/hooks/queries/useGetProposalsQuery.ts
@@ -28,7 +28,7 @@ export const useGetProposalsQuery = ({
       filters,
       sorting,
       dRepID,
-      pendingTransaction.vote,
+      pendingTransaction.vote?.transactionHash,
     ],
     fetchProposals,
   );

diff --git a/govtool/frontend/src/hooks/queries/useGetVoterInfoQuery.ts b/govtool/frontend/src/hooks/queries/useGetVoterInfoQuery.ts
@@ -10,10 +10,10 @@ export const useGetVoterInfo = () => {
   const { data } = useQuery({
     queryKey: [
       QUERY_KEYS.useGetDRepInfoKey,
-      pendingTransaction.registerAsDrep ||
+      (pendingTransaction.registerAsDrep ||
         pendingTransaction.registerAsSoleVoter ||
         pendingTransaction.retireAsDrep ||
-        pendingTransaction.retireAsSoleVoter,
+        pendingTransaction.retireAsSoleVoter)?.transactionHash,
     ],
     enabled: !!dRepID,
     queryFn: () => getVoterInfo(dRepID),