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 index 0baee6bb7..4faa6775e 100644 --- a/packages/mrgn-ui/src/components/action-box-v2/action-box.tsx +++ b/packages/mrgn-ui/src/components/action-box-v2/action-box.tsx @@ -109,25 +109,21 @@ const BorrowLend = ( props: ActionBoxProps & { lendProps: RequiredLendBoxProps | LendBoxProps; useProvider?: boolean } ) => { const contextProps = useActionBoxContext(); - const [selectedAction, setSelectedAction] = React.useState(ActionType.Deposit); const { lendProps, useProvider, ...actionBoxProps } = props; + const [selectedAction, setSelectedAction] = React.useState(lendProps.requestedLendType); React.useEffect(() => { setSelectedAction(lendProps.requestedLendType); }, [lendProps.requestedLendType]); - let combinedProps: LendBoxProps; - - if (useProvider && contextProps) { - combinedProps = { - ...contextProps, - ...(lendProps as RequiredLendBoxProps), - }; - } else { - combinedProps = lendProps as LendBoxProps; - } + let combinedProps: LendBoxProps = + useProvider && contextProps + ? { ...contextProps, ...(lendProps as RequiredLendBoxProps) } + : (lendProps as LendBoxProps); + // State to store whether the action box should be hidden const [shouldBeHidden, setShouldBeHidden] = React.useState(!!combinedProps.searchMode); + if (actionBoxProps.isDialog) { actionBoxProps.dialogProps = { ...actionBoxProps.dialogProps, hidden: shouldBeHidden }; } @@ -144,12 +140,14 @@ const BorrowLend = ( {...combinedProps} requestedLendType={ActionType.Deposit} onCloseDialog={actionBoxProps.isDialog ? actionBoxProps.dialogProps?.onClose : undefined} + searchMode={shouldBeHidden} setShouldBeHidden={setShouldBeHidden} /> diff --git a/packages/mrgn-ui/src/components/action-box-v2/actions/lend-box/lend-box.tsx b/packages/mrgn-ui/src/components/action-box-v2/actions/lend-box/lend-box.tsx index fcd30a68b..d319e523d 100644 --- a/packages/mrgn-ui/src/components/action-box-v2/actions/lend-box/lend-box.tsx +++ b/packages/mrgn-ui/src/components/action-box-v2/actions/lend-box/lend-box.tsx @@ -145,9 +145,7 @@ export const LendBox = ({ ]); React.useEffect(() => { - if (searchMode && !selectedBank) { - setShouldBeHidden?.(true); - } else { + if (searchMode && selectedBank) { setShouldBeHidden?.(false); } }, [searchMode, selectedBank, setShouldBeHidden]);