fix: reset to default range

gnoswap-labs · Jul 17, 2024 · b344b04 · b344b04
1 parent 0cc07b6
commit b344b04
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 3 deletions.
diff --git a/...es/web/src/components/common/select-price-range-custom/SelectPriceRangeCustomPosition.tsx b/...es/web/src/components/common/select-price-range-custom/SelectPriceRangeCustomPosition.tsx
@@ -33,6 +33,7 @@ export interface SelectPriceRangeCustomProps {
   showDim: boolean;
   defaultPrice: number | null;
   handleSwapValue: () => void;
+  resetRange?: () => void;
   isEmptyLiquidity: boolean;
   isKeepToken: boolean;
 }
@@ -43,6 +44,7 @@ const SelectPriceRangeCustom: React.FC<SelectPriceRangeCustomProps> = ({
   priceRangeType,
   selectPool,
   showDim,
+  resetRange,
   handleSwapValue,
   isKeepToken,
 }) => {
@@ -234,7 +236,11 @@ const SelectPriceRangeCustom: React.FC<SelectPriceRangeCustomProps> = ({
     }
   }
 
-  function resetRange(priceRangeType?: PriceRangeType | null) {
+  function onResetRange(priceRangeType?: PriceRangeType | null) {
+    if (resetRange) {
+      resetRange();
+      return;
+    }
     selectPool.resetRange();
     setShiftPosition(0);
     initPriceRange(priceRangeType);
@@ -259,7 +265,7 @@ const SelectPriceRangeCustom: React.FC<SelectPriceRangeCustomProps> = ({
   }, [tokenA]);
 
   useEffect(() => {
-    resetRange(priceRangeType);
+    onResetRange(priceRangeType);
   }, [
     selectPool.poolPath,
     selectPool.feeTier,
@@ -430,7 +436,7 @@ const SelectPriceRangeCustom: React.FC<SelectPriceRangeCustomProps> = ({
                   <div className="extra-wrapper">
                     <div
                       className="icon-button reset"
-                      onClick={() => resetRange()}
+                      onClick={() => onResetRange()}
                     >
                       <IconRefresh />
                       <span>Reset Range</span>

diff --git a/...es/web/src/components/common/select-price-range-reposition/SelectPriceRangeReposition.tsx b/...es/web/src/components/common/select-price-range-reposition/SelectPriceRangeReposition.tsx
@@ -25,6 +25,7 @@ interface SelectPriceRangeProps {
   showDim: boolean;
   defaultPrice: number | null;
   handleSwapValue: () => void;
+  resetRange: () => void;
   isEmptyLiquidity: boolean;
   isKeepToken: boolean;
 }
@@ -41,6 +42,7 @@ const SelectPriceRangeReposition: React.FC<SelectPriceRangeProps> = ({
   showDim,
   defaultPrice,
   handleSwapValue,
+  resetRange,
   isEmptyLiquidity,
   isKeepToken,
 }) => {
@@ -78,6 +80,7 @@ const SelectPriceRangeReposition: React.FC<SelectPriceRangeProps> = ({
           priceRangeType={priceRange?.type || null}
           showDim={showDim}
           defaultPrice={defaultPrice}
+          resetRange={resetRange}
           handleSwapValue={handleSwapValue}
           isEmptyLiquidity={isEmptyLiquidity}
           isKeepToken={isKeepToken}

diff --git a/packages/web/src/components/reposition/reposition-content/RepositionContent.tsx b/packages/web/src/components/reposition/reposition-content/RepositionContent.tsx
@@ -38,6 +38,7 @@ interface RepositionContentProps {
   priceRanges: AddLiquidityPriceRage[];
   priceRange: AddLiquidityPriceRage;
   changePriceRange: (priceRange: AddLiquidityPriceRage) => void;
+  resetRange: () => void;
   currentAmounts: { amountA: string; amountB: string } | null;
   repositionAmounts: { amountA: string | null; amountB: string | null } | null;
   selectedPosition: PoolPositionModel | null;
@@ -59,6 +60,7 @@ const RepositionContent: React.FC<RepositionContentProps> = ({
   priceRange,
   priceRanges,
   changePriceRange,
+  resetRange,
   currentAmounts,
   repositionAmounts,
   selectedPosition,
@@ -128,6 +130,7 @@ const RepositionContent: React.FC<RepositionContentProps> = ({
           priceRanges={priceRanges}
           priceRange={priceRange}
           changePriceRange={changePriceRange}
+          resetRange={resetRange}
           isLoadingPosition={isLoadingPosition}
         />
       </article>

diff --git a/packages/web/src/components/reposition/reposition-select-range/RepositionSelectRange.tsx b/packages/web/src/components/reposition/reposition-select-range/RepositionSelectRange.tsx
@@ -24,6 +24,7 @@ export interface RepositionSelectRangeProps {
   priceRanges: AddLiquidityPriceRage[];
   priceRange: AddLiquidityPriceRage;
   changePriceRange: (priceRange: AddLiquidityPriceRage) => void;
+  resetRange: () => void;
   isLoadingPosition: boolean;
 }
 
@@ -40,6 +41,7 @@ const RepositionSelectRange: React.FC<RepositionSelectRangeProps> = ({
   priceRange,
   priceRanges,
   changePriceRange,
+  resetRange,
   isLoadingPosition,
 }) => {
   const [openedPriceRange, setOpenedPriceRange] = useState(true);
@@ -71,6 +73,7 @@ const RepositionSelectRange: React.FC<RepositionSelectRangeProps> = ({
         changePriceRange={changePriceRange}
         changeStartingPrice={() => {}}
         selectPool={selectPool}
+        resetRange={resetRange}
         showDim={false}
         handleSwapValue={() => {}}
         isEmptyLiquidity={true}

diff --git a/packages/web/src/containers/reposition-container/RepositionContainer.tsx b/packages/web/src/containers/reposition-container/RepositionContainer.tsx
@@ -38,6 +38,7 @@ const RepositionContainer: React.FC = () => {
     removePosition,
     swapRemainToken,
     reposition,
+    resetRange,
     selectedPosition,
     isLoadingPosition,
     isSkipSwap,
@@ -93,6 +94,7 @@ const RepositionContainer: React.FC = () => {
       selectPool={selectPool}
       priceRanges={PRICE_RANGES}
       changePriceRange={changePriceRange}
+      resetRange={resetRange}
       priceRange={priceRange}
       currentAmounts={currentAmounts}
       repositionAmounts={repositionAmounts}

diff --git a/packages/web/src/hooks/reposition/use-reposition-handle.tsx b/packages/web/src/hooks/reposition/use-reposition-handle.tsx
@@ -155,6 +155,12 @@ export const useRepositionHandle = () => {
       : RANGE_STATUS_OPTION.OUT;
   }, [selectedPosition, inRange]);
 
+  const resetRange = useCallback(() => {
+    selectPool.resetRange();
+    selectPool.setMinPosition(defaultPositionMinPrice);
+    selectPool.setMaxPosition(defaultPositionMaxPrice);
+  }, [selectPool]);
+
   useEffect(() => {
     if (initialized || selectPool.isLoading || !selectPool.poolPath) {
       return;
@@ -768,6 +774,7 @@ export const useRepositionHandle = () => {
     removePosition,
     swapRemainToken,
     reposition,
+    resetRange,
     selectedPosition,
     isLoadingPosition,
     isErrorLiquidity,