From 2fca55119b58b62eadcce813e8c14f9e424a1c65 Mon Sep 17 00:00:00 2001 From: memoyil <2213635+memoyil@users.noreply.github.com> Date: Fri, 21 Apr 2023 12:14:13 +0300 Subject: [PATCH] fix: Roi crash when full range selected --- .../web/src/views/AddLiquidityV3/components/AprCalculator.tsx | 1 + packages/uikit/src/widgets/RoiCalculator/RoiCalculator.tsx | 3 +++ .../uikit/src/widgets/RoiCalculator/hooks/usePriceRange.ts | 4 +++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/apps/web/src/views/AddLiquidityV3/components/AprCalculator.tsx b/apps/web/src/views/AddLiquidityV3/components/AprCalculator.tsx index cb65a662f61570..dd819f1aaf02cb 100644 --- a/apps/web/src/views/AddLiquidityV3/components/AprCalculator.tsx +++ b/apps/web/src/views/AddLiquidityV3/components/AprCalculator.tsx @@ -245,6 +245,7 @@ export function AprCalculator({ volume24H={volume24H} priceUpper={priceUpper} priceLower={priceLower} + fullRangeSelected={formState.rightRangeTypedValue === true && formState.leftRangeTypedValue === true} priceSpan={priceSpan} onPriceSpanChange={setPriceSpan} onApply={onApply} diff --git a/packages/uikit/src/widgets/RoiCalculator/RoiCalculator.tsx b/packages/uikit/src/widgets/RoiCalculator/RoiCalculator.tsx index 5fdefb1e1d3c64..e41b5ace9d4a33 100644 --- a/packages/uikit/src/widgets/RoiCalculator/RoiCalculator.tsx +++ b/packages/uikit/src/widgets/RoiCalculator/RoiCalculator.tsx @@ -52,6 +52,7 @@ export type RoiCalculatorProps = { price?: Price; priceLower?: Price; priceUpper?: Price; + fullRangeSelected?: boolean; currencyAUsdPrice?: number; currencyBUsdPrice?: number; depositAmountInUsd?: number | string; @@ -94,6 +95,7 @@ export function RoiCalculator({ price, priceLower, priceUpper, + fullRangeSelected, volume24H, maxLabel, max, @@ -178,6 +180,7 @@ export function RoiCalculator({ quoteCurrency: currencyB, priceLower, priceUpper, + fullRangeSelected, }); const { getDecrementLower, getIncrementLower, getDecrementUpper, getIncrementUpper } = useRangeHopCallbacks( currencyA, diff --git a/packages/uikit/src/widgets/RoiCalculator/hooks/usePriceRange.ts b/packages/uikit/src/widgets/RoiCalculator/hooks/usePriceRange.ts index 53d0677e660725..e18a08a05e36e9 100644 --- a/packages/uikit/src/widgets/RoiCalculator/hooks/usePriceRange.ts +++ b/packages/uikit/src/widgets/RoiCalculator/hooks/usePriceRange.ts @@ -19,6 +19,7 @@ interface Params { quoteCurrency?: Currency; priceLower?: Price; priceUpper?: Price; + fullRangeSelected?: boolean; } interface PriceRangeInfo { @@ -39,8 +40,9 @@ export function usePriceRange({ feeAmount, priceLower: initialPriceLower, priceUpper: initialPriceUpper, + fullRangeSelected, }: Params): PriceRangeInfo | null { - const [fullRange, setFullRange] = useState(false); + const [fullRange, setFullRange] = useState(!!fullRangeSelected); const [priceLower, setPriceLower] = useState | undefined>(initialPriceLower); const [priceUpper, setPriceUpper] = useState | undefined>(initialPriceUpper);