Merge pull request #3209 from OlympusDAO/develop

[Release] - Fix Proposal Rendering
OlympusDAO · Oct 1, 2024 · 9dfe844 · 9dfe844
2 parents 8746514 + a3c651b
commit 9dfe844
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/src/views/Governance/Components/ProposalContainer.tsx b/src/views/Governance/Components/ProposalContainer.tsx
@@ -30,7 +30,7 @@ export const ProposalContainer = ({
   const { data: proposal, isLoading } = useGetProposalDetails({ proposalId });
   const { data: parameters } = useGetContractParameters();
 
-  const formattedTitle = title?.split(/#+\s|\n/g)[1];
+  const formattedTitle = title;
 
   const dateFormat = new Intl.DateTimeFormat([], {
     month: "short",

diff --git a/src/views/Governance/hooks/useGetProposals.tsx b/src/views/Governance/hooks/useGetProposals.tsx
@@ -39,25 +39,27 @@ export const useGetProposals = () => {
           blockNumber,
         );
 
+        console.log("ProposalCreated events found:", proposalCreatedEvents.length);
+
         // Process each event
         for (const item of proposalCreatedEvents) {
           const timestamp = (await archiveProvider.getBlock(item.blockNumber)).timestamp;
 
           if (item.decode) {
             const details = { ...item.decode(item.data), values: item.args[3] } as ProposalCreatedEventObject;
 
-            // Stop if we hit proposal ID 1
-            if (Number(details.id) === 1) {
-              foundProposalId1 = true;
-              break;
-            }
-
             proposals.push({
               createdAtBlock: new Date(timestamp * 1000),
               details,
               title: details.description.split(/#+\s|\n/g)[1] || `${details.description.slice(0, 20)}...`,
               txHash: item.transactionHash,
             });
+
+            // Stop if we hit proposal ID 1
+            if (Number(details.id) === 1) {
+              foundProposalId1 = true;
+              break;
+            }
           }
         }
 

diff --git a/src/views/Governance/index.tsx b/src/views/Governance/index.tsx
@@ -69,7 +69,7 @@ export const Governance = () => {
                     <ProposalContainer
                       key={index}
                       proposalId={Number(item?.details.id)}
-                      title={item?.details.description}
+                      title={item.title}
                       createdAt={item?.createdAtBlock}
                       active
                       setProposals={setActiveProposals}