Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Add undefined check for trade order #10754

Merged
merged 2 commits into from
Sep 30, 2024
Merged

fix: Add undefined check for trade order #10754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1cd3b89
fix: Make sure trade there when order is available
memoyil Sep 30, 2024
cb2a277
fix: Build
memoyil Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions apps/web/src/views/Swap/V3Swap/hooks/useAllTypeBestTrade.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,14 @@ export const useAllTypeBestTrade = () => {
const refreshOrder = useThrottleFn(bestOrder.refresh, 3000)

const classicAmmOrder = useMemo(() => {
return {
trade: ammCurrentTrade,
type: OrderType.PCS_CLASSIC,
isLoading,
error: error ?? undefined,
}
return ammCurrentTrade
? {
trade: ammCurrentTrade,
type: OrderType.PCS_CLASSIC,
isLoading,
error: error ?? undefined,
}
: undefined
}, [ammCurrentTrade, isLoading, error])

const hasAvailableDutchOrder =
Expand All @@ -79,7 +81,7 @@ export const useAllTypeBestTrade = () => {
xOrder: currentOrder,
// TODO: for log purpose in this stage
betterOrder: betterQuote,
bestOrder: finalOrder as InterfaceOrder,
bestOrder: finalOrder as InterfaceOrder | undefined,
tradeLoaded: !finalOrder?.isLoading,
tradeError: finalOrder?.error,
refreshDisabled:
Expand Down
8 changes: 4 additions & 4 deletions apps/web/src/views/Swap/V3Swap/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,16 @@ export function V3SwapForm() {
beforeCommit: () => {
pauseQuoting()
try {
const validTrade = ammOrder.trade ?? xOrder?.trade
const validTrade = ammOrder?.trade ?? xOrder?.trade
if (!validTrade) {
throw new Error('No valid trade to log')
}
const { inputAmount, tradeType, outputAmount } = validTrade
const { currency: inputCurrency } = inputAmount
const { currency: outputCurrency } = outputAmount
const { chainId } = inputCurrency
const ammInputAmount = ammOrder.trade?.inputAmount.toExact()
const ammOutputAmount = ammOrder.trade?.outputAmount.toExact()
const ammInputAmount = ammOrder?.trade?.inputAmount.toExact()
const ammOutputAmount = ammOrder?.trade?.outputAmount.toExact()
const xInputAmount = xOrder?.trade?.inputAmount.toExact()
const xOutputAmount = xOrder?.trade?.outputAmount.toExact()
logger.info('X/AMM Quote Comparison', {
Expand All @@ -55,7 +55,7 @@ export function V3SwapForm() {
outputToken: outputCurrency.wrapped.address,
bestOrderType: betterOrder?.type,
ammOrder: {
type: ammOrder.type,
type: ammOrder?.type,
inputAmount: ammInputAmount,
outputAmount: ammOutputAmount,
inputUsdValue: inputUsdPrice && ammInputAmount ? Number(ammInputAmount) * inputUsdPrice : undefined,
Expand Down
Loading