Skip to content

Commit

Permalink
Update futures modal types
Browse files Browse the repository at this point in the history
  • Loading branch information
avclarke committed Jul 11, 2023
1 parent 1736aee commit 9973be5
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
6 changes: 3 additions & 3 deletions packages/app/src/pages/market.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -124,18 +124,18 @@ const Market: MarketComponent = () => {
)}
{showPositionModal?.type === 'futures_edit_position_size' && <EditPositionSizeModal />}
{showPositionModal?.type === 'futures_edit_position_margin' && <EditPositionMarginModal />}
{openModal === 'futures_isolated_transfer' && (
{openModal === 'futures_deposit_withdraw_cross_margin' && (
<TransferIsolatedMarginModal
defaultTab="deposit"
onDismiss={() => dispatch(setOpenModal(null))}
/>
)}
{openModal === 'futures_cross_withdraw' && (
{openModal === 'futures_withdraw_smart_margin' && (
<WithdrawSmartMargin onDismiss={() => dispatch(setOpenModal(null))} />
)}

{openModal === 'futures_confirm_smart_margin_trade' && <TradeConfirmationModalCrossMargin />}
{openModal === 'futures_confirm_isolated_margin_trade' && <DelayedOrderConfirmationModal />}
{openModal === 'futures_confirm_cross_margin_trade' && <DelayedOrderConfirmationModal />}
</>
)
}
Expand Down
2 changes: 1 addition & 1 deletion packages/app/src/sections/futures/Trade/ManagePosition.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ const ManagePosition: React.FC = () => {
setOpenModal(
selectedAccountType === FuturesMarginType.SMART_MARGIN
? 'futures_confirm_smart_margin_trade'
: 'futures_confirm_isolated_margin_trade'
: 'futures_confirm_cross_margin_trade'
)
)
}, [selectedAccountType, smartMarginAccount, dispatch])
Expand Down
8 changes: 4 additions & 4 deletions packages/app/src/sections/futures/Trade/MarketActions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const MarketActions: React.FC = () => {
<MarketActionButton
data-testid="futures-market-trade-button-deposit"
disabled={marketInfo?.isSuspended || !isL2 || !walletAddress}
onClick={() => dispatch(setOpenModal('futures_isolated_transfer'))}
onClick={() => dispatch(setOpenModal('futures_deposit_withdraw_cross_margin'))}
noOutline
>
{t('futures.market.trade.button.deposit')}
Expand All @@ -42,20 +42,20 @@ const MarketActions: React.FC = () => {
!isL2 ||
!walletAddress
}
onClick={() => dispatch(setOpenModal('futures_isolated_transfer'))}
onClick={() => dispatch(setOpenModal('futures_deposit_withdraw_cross_margin'))}
noOutline
>
{t('futures.market.trade.button.withdraw')}
</MarketActionButton>
</MarketActionsContainer>
{openModal === 'futures_isolated_transfer' && (
{openModal === 'futures_deposit_withdraw_cross_margin' && (
<TransferIsolatedMarginModal
defaultTab="deposit"
onDismiss={() => dispatch(setOpenModal(null))}
/>
)}

{openModal === 'futures_isolated_transfer' && (
{openModal === 'futures_deposit_withdraw_cross_margin' && (
<TransferIsolatedMarginModal
defaultTab="withdraw"
onDismiss={() => dispatch(setOpenModal(null))}
Expand Down
4 changes: 2 additions & 2 deletions packages/app/src/sections/futures/Trade/TradeBalance.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,8 @@ const TradeBalance: React.FC<TradeBalanceProps> = memo(({ isMobile = false }) =>
dispatch(
setOpenModal(
accountType === FuturesMarginType.CROSS_MARGIN
? 'futures_isolated_transfer'
: 'futures_cross_withdraw'
? 'futures_deposit_withdraw_cross_margin'
: 'futures_withdraw_smart_margin'
)
)
}}
Expand Down
6 changes: 3 additions & 3 deletions packages/app/src/state/app/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import { FuturesTransactionType } from 'state/futures/common/types'

export type ModalType =
| 'futures_close_position_confirm'
| 'futures_cross_withdraw'
| 'futures_isolated_transfer'
| 'futures_withdraw_smart_margin'
| 'futures_deposit_withdraw_cross_margin'
| 'futures_confirm_smart_margin_trade'
| 'futures_confirm_isolated_margin_trade'
| 'futures_confirm_cross_margin_trade'
| 'futures_withdraw_keeper_balance'
| 'futures_smart_margin_onboard'
| 'futures_smart_margin_socket'
Expand Down

0 comments on commit 9973be5

Please sign in to comment.