Skip to content

Commit

Permalink
fix: fix render issue
Browse files Browse the repository at this point in the history
  • Loading branch information
borcherd committed Feb 10, 2025
1 parent 8390e57 commit 3e1897e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 14 deletions.
20 changes: 9 additions & 11 deletions packages/mrgn-ui/src/components/action-box-v2/action-box.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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<boolean>(!!combinedProps.searchMode);

if (actionBoxProps.isDialog) {
actionBoxProps.dialogProps = { ...actionBoxProps.dialogProps, hidden: shouldBeHidden };
}
Expand All @@ -144,12 +140,14 @@ const BorrowLend = (
{...combinedProps}
requestedLendType={ActionType.Deposit}
onCloseDialog={actionBoxProps.isDialog ? actionBoxProps.dialogProps?.onClose : undefined}
searchMode={shouldBeHidden}
setShouldBeHidden={setShouldBeHidden}
/>
<LendBox
{...combinedProps}
requestedLendType={ActionType.Borrow}
onCloseDialog={actionBoxProps.isDialog ? actionBoxProps.dialogProps?.onClose : undefined}
searchMode={shouldBeHidden}
setShouldBeHidden={setShouldBeHidden}
/>
</ActionBoxNavigator>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,7 @@ export const LendBox = ({
]);

React.useEffect(() => {
if (searchMode && !selectedBank) {
setShouldBeHidden?.(true);
} else {
if (searchMode && selectedBank) {
setShouldBeHidden?.(false);
}
}, [searchMode, selectedBank, setShouldBeHidden]);
Expand Down

0 comments on commit 3e1897e

Please sign in to comment.