fix(governance): transfer proposals in batch (#6386)

vegaprotocol · May 8, 2024 · cfffda5 · cfffda5
1 parent 7bfefbc
commit cfffda5
Show file tree

Hide file tree

Showing 6 changed files with 97 additions and 28 deletions.
diff --git a/apps/governance/src/routes/proposals/components/proposal-detail-header/proposal-header.tsx b/apps/governance/src/routes/proposals/components/proposal-detail-header/proposal-header.tsx
@@ -99,7 +99,10 @@ const ProposalDetails = ({
   const featureFlags = useFeatureFlags((store) => store.flags);
   const consoleLink = useLinks(DApp.Console);
 
-  const renderDetails = (terms: ProposalTermsFieldsFragment) => {
+  const renderDetails = (
+    terms: ProposalTermsFieldsFragment,
+    proposalId?: string | null
+  ) => {
     switch (terms.change?.__typename) {
       case 'NewMarket': {
         const getAsset = (terms: ProposalTermsFieldsFragment) => {
@@ -275,11 +278,11 @@ const ProposalDetails = ({
       }
       case 'NewTransfer':
         return featureFlags.GOVERNANCE_TRANSFERS ? (
-          <NewTransferSummary proposalId={proposal?.id} />
+          <NewTransferSummary proposalId={proposalId} />
         ) : null;
       case 'CancelTransfer':
         return featureFlags.GOVERNANCE_TRANSFERS ? (
-          <CancelTransferSummary proposalId={proposal?.id} />
+          <CancelTransferSummary proposalId={proposalId} />
         ) : null;
       default: {
         return null;
@@ -292,7 +295,7 @@ const ProposalDetails = ({
   if (proposal.__typename === 'Proposal') {
     details = (
       <div>
-        <div>{renderDetails(proposal.terms)}</div>
+        <div>{renderDetails(proposal.terms, proposal.id)}</div>
         <VoteStateText
           state={proposal.state}
           closingDatetime={proposal.terms.closingDatetime}
@@ -319,7 +322,7 @@ const ProposalDetails = ({
               >
                 <Indicator indicator={i + 1} />
                 <span>
-                  <div>{renderDetails(p.terms)}</div>
+                  <div>{renderDetails(p.terms, p.id)}</div>
                   <SubProposalStateText
                     state={proposal.state}
                     enactmentDatetime={p.terms.enactmentDatetime}

diff --git a/apps/governance/src/routes/proposals/components/proposal/proposal-change-details.tsx b/apps/governance/src/routes/proposals/components/proposal/proposal-change-details.tsx
@@ -96,13 +96,23 @@ export const ProposalChangeDetails = ({
       break;
     }
     case 'NewTransfer': {
-      if (proposal.id) {
+      if (proposal.__typename === 'BatchProposal' && indicator) {
+        const proposalId = proposal.subProposals?.[indicator - 1]?.id;
+        if (proposalId) {
+          details = <ProposalTransferDetails proposalId={proposalId} />;
+        }
+      } else if (proposal.id) {
         details = <ProposalTransferDetails proposalId={proposal.id} />;
       }
       break;
     }
     case 'CancelTransfer': {
-      if (proposal.id) {
+      if (proposal.__typename === 'BatchProposal' && indicator) {
+        const proposalId = proposal.subProposals?.[indicator - 1]?.id;
+        if (proposalId) {
+          details = <ProposalCancelTransferDetails proposalId={proposalId} />;
+        }
+      } else if (proposal.id) {
         details = <ProposalCancelTransferDetails proposalId={proposal.id} />;
       }
       break;

diff --git a/libs/proposals/src/lib/proposals-hooks/Proposal.graphql b/libs/proposals/src/lib/proposals-hooks/Proposal.graphql
@@ -114,6 +114,18 @@ query NewTransferDetails($proposalId: ID!) {
         }
       }
     }
+    ... on BatchProposal {
+      subProposals {
+        id
+        terms {
+          change {
+            ... on NewTransfer {
+              ...NewTransferFields
+            }
+          }
+        }
+      }
+    }
   }
 }
 
@@ -129,5 +141,17 @@ query CancelTransferDetails($proposalId: ID!) {
         }
       }
     }
+    ... on BatchProposal {
+      subProposals {
+        id
+        terms {
+          change {
+            ... on CancelTransfer {
+              ...CancelTransferFields
+            }
+          }
+        }
+      }
+    }
   }
 }
diff --git a/libs/proposals/src/lib/proposals-hooks/__generated__/Proposal.ts b/libs/proposals/src/lib/proposals-hooks/__generated__/Proposal.ts
diff --git a/libs/proposals/src/lib/proposals-hooks/use-cancel-transfer-proposal-details.ts b/libs/proposals/src/lib/proposals-hooks/use-cancel-transfer-proposal-details.ts
@@ -1,9 +1,5 @@
-import { type SingleProposal } from '../../types';
 import { type CancelTransferFieldsFragment } from '../proposals-data-provider';
-import {
-  useCancelTransferDetailsQuery,
-  type CancelTransferDetailsQuery,
-} from './__generated__/Proposal';
+import { useCancelTransferDetailsQuery } from './__generated__/Proposal';
 
 export const useCancelTransferProposalDetails = (
   proposalId?: string | null
@@ -15,12 +11,20 @@ export const useCancelTransferProposalDetails = (
     skip: !proposalId || proposalId.length === 0,
   });
 
-  const proposal = data?.proposal as SingleProposal<
-    CancelTransferDetailsQuery['proposal']
-  >;
+  const proposal = data?.proposal;
 
-  if (proposal?.terms.change.__typename === 'CancelTransfer') {
-    return proposal?.terms.change as CancelTransferFieldsFragment;
+  if (
+    proposal?.__typename === 'Proposal' &&
+    proposal.terms.change.__typename === 'CancelTransfer'
+  ) {
+    return proposal.terms.change as CancelTransferFieldsFragment;
+  }
+
+  if (proposal?.__typename === 'BatchProposal') {
+    const p = proposal.subProposals?.find((sub) => sub?.id === proposalId);
+    if (p && p.terms?.change.__typename === 'CancelTransfer') {
+      return p.terms.change as CancelTransferFieldsFragment;
+    }
   }
 
   return undefined;

diff --git a/libs/proposals/src/lib/proposals-hooks/use-new-transfer-proposal-details.ts b/libs/proposals/src/lib/proposals-hooks/use-new-transfer-proposal-details.ts
@@ -1,9 +1,5 @@
-import { type SingleProposal } from '../../types';
 import { type NewTransferFieldsFragment } from '../proposals-data-provider';
-import {
-  useNewTransferDetailsQuery,
-  type NewTransferDetailsQuery,
-} from './__generated__/Proposal';
+import { useNewTransferDetailsQuery } from './__generated__/Proposal';
 
 export const useNewTransferProposalDetails = (proposalId?: string | null) => {
   const { data } = useNewTransferDetailsQuery({
@@ -13,13 +9,21 @@ export const useNewTransferProposalDetails = (proposalId?: string | null) => {
     skip: !proposalId || proposalId.length === 0,
   });
 
-  const proposal = data?.proposal as SingleProposal<
-    NewTransferDetailsQuery['proposal']
-  >;
+  const proposal = data?.proposal;
 
-  if (proposal?.terms.change.__typename === 'NewTransfer') {
+  if (
+    proposal?.__typename === 'Proposal' &&
+    proposal.terms.change.__typename === 'NewTransfer'
+  ) {
     return proposal?.terms.change as NewTransferFieldsFragment;
   }
 
+  if (proposal?.__typename === 'BatchProposal') {
+    const p = proposal.subProposals?.find((sub) => sub?.id === proposalId);
+    if (p && p.terms?.change.__typename === 'NewTransfer') {
+      return p.terms.change as NewTransferFieldsFragment;
+    }
+  }
+
   return undefined;
 };