chore: resolve PR convos, ts, lint, prettify

aragon · Sep 16, 2024 · c881ad4 · c881ad4
1 parent da2f2d1
commit c881ad4
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 18 deletions.
diff --git a/src/core/components/states/emptyState/emptyState.tsx b/src/core/components/states/emptyState/emptyState.tsx
@@ -45,7 +45,7 @@ export const EmptyState: React.FC<IEmptyStateProps> = ({
 
             <div
                 className={classNames('flex h-full items-center', {
-                    'flex w-full flex-col': isStacked,
+                    'w-full flex-col': isStacked,
                     'space-y-6': (isStacked && !!primaryButton) || !!secondaryButton,
                     'space-y-4': (!isStacked && !!primaryButton) || !!secondaryButton,
                 })}

diff --git a/src/modules/assets/copy/modulesCopy.ts b/src/modules/assets/copy/modulesCopy.ts
@@ -30,8 +30,6 @@ export const modulesCopy = {
         collapse: 'Collapse all',
         expand: 'Expand all',
         empty: {
-            description:
-                'Add actions by selecting them, interacting with custom contracts, uploading actions or connect with any DApp.',
             heading: 'No actions added',
         },
     },

diff --git a/src/modules/components/proposal/proposalActions/proposalActions/proposalActions.stories.tsx b/src/modules/components/proposal/proposalActions/proposalActions/proposalActions.stories.tsx
@@ -1,6 +1,5 @@
 import type { Meta, StoryObj } from '@storybook/react';
 
-import { useOdsModulesContext } from '../../../odsModulesProvider';
 import {
     generateProposalAction,
     generateProposalActionUpdateMetadata,
@@ -123,6 +122,7 @@ export const CustomActions: Story = {
                 customActionComponents={{
                     CUSTOM_ACTION: CustomActionComponent,
                 }}
+                emptyStateDescription="No actions added. Consider adding some."
             />
         );
     },
@@ -132,14 +132,7 @@ export const EmptyActions: Story = {
     render: () => {
         const actions: IProposalAction[] = [];
 
-        const { copy } = useOdsModulesContext();
-
-        return (
-            <ProposalActions
-                actions={actions}
-                emptyStateDescription={copy.proposalActionsContainer.empty.description}
-            />
-        );
+        return <ProposalActions actions={actions} emptyStateDescription="No actions added. Consider adding some." />;
     },
 };
 

diff --git a/src/modules/components/proposal/proposalActions/proposalActions/proposalActions.test.tsx b/src/modules/components/proposal/proposalActions/proposalActions/proposalActions.test.tsx
@@ -19,6 +19,7 @@ describe('<ProposalActions /> component', () => {
     const createTestComponent = (props?: Partial<IProposalActionsProps>) => {
         const completeProps: IProposalActionsProps = {
             actions: [],
+            emptyStateDescription: 'Please add actions',
             ...props,
         };
 
@@ -113,10 +114,11 @@ describe('<ProposalActions /> component', () => {
     });
 
     it('renders an empty state if no actions are provided', () => {
+        const emptyStateDescription = 'Custom empty state description';
         const actions: IProposalAction[] = [];
-        render(createTestComponent({ actions }));
+        render(createTestComponent({ actions, emptyStateDescription }));
         expect(screen.getByText(modulesCopy.proposalActionsContainer.empty.heading)).toBeInTheDocument();
-        expect(screen.getByText(modulesCopy.proposalActionsContainer.empty.description)).toBeInTheDocument();
+        expect(screen.getByText(emptyStateDescription)).toBeInTheDocument();
     });
 
     it('renders a custom empty state description if provided', () => {

diff --git a/src/modules/components/proposal/proposalActions/proposalActions/proposalActions.tsx b/src/modules/components/proposal/proposalActions/proposalActions/proposalActions.tsx
@@ -10,7 +10,7 @@ export interface IProposalActionsProps extends IWeb3ComponentProps {
     /**
      * Actions to render.
      */
-    actions: IProposalAction[] | [];
+    actions: IProposalAction[];
     /**
      * Map of action-type <=> action-name displayed on the action header.
      */
@@ -30,7 +30,7 @@ export interface IProposalActionsProps extends IWeb3ComponentProps {
     /**
      * Custom description for the empty state.
      */
-    emptyStateDescription?: string;
+    emptyStateDescription: string;
 }
 
 export const ProposalActions: React.FC<IProposalActionsProps> = (props) => {
@@ -78,7 +78,7 @@ export const ProposalActions: React.FC<IProposalActionsProps> = (props) => {
                 {actions.length === 0 && (
                     <EmptyState
                         heading={copy.proposalActionsContainer.empty.heading}
-                        description={emptyStateDescription ?? copy.proposalActionsContainer.empty.description}
+                        description={emptyStateDescription}
                         isStacked={false}
                         objectIllustration={{ object: 'SMART_CONTRACT' }}
                     />
@@ -96,9 +96,9 @@ export const ProposalActions: React.FC<IProposalActionsProps> = (props) => {
                                     ? copy.proposalActionsContainer.collapse
                                     : copy.proposalActionsContainer.expand}
                             </Button>
-                            {children}
                         </div>
                     )}
+                    {children}
                 </div>
             </Accordion.Container>
         </Card>