fix proposal removal ability check

daostack · Sep 27, 2023 · ecbf87b · ecbf87b
1 parent 5c9e468
commit ecbf87b
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 25 deletions.
diff --git a/src/pages/common/components/DiscussionFeedCard/utils/checkIsRemoveDiscussionAllowed.ts b/src/pages/common/components/DiscussionFeedCard/utils/checkIsRemoveDiscussionAllowed.ts
@@ -5,35 +5,39 @@ import { GetAllowedItemsOptions } from "../../FeedItem";
 
 export function checkIsRemoveDiscussionAllowed(
   options: GetAllowedItemsOptions,
-) {
-  if (!options.commonMember) return false;
-  if (options.discussion?.predefinedType === PredefinedTypes.General)
+): boolean {
+  if (
+    !options.commonMember ||
+    options.discussion?.predefinedType === PredefinedTypes.General
+  ) {
     return false;
+  }
 
+  const circles = options.governanceCircles || {};
+  const isDiscussionOwner =
+    options.commonMember.userId === options.discussion?.ownerId;
   const hasPermissionToRemoveDiscussion =
     hasPermission({
       commonMember: options.commonMember,
-      governance: {
-        circles: options.governanceCircles || {},
-      },
+      governance: { circles },
       key: GovernanceActions.HIDE_OR_UNHIDE_DISCUSSION,
-    }) || options.commonMember.userId === options.discussion?.ownerId;
+    }) || isDiscussionOwner;
 
-  let isAllowed = hasPermissionToRemoveDiscussion;
-  if (options.discussion?.proposalId && isAllowed) {
-    const { proposal } = options;
-    const hasPermissionToRemoveProposal =
-      hasPermission({
-        commonMember: options.commonMember,
-        governance: {
-          circles: options.governanceCircles || {},
-        },
-        key: GovernanceActions.HIDE_OR_UNHIDE_PROPOSAL,
-      }) || options.commonMember.userId === options.discussion?.ownerId;
-    isAllowed =
-      !!proposal &&
-      checkIsCountdownState({ state: proposal.state }) &&
-      hasPermissionToRemoveProposal;
+  if (!options.discussion?.proposalId) {
+    return hasPermissionToRemoveDiscussion;
   }
-  return isAllowed;
+
+  const { proposalState } = options;
+  const hasPermissionToRemoveProposal =
+    hasPermission({
+      commonMember: options.commonMember,
+      governance: { circles },
+      key: GovernanceActions.HIDE_OR_UNHIDE_PROPOSAL,
+    }) || isDiscussionOwner;
+
+  return Boolean(
+    proposalState &&
+      checkIsCountdownState({ state: proposalState }) &&
+      hasPermissionToRemoveProposal,
+  );
 }
diff --git a/src/pages/common/components/FeedItem/types.ts b/src/pages/common/components/FeedItem/types.ts
@@ -5,9 +5,9 @@ import {
   CommonFeed,
   CommonMember,
   Discussion,
-  Proposal,
   CommonFeedType,
   CommonFeedObjectUserUnique,
+  ProposalState,
 } from "@/shared/models";
 import { FeedItemMenuItem } from "./constants";
 
@@ -22,7 +22,7 @@ export interface GetAllowedItemsOptions {
   discussion?: Discussion | null;
   governanceCircles?: Circles;
   feedItem?: CommonFeed;
-  proposal?: Proposal;
+  proposalState?: ProposalState;
   commonMember?: CommonMember | null;
   feedItemFollow: FeedItemFollowState;
   getNonAllowedItems?: GetNonAllowedItemsOptions;

diff --git a/src/pages/common/components/ProposalFeedCard/ProposalFeedCard.tsx b/src/pages/common/components/ProposalFeedCard/ProposalFeedCard.tsx
@@ -186,6 +186,7 @@ const ProposalFeedCard = forwardRef<FeedItemRef, ProposalFeedCardProps>(
         feedItem: item,
         discussion,
         governanceCircles,
+        proposalState: proposal?.state,
         commonMember,
         feedItemFollow,
         getNonAllowedItems,