Fix actions

daostack · Nov 20, 2024 · a051e96 · a051e96
1 parent d145e24
commit a051e96
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 26 deletions.
diff --git a/...onTabPanels/components/FeedTab/components/NewDiscussionCreation/NewDiscussionCreation.tsx b/...onTabPanels/components/FeedTab/components/NewDiscussionCreation/NewDiscussionCreation.tsx
@@ -78,7 +78,7 @@ const NewDiscussionCreation: FC<NewDiscussionCreationProps> = (props) => {
   );
 
   const handleCancel = () => {
-    dispatch(commonActions.setCommonAction({ action: null, commonId }));
+    dispatch(commonActions.setCommonAction(null));
     dispatch(commonActions.setDiscussionCreationData({ data: null, commonId }));
   };
 

diff --git a/...CommonTabPanels/components/FeedTab/components/NewProposalCreation/NewProposalCreation.tsx b/...CommonTabPanels/components/FeedTab/components/NewProposalCreation/NewProposalCreation.tsx
@@ -84,7 +84,7 @@ const NewProposalCreation: FC<NewProposalCreationProps> = (props) => {
   );
 
   const handleCancel = () => {
-    dispatch(commonActions.setCommonAction({ action: null, commonId }));
+    dispatch(commonActions.setCommonAction(null));
     dispatch(commonActions.setProposalCreationData({ data: null, commonId }));
   };
 

diff --git a/src/pages/common/components/DiscussionFeedCard/hooks/useMenuItems.tsx b/src/pages/common/components/DiscussionFeedCard/hooks/useMenuItems.tsx
@@ -170,12 +170,7 @@ export const useMenuItems = (
             },
           }),
         );
-        dispatch(
-          commonActions.setCommonAction({
-            action: CommonAction.EditDiscussion,
-            commonId: commonId ?? "",
-          }),
-        );
+        dispatch(commonActions.setCommonAction(CommonAction.EditDiscussion));
         animateScroll.scrollToTop({ containerId: document.body, smooth: true });
       },
       icon: <Edit3Icon />,

diff --git a/src/pages/commonFeed/CommonFeed.tsx b/src/pages/commonFeed/CommonFeed.tsx
@@ -577,7 +577,7 @@ const CommonFeedComponent: FC<CommonFeedProps> = (props) => {
       <ErrorBoundary
         fallback={null}
         onError={() => {
-          dispatch(commonActions.setCommonAction({ action: null, commonId }));
+          dispatch(commonActions.setCommonAction(null));
         }}
       >
         {(commonAction === CommonAction.NewDiscussion ||

diff --git a/src/pages/commonFeed/components/HeaderContent/components/NewStreamButton/NewStreamButton.tsx b/src/pages/commonFeed/components/HeaderContent/components/NewStreamButton/NewStreamButton.tsx
@@ -36,12 +36,7 @@ const NewStreamButton: FC<NewStreamButtonProps> = (props) => {
   const dispatch = useDispatch();
 
   const onNewDiscussion = () => {
-    dispatch(
-      commonActions.setCommonAction({
-        action: CommonAction.NewDiscussion,
-        commonId,
-      }),
-    );
+    dispatch(commonActions.setCommonAction(CommonAction.NewDiscussion));
     animateScroll.scrollToTop({ containerId: document.body, smooth: true });
   };
   const items = useMenuItems({

diff --git a/src/store/states/common/actions.ts b/src/store/states/common/actions.ts
@@ -35,10 +35,7 @@ export const resetCommon = createStandardAction(
 
 export const setCommonAction = createStandardAction(
   CommonActionType.SET_COMMON_ACTION,
-)<{
-  commonId: string;
-  action: CommonAction | null;
-}>();
+)<CommonAction | null>();
 
 export const setCommonMember = createStandardAction(
   CommonActionType.SET_COMMON_MEMBER,

diff --git a/src/store/states/common/reducer.ts b/src/store/states/common/reducer.ts
@@ -48,7 +48,7 @@ const initialState: CommonState = {
   pinnedFeedItems: {},
   searchState: {},
   sharedFeedItem: {},
-  commonActions: {},
+  commonAction: null,
   discussionCreations: {},
   proposalCreations: {},
   isNewProjectCreated: {},
@@ -312,8 +312,7 @@ export const reducer = createReducer<CommonState, Action>(initialState)
   // Common Actions
   .handleAction(actions.setCommonAction, (state, { payload }) =>
     produce(state, (nextState) => {
-      const { commonId, action: commonAction } = payload;
-      nextState.commonActions[commonId] = commonAction;
+      nextState.commonAction = payload;
     }),
   )
   .handleAction(actions.setCommonMember, (state, { payload }) =>

diff --git a/src/store/states/common/saga/editDiscussion.ts b/src/store/states/common/saga/editDiscussion.ts
@@ -32,7 +32,7 @@ export function* editDiscussion(
       }),
     );
 
-    yield put(actions.setCommonAction({ action: null, commonId }));
+    yield put(actions.setCommonAction(null));
     yield put(actions.editDiscussion.success({ discussion, commonId }));
 
     if (payload.callback) {

diff --git a/src/store/states/common/selectors.ts b/src/store/states/common/selectors.ts
@@ -2,8 +2,8 @@ import { AppState } from "@/shared/interfaces";
 
 export const selectCommonState = (state: AppState) => state.common;
 
-export const selectCommonAction = (commonId: string) => (state: AppState) =>
-  state.common.commonActions[commonId] || null;
+export const selectCommonAction = (state: AppState) =>
+  state.common.commonAction || null;
 
 export const selectCommonMember = (commonId: string) => (state: AppState) =>
   state.common.commonMembers[commonId] || {};

diff --git a/src/store/states/common/types.ts b/src/store/states/common/types.ts
@@ -43,7 +43,7 @@ export interface CommonState {
   feedItems: Record<string, FeedItems>;
   pinnedFeedItems: Record<string, PinnedFeedItems>;
   sharedFeedItem: Record<string, FeedItemFollowLayoutItem | null>;
-  commonActions: Record<string, CommonAction | null>;
+  commonAction: CommonAction | null;
   discussionCreations: Record<
     string,
     EntityCreation<NewDiscussionCreationFormValues>