chore: minor QA finds & cleanup

mrgnlabs · Feb 10, 2025 · 8390e57 · 8390e57
1 parent a149e54
commit 8390e57
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/apps/marginfi-v2-ui/src/components/common/Portfolio/lending-portfolio.tsx b/apps/marginfi-v2-ui/src/components/common/Portfolio/lending-portfolio.tsx
@@ -272,7 +272,6 @@ export const LendingPortfolio = () => {
             fetchMrgnlendState={fetchMrgnlendState}
             closeOnSwitch={true}
             popoverContentAlign="start"
-            // showAddAccountButton={false}
             processOpts={{
               ...priorityFees,
               broadcastType,

diff --git a/packages/mrgn-ui/src/components/action-box-v2/action-box.tsx b/packages/mrgn-ui/src/components/action-box-v2/action-box.tsx
@@ -127,12 +127,13 @@ const BorrowLend = (
     combinedProps = lendProps as LendBoxProps;
   }
 
-  const [shouldBeHidden, setShouldBeHidden] = React.useState(combinedProps.searchMode);
-  const dialogProps = actionBoxProps.isDialog ? { ...actionBoxProps.dialogProps, hidden: shouldBeHidden } : undefined;
-  const _actionBoxProps = actionBoxProps.isDialog ? { ...actionBoxProps, dialogProps } : actionBoxProps;
+  const [shouldBeHidden, setShouldBeHidden] = React.useState<boolean>(!!combinedProps.searchMode);
+  if (actionBoxProps.isDialog) {
+    actionBoxProps.dialogProps = { ...actionBoxProps.dialogProps, hidden: shouldBeHidden };
+  }
 
   return (
-    <ActionBox {..._actionBoxProps}>
+    <ActionBox {...actionBoxProps}>
       <ActionBoxWrapper showSettings={false} isDialog={actionBoxProps.isDialog} actionMode={ActionType.Deposit}>
         <ActionBoxNavigator
           selectedAction={selectedAction}
@@ -142,13 +143,13 @@ const BorrowLend = (
           <LendBox
             {...combinedProps}
             requestedLendType={ActionType.Deposit}
-            onCloseDialog={dialogProps?.onClose}
+            onCloseDialog={actionBoxProps.isDialog ? actionBoxProps.dialogProps?.onClose : undefined}
             setShouldBeHidden={setShouldBeHidden}
           />
           <LendBox
             {...combinedProps}
             requestedLendType={ActionType.Borrow}
-            onCloseDialog={dialogProps?.onClose}
+            onCloseDialog={actionBoxProps.isDialog ? actionBoxProps.dialogProps?.onClose : undefined}
             setShouldBeHidden={setShouldBeHidden}
           />
         </ActionBoxNavigator>

diff --git a/packages/mrgn-ui/src/components/action-box-v2/types/action-box.types.ts b/packages/mrgn-ui/src/components/action-box-v2/types/action-box.types.ts
@@ -10,7 +10,7 @@ import { ActionDialogProps } from "~/components/action-box-v2/components";
 
 type ActionBoxDialogProps = {
   isDialog: true;
-  dialogProps?: ActionDialogProps;
+  dialogProps: ActionDialogProps;
 };
 
 type ActionBoxWithoutDailogProps = {