Skip to content

Commit

Permalink
chore: use TradeAmounts instead of TradeGp
Browse files Browse the repository at this point in the history
  • Loading branch information
alfetopito committed Oct 5, 2023
1 parent e1a49b3 commit a0dc493
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { Currency } from '@uniswap/sdk-core'

import { getActivityState, useActivityDerivedState } from 'legacy/hooks/useActivityDerivedState'
import { useMultipleActivityDescriptors } from 'legacy/hooks/useRecentActivity'
import TradeGp from 'legacy/state/swap/TradeGp'
import { ConfirmOperationType } from 'legacy/state/types'

import { useSetIsConfirmationModalOpen } from 'modules/swap/state/surplusModal'
Expand All @@ -17,6 +16,7 @@ import { PermitModal } from 'common/containers/PermitModal'
import { useGetSurplusData } from 'common/hooks/useGetSurplusFiatValue'
import { CowModal } from 'common/pure/Modal'
import { TransactionSubmittedContent } from 'common/pure/TransactionSubmittedContent'
import { TradeAmounts } from 'common/types'

import { LegacyConfirmationPendingContent } from './LegacyConfirmationPendingContent'

Expand All @@ -29,7 +29,7 @@ export interface ConfirmationModalProps {
pendingText?: ReactNode
currencyToAdd?: Currency | undefined
operationType: ConfirmOperationType
trade?: TradeGp | undefined
tradeAmounts?: TradeAmounts | undefined
swapConfirmState?: SwapConfirmState | undefined
}

Expand All @@ -42,7 +42,7 @@ export function TransactionConfirmationModal({
content,
currencyToAdd,
operationType,
trade,
tradeAmounts,
swapConfirmState,
}: ConfirmationModalProps) {
const { chainId } = useWalletInfo()
Expand Down Expand Up @@ -80,8 +80,8 @@ export function TransactionConfirmationModal({
{showPermitModal(swapConfirmState) ? (
<PermitModal
onDismiss={onDismiss}
inputAmount={trade?.inputAmountWithoutFee}
outputAmount={trade?.outputAmountWithoutFee}
inputAmount={tradeAmounts?.inputAmount}
outputAmount={tradeAmounts?.outputAmount}
step={swapConfirmState?.permitSignatureState === 'signed' ? 'submit' : 'approve'}
/>
) : attemptingTxn ? (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { SwapConfirmState } from 'modules/swap/state/swapConfirmAtom'

import { RateInfoParams } from 'common/pure/RateInfo'
import { TransactionErrorContent } from 'common/pure/TransactionErrorContent'
import { TradeAmounts } from 'common/types'

import { useButtonText } from './hooks'

Expand Down Expand Up @@ -105,6 +106,12 @@ export function ConfirmSwapModal({
[swapErrorMessage, onDismiss, modalHeader, modalBottom]
)

const tradeAmounts: TradeAmounts | undefined = useMemo(
() =>
trade ? { inputAmount: trade.inputAmountWithoutFee, outputAmount: trade.outputAmountWithoutFee } : undefined,
[trade]
)

return (
<TransactionConfirmationModal
isOpen={showConfirm}
Expand All @@ -115,7 +122,7 @@ export function ConfirmSwapModal({
pendingText={<PendingText trade={trade} />}
currencyToAdd={trade?.outputAmount.currency}
operationType={ConfirmOperationType.ORDER_SIGN}
trade={trade}
tradeAmounts={tradeAmounts}
swapConfirmState={swapConfirmState}
/>
)
Expand Down

0 comments on commit a0dc493

Please sign in to comment.