Merge pull request #300 from DAOmasons/grantsPageFixes

Grants page fixes
DAOmasons · Aug 12, 2024 · 04abf50 · 04abf50
2 parents 16c7918 + ce62ab3
commit 04abf50
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 11 deletions.
diff --git a/.graphclientrc.yml b/.graphclientrc.yml
@@ -4,11 +4,6 @@ sources:
       graphql: 
         endpoint: https://indexer.bigdevenergy.link/3a96753/v1/graphql
         # endpoint: http://localhost:8080/v1/graphql
-  # - name: gs-voting
-  #   handler: 
-  #     graphql: 
-  #       # endpoint: http://localhost:8080/v1/graphql
-  #       endpoint: https://indexer.bigdevenergy.link/d18cda9/v1/graphql
 documents: 
   # - './src/**/*.graphql'
   - './src/graphql/newQueries/**/*.graphql'
diff --git a/src/components/dashboard/facilitator/AllocationPanel.tsx b/src/components/dashboard/facilitator/AllocationPanel.tsx
@@ -45,7 +45,6 @@ export const AllocationPanel = ({
   }, [shipData, poolBalance]);
 
   const handleAllocate = () => {
-    console.log('fired');
     let shipIds = [];
     let amounts = [];
 
@@ -92,7 +91,7 @@ export const AllocationPanel = ({
       </Box>
     );
   }
-  console.log('render');
+
   return (
     <Box>
       <Text mb="sm" fw={600}>

diff --git a/src/components/dashboard/facilitator/CompleteVotePanel.tsx b/src/components/dashboard/facilitator/CompleteVotePanel.tsx
@@ -12,7 +12,7 @@ export const CompleteVotePanel = () => {
   const { contest, refetchGsVotes, votingStage } = useVoting();
 
   const { tx } = useTx();
-  console.log('contest', contest);
+
   const finalizeVoting = () => {
     if (!contest || votingStage !== VotingStage.Closed) {
       notifications.show({

diff --git a/src/components/grant/MilestoneDisplay.tsx b/src/components/grant/MilestoneDisplay.tsx
@@ -124,7 +124,7 @@ export const MilestoneDisplay = ({
             <Text fz="sm" fw={700} mb={4}>
               Description
             </Text>
-            <Text fz="sm">
+            <Text fz="sm" className="ws-pre-wrap">
               {currentMilestone?.milestoneContent.milestoneDetails}
             </Text>
           </Box>

diff --git a/src/components/grant/MilestoneSetDisplay.tsx b/src/components/grant/MilestoneSetDisplay.tsx
@@ -106,7 +106,11 @@ export const MilestoneSetDisplay = ({ doc }: { doc: MilestonesDisplay }) => {
           <Text size="sm" fw={700} mb={4}>
             Description
           </Text>
-          <Text size="sm" td={isOldOrRejected ? 'line-through' : undefined}>
+          <Text
+            size="sm"
+            td={isOldOrRejected ? 'line-through' : undefined}
+            className="ws-pre-wrap"
+          >
             {milestone.milestoneContent.milestoneDetails}
           </Text>
         </Box>

diff --git a/src/components/grant/ProjectActions.tsx b/src/components/grant/ProjectActions.tsx
@@ -32,7 +32,7 @@ export const ProjectActions = () => {
   const isMilestonePlanning =
     grant?.status &&
     grant.status >= GrantStatus.ApplicationApproved &&
-    grant?.status <= GrantStatus.Allocated;
+    grant?.status < GrantStatus.MilestonesApproved;
 
   const areMilestonesLocked =
     grant?.status &&