Fix cycle issue for off-chain proposals (#614)

Signed-off-by: Manank Patni <[email protected]>
dOrgTech · Jul 23, 2023 · 7de8b00 · 7de8b00
1 parent 86ea3d9
commit 7de8b00
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/src/modules/explorer/components/ProposalActionsDialog.tsx b/src/modules/explorer/components/ProposalActionsDialog.tsx
@@ -15,6 +15,7 @@ import { SupportedLambdaProposalKey } from "services/bakingBad/lambdas"
 import { ProposalAction, ProposalFormLambda } from "modules/explorer/components/ConfigProposalFormLambda"
 import { useDAO } from "services/services/dao/hooks/useDAO"
 import { ProposalCreatorModal } from "modules/lite/explorer/pages/CreateProposal/ProposalCreatorModal"
+import { useIsProposalButtonDisabled } from "services/contracts/baseDAO/hooks/useCycleInfo"
 
 type RecursivePartial<T> = {
   [P in keyof T]?: RecursivePartial<T[P]>
@@ -123,6 +124,7 @@ export const ProposalActionsDialog: React.FC<Props> = ({ open, handleClose }) =>
   const [openProposalFormLambda, setOpenProposalFormLambda] = useState(false)
   const [openLiteProposal, setOpenLiteProposal] = useState(false)
   const liteDAOId = data?.liteDAOData?._id
+  const shouldDisable = useIsProposalButtonDisabled(daoId)
 
   const handleOpenCustomProposalModal = (key: ProposalAction) => {
     setProposalAction(key)
@@ -167,13 +169,21 @@ export const ProposalActionsDialog: React.FC<Props> = ({ open, handleClose }) =>
                   onClick={() =>
                     elem.id === "off-chain"
                       ? handleLiteProposal()
-                      : elem.isLambda
-                      ? handleOpenCustomProposalModal(elem.id)
-                      : handleOpenSupportedExecuteProposalModal(elem.id)
+                      : !shouldDisable
+                      ? elem.isLambda
+                        ? handleOpenCustomProposalModal(elem.id)
+                        : handleOpenSupportedExecuteProposalModal(elem.id)
+                      : null
                   }
                 >
-                  <ActionText color="textPrimary">{elem.name}</ActionText>
-                  <ActionDescriptionText color="textPrimary"> {elem.description} </ActionDescriptionText>
+                  <ActionText color={shouldDisable && elem.id !== "off-chain" ? "textSecondary" : "textPrimary"}>
+                    {elem.name}
+                  </ActionText>
+                  <ActionDescriptionText
+                    color={shouldDisable && elem.id !== "off-chain" ? "textSecondary" : "textPrimary"}
+                  >
+                    {elem.description}{" "}
+                  </ActionDescriptionText>
                 </OptionContainer>
               </Grid>
             )

diff --git a/src/modules/explorer/pages/Proposals/index.tsx b/src/modules/explorer/pages/Proposals/index.tsx
@@ -241,12 +241,7 @@ export const Proposals: React.FC = () => {
                   direction={isMobileSmall ? "column" : "row"}
                   xs={isMobileSmall ? undefined : true}
                 >
-                  <SmallButton
-                    variant="contained"
-                    disabled={shouldDisable}
-                    color="secondary"
-                    onClick={() => setOpenDialog(true)}
-                  >
+                  <SmallButton variant="contained" color="secondary" onClick={() => setOpenDialog(true)}>
                     New Proposal
                   </SmallButton>
                   <Grid>