Merge pull request #947 from IntersectMBO/897-bug-slow-delegation-issue

[#897] Slow delegation issue // usePendingTransaction fixes
IntersectMBO · May 7, 2024 · b919a42 · b919a42
2 parents 189e27c + 492b2a0
commit b919a42
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/govtool/frontend/src/context/pendingTransaction/usePendingTransaction.ts b/govtool/frontend/src/context/pendingTransaction/usePendingTransaction.ts
@@ -80,6 +80,7 @@ export const usePendingTransaction = ({
 
       if (status.transactionConfirmed) {
         clearInterval(interval);
+
         if (isEnabled) {
           const desiredResult = getDesiredResult(type, resourceId);
           const queryKey = getQueryKey(type, transaction);
@@ -89,7 +90,13 @@ export const usePendingTransaction = ({
           while (!isDBSyncUpdated && count < DB_SYNC_MAX_ATTEMPTS) {
             count++;
             // eslint-disable-next-line no-await-in-loop
-            const data = await refetchData(type, queryClient, queryKey);
+            const data = await refetchData(
+              type,
+              queryClient,
+              queryKey,
+              resourceId,
+            );
+
             if (desiredResult === data) {
               addSuccessAlert(t(`alerts.${type}.success`));
               resetTransaction();

diff --git a/govtool/frontend/src/context/pendingTransaction/utils.tsx b/govtool/frontend/src/context/pendingTransaction/utils.tsx
@@ -50,6 +50,7 @@ export const refetchData = async (
   type: TransactionType,
   queryClient: QueryClient,
   queryKey: QueryKey | undefined,
+  resourceId: string | undefined,
 ) => {
   if (queryKey === undefined) return;
 
@@ -58,10 +59,15 @@ 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;
+  if (type === "delegate") {
+    if (resourceId === "no confidence" || resourceId === "abstain") {
+      return data.dRepView;
+    }
+    return data.dRepHash;
+  }
   if (type === "registerAsDrep" || type === "retireAsDrep")
     return data.isRegisteredAsDRep;
   if (type === "registerAsDirectVoter" || type === "retireAsDirectVoter")
-    return data.isRegisteredAsDirectVoter;
+    return data.isRegisteredAsSoleVoter;
   return undefined;
 };
diff --git a/govtool/frontend/src/hooks/useDelegateToDrep.ts b/govtool/frontend/src/hooks/useDelegateToDrep.ts
@@ -33,15 +33,12 @@ export const useDelegateTodRep = () => {
           );
           certBuilder.add(retirementCert);
         }
-        const result = await buildSignSubmitConwayCertTx({
+        await buildSignSubmitConwayCertTx({
           certBuilder,
           type: "delegate",
           resourceId: dRepId,
           voter,
         });
-        if (result) {
-          addSuccessAlert(t("alerts.delegate.success"));
-        }
       } catch (error) {
         openWalletErrorModal({
           error,