Fix: Realign master with changes from #3421

JoinColony · Oct 29, 2024 · 2c9703f · 2c9703f
1 parent 41b5705
commit 2c9703f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 54 deletions.
diff --git a/...components/v5/common/ActionSidebar/partials/ActionSidebarContent/ActionSidebarContent.tsx b/...components/v5/common/ActionSidebar/partials/ActionSidebarContent/ActionSidebarContent.tsx
@@ -35,14 +35,12 @@ import NotificationBanner from '~v5/shared/NotificationBanner/NotificationBanner
 import ActionButtons from '../ActionButtons.tsx';
 import ActionSidebarDescription from '../ActionSidebarDescription/ActionSidebarDescription.tsx';
 import CreateStakedExpenditureModal from '../CreateStakedExpenditureModal/CreateStakedExpenditureModal.tsx';
-import Motions from '../Motions/index.ts';
 import RemoveDraftModal from '../RemoveDraftModal/RemoveDraftModal.tsx';
 
 import { useGetFormActionErrors } from './hooks.ts';
 import { MultiSigMembersError } from './partials/MultiSigMembersError/MultiSigMembersError.tsx';
 import NoPermissionsError from './partials/NoPermissionsError.tsx';
 import NoReputationError from './partials/NoReputationError.tsx';
-import PermissionSidebar from './partials/PermissionSidebar.tsx';
 import { SidebarBanner } from './partials/SidebarBanner.tsx';
 import {
   type ActionSidebarContentProps,
@@ -53,7 +51,6 @@ const displayName = 'v5.common.ActionsContent.partials.ActionSidebarContent';
 
 const ActionSidebarFormContent: FC<ActionSidebarFormContentProps> = ({
   getFormOptions,
-  isMotion,
   actionFormProps: { primaryButton },
 }) => {
   const { colony } = useColonyContext();
@@ -217,7 +214,7 @@ const ActionSidebarFormContent: FC<ActionSidebarFormContentProps> = ({
           </div>
         ) : null}
       </div>
-      {!isMotion && !readonly && (
+      {!readonly && (
         <div className="mt-auto">
           <ActionButtons
             isActionDisabled={isSubmitDisabled}
@@ -272,31 +269,15 @@ const ActionSidebarFormContent: FC<ActionSidebarFormContentProps> = ({
 };
 
 const ActionSidebarContent: FC<ActionSidebarContentProps> = ({
-  transactionId,
   formRef,
   defaultValues,
-  isMotion,
 }) => {
-  const { getFormOptions, actionFormProps } = useActionFormProps(
-    defaultValues,
-    !!transactionId,
-  );
+  const { getFormOptions, actionFormProps } = useActionFormProps(defaultValues);
   const client = useApolloClient();
 
   return (
-    <div
-      className={clsx('flex w-full flex-grow', {
-        'flex-col-reverse overflow-auto sm:overflow-hidden md:flex-row':
-          !!transactionId,
-        'overflow-hidden': !transactionId,
-      })}
-    >
-      <div
-        className={clsx('flex-grow pb-6 pt-8', {
-          'w-full': !isMotion,
-          'w-full sm:w-[calc(100%-23.75rem)]': isMotion,
-        })}
-      >
+    <div className="flex w-full flex-grow overflow-hidden">
+      <div className="w-full flex-grow pb-6 pt-8">
         <ActionForm
           {...actionFormProps}
           key={actionFormProps.mode}
@@ -320,37 +301,10 @@ const ActionSidebarContent: FC<ActionSidebarContentProps> = ({
         >
           <ActionSidebarFormContent
             getFormOptions={getFormOptions}
-            isMotion={isMotion}
-            transactionId={transactionId}
             actionFormProps={actionFormProps}
           />
         </ActionForm>
       </div>
-      {transactionId && (
-        <div
-          className="
-            w-full
-            border-b
-            border-b-gray-200
-            bg-gray-25
-            px-6
-            py-8
-            sm:h-full
-            sm:w-[23.75rem]
-            sm:flex-shrink-0
-            sm:overflow-y-auto
-            sm:border-b-0
-            sm:border-l
-            sm:border-l-gray-200
-          "
-        >
-          {isMotion ? (
-            <Motions transactionId={transactionId} />
-          ) : (
-            <PermissionSidebar transactionId={transactionId} />
-          )}
-        </div>
-      )}
     </div>
   );
 };

diff --git a/src/components/v5/common/ActionSidebar/partials/ActionSidebarContent/types.ts b/src/components/v5/common/ActionSidebar/partials/ActionSidebarContent/types.ts
@@ -1,12 +1,10 @@
 import { type UseFormReturn } from 'react-hook-form';
 
 import { type ActionFormProps } from '~shared/Fields/Form/index.ts';
+import { type ColonyAction } from '~types/graphql.ts';
 import { type ActionFormBaseProps } from '~v5/common/ActionSidebar/types.ts';
 
 export interface ActionSidebarFormContentProps extends ActionFormBaseProps {
-  isMotion?: boolean;
-  transactionId?: string;
-  isExpenditure?: boolean;
   actionFormProps: Omit<ActionFormProps, 'children' | 'actionType'>;
 }
 
@@ -18,5 +16,5 @@ export interface ActionSidebarContentProps {
 }
 
 export interface PermissionSidebarProps {
-  transactionId: string;
+  action: ColonyAction;
 }