Merge pull request #3881 from JoinColony/fix/3842-show-correct-motion…

…-team-in-decision-dialog Show correct motion team in decision dialog
JoinColony · Sep 26, 2022 · 4c8781f · 4c8781f
2 parents 49a2118 + 0da3696
commit 4c8781f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/modules/dashboard/components/ColonyDecisions/ColonyDecisionsWrapper.tsx b/src/modules/dashboard/components/ColonyDecisions/ColonyDecisionsWrapper.tsx
@@ -5,14 +5,21 @@ import ColonyNewDecision from '~dashboard/ColonyNewDecision';
 
 import { LOCAL_STORAGE_DECISION_KEY } from '~constants';
 import { DecisionDetails } from '~types/index';
+import { Colony } from '~data/index';
 
 import ColonyDecisions from './ColonyDecisions';
 
+interface Props {
+  colony: Colony;
+  filteredDomainId: number;
+  onDomainChange?: (domainId: number) => void;
+}
+
 const ColonyDecisionsWrapper = ({
   colony,
   filteredDomainId,
-  setDomainIdFilter,
-}: any) => {
+  onDomainChange,
+}: Props) => {
   const [draftDecision, setDraftDecision] = useState<
     DecisionDetails | undefined
   >(
@@ -25,7 +32,7 @@ const ColonyDecisionsWrapper = ({
     <ColonyHomeLayout
       colony={colony}
       filteredDomainId={filteredDomainId}
-      onDomainChange={setDomainIdFilter}
+      onDomainChange={onDomainChange}
       newItemButton={
         <ColonyNewDecision
           colony={colony}

diff --git a/src/modules/dashboard/components/Dialogs/DecisionDialog/DecisionDialog.tsx b/src/modules/dashboard/components/Dialogs/DecisionDialog/DecisionDialog.tsx
@@ -113,7 +113,7 @@ const DecisionDialog = ({
             colony={colony}
             {...formProps}
             ethDomainId={
-              ethDomainId || decisionData?.motionDomainId || ROOT_DOMAIN_ID
+              domainId || decisionData?.motionDomainId || ROOT_DOMAIN_ID
             }
             cancel={cancel}
             editor={editor}