fix: rebase

JoinColony · Oct 14, 2024 · 87e902e · 87e902e
1 parent 8523137
commit 87e902e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/src/components/v5/common/ActionSidebar/partials/Motions/Motions.tsx b/src/components/v5/common/ActionSidebar/partials/Motions/Motions.tsx
@@ -339,7 +339,7 @@ const Motions: FC<MotionsProps> = ({ transactionId }) => {
     >
       <Stepper<Steps>
         activeStepKey={activeStepKey}
-        setActiveStepKey={setActiveStepKey}
+        setActiveStepKey={(key: Steps) => setActiveStepKey(key)}
         items={items}
       />
     </MotionProvider>

diff --git a/.../common/ActionSidebar/partials/MultiSigSidebar/partials/MultiSigWidget/MultiSigWidget.tsx b/.../common/ActionSidebar/partials/MultiSigSidebar/partials/MultiSigWidget/MultiSigWidget.tsx
@@ -146,7 +146,7 @@ const MultiSigWidget: FC<MultiSigWidgetProps> = ({ action }) => {
       <Stepper<MultiSigState>
         items={items}
         activeStepKey={activeStepKey}
-        setActiveStepKey={setActiveStepKey}
+        setActiveStepKey={(key: MultiSigState) => setActiveStepKey(key)}
       />
     </div>
   );

diff --git a/...mon/CompletedAction/partials/PaymentBuilder/partials/CancelRequests/CancelRequestItem.tsx b/...mon/CompletedAction/partials/PaymentBuilder/partials/CancelRequests/CancelRequestItem.tsx
@@ -10,11 +10,14 @@ import useGetColonyAction from '~v5/common/ActionSidebar/hooks/useGetColonyActio
 import { type CancelRequestItemProps } from './types.ts';
 
 const CancelRequestItem: FC<CancelRequestItemProps> = ({ action }) => {
-  const { motionState, loadingAction } = useGetColonyAction(action.id);
+  const { motionState, loadingAction } = useGetColonyAction(
+    action.transactionHash,
+  );
   const { selectedCancellingAction, setSelectedCancellingAction } =
     usePaymentBuilderContext();
 
-  const isSelected = selectedCancellingAction?.id === action.id;
+  const isSelected =
+    selectedCancellingAction?.transactionHash === action.transactionHash;
 
   const isMotion = !!action.motionData;
 

diff --git a/...common/CompletedAction/partials/PaymentBuilder/partials/CancelRequests/CancelRequests.tsx b/...common/CompletedAction/partials/PaymentBuilder/partials/CancelRequests/CancelRequests.tsx
@@ -18,7 +18,7 @@ const CancelRequests: FC<CancelRequestsProps> = ({ actions }) => (
     </h5>
     <ul className="max-h-[6.25rem] overflow-y-auto overflow-x-hidden">
       {actions.map((action) => (
-        <li className="mb-2 w-full last:mb-0" key={action.id}>
+        <li className="mb-2 w-full last:mb-0" key={action.transactionHash}>
           <CancelRequestItem action={action} />
         </li>
       ))}