Merge branch 'dev' into prod-v1.3

1Hive · Sep 10, 2024 · 38abb87 · 38abb87
2 parents 32c2091 + c0f3a14
commit 38abb87
Showing 1 changed file with 7 additions and 14 deletions.
diff --git a/apps/web/components/DisputeButton.tsx b/apps/web/components/DisputeButton.tsx
@@ -115,29 +115,23 @@ export const DisputeButton: FC<Props> = ({ proposalData }) => {
     arbitrationCost && config ?
       arbitrationCost + BigInt(config.challengerCollateralAmount)
     : undefined;
-
   const lastDispute =
     disputesResult?.proposalDisputes[
       disputesResult?.proposalDisputes.length - 1
     ];
-
   const isCooldown =
     !!lastDispute &&
     !!disputeCooldown &&
     +lastDispute.ruledAt + Number(disputeCooldown) > Date.now() / 1000;
-
+  const proposalStatus = ProposalStatus[proposalData.proposalStatus];
   const isDisputed =
-    proposalData &&
-    lastDispute &&
-    ProposalStatus[proposalData.proposalStatus] === "disputed";
-
+    proposalData && lastDispute && proposalStatus === "disputed";
   const isTimeout =
     lastDispute &&
     config &&
     +lastDispute.createdAt + +config.defaultRulingTimeout < Date.now() / 1000;
-
   const disputes = disputesResult?.proposalDisputes ?? [];
-
+  const isProposalEnded = proposalStatus !== "active" && !isDisputed;
   const isTribunalSafe = config.tribunalSafe === address?.toLowerCase();
 
   const { data: isTribunalMember } = useContractRead({
@@ -248,7 +242,7 @@ export const DisputeButton: FC<Props> = ({ proposalData }) => {
 
   const content = (
     <div className="flex md:flex-col gap-10">
-      {isDisputed ?
+      {proposalStatus !== "active" ?
         <div className="p-16 rounded-lg">
           {disputes.map((dispute) => (
             <Fragment key={dispute.id}>
@@ -403,8 +397,7 @@ export const DisputeButton: FC<Props> = ({ proposalData }) => {
 
   return (
     <>
-      {(ProposalStatus[proposalData?.proposalStatus] === "active" ||
-        ProposalStatus[proposalData?.proposalStatus] === "disputed") && (
+      {(proposalStatus === "active" || lastDispute != null) && (
         <>
           <Button
             color="danger"
@@ -413,15 +406,15 @@ export const DisputeButton: FC<Props> = ({ proposalData }) => {
             disabled={isDisconnected}
             tooltip="Connect wallet"
           >
-            {isDisputed ? "Open dispute" : "Dispute"}
+            {isDisputed ?? isProposalEnded ? "Open dispute" : "Dispute"}
           </Button>
           <Modal
             title={`Disputed Proposal: ${proposalData.title} #${proposalData.proposalNumber}`}
             onClose={() => setIsModalOpened(false)}
             isOpen={isModalOpened}
           >
             {content}
-            {buttons}
+            {!isProposalEnded && buttons}
           </Modal>
         </>
       )}