Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 3 additions & 4 deletions apps/web/app/[locale]/add/hooks/useAddLiquidity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ import { NONFUNGIBLE_POSITION_MANAGER_ABI } from "@/config/abis/nonfungiblePosit
import { TOKEN_CONVERTER_ABI } from "@/config/abis/tokenConverter";
import { getTransactionWithRetries } from "@/functions/getTransactionWithRetries";
import { IIFE } from "@/functions/iife";
import { slippageToPercent } from "@/functions/slippageToPercent";
import useCurrentChainId from "@/hooks/useCurrentChainId";
import useDeepEffect from "@/hooks/useDeepEffect";
import useTransactionDeadline from "@/hooks/useTransactionDeadline";
import addToast from "@/other/toast";
import { CONVERTER_ADDRESS, NONFUNGIBLE_POSITION_MANAGER_ADDRESS } from "@/sdk_bi/addresses";
import { DexChainId } from "@/sdk_bi/chains";
import { FeeAmount } from "@/sdk_bi/constants";
import { Percent } from "@/sdk_bi/entities/fractions/percent";
import { Position } from "@/sdk_bi/entities/position";
import { toHex } from "@/sdk_bi/utils/calldata";
import { useGlobalBlockNumber } from "@/shared/hooks/useGlobalBlockNumber";
Expand All @@ -38,8 +38,6 @@ import {
} from "../stores/useAddLiquidityStatusStore";
import { useSortedTokens } from "./useSortedTokens";

const TEST_ALLOWED_SLIPPAGE = new Percent(2, 100);

enum ADD_LIQUIDITY_TYPE {
CREATE_AND_MINT,
MINT,
Expand Down Expand Up @@ -93,7 +91,7 @@ export function useAddLiquidityParams({
// get amounts
const { amount0: amount0Desired, amount1: amount1Desired } = position.mintAmounts;

const minimumAmounts = position.mintAmountsWithSlippage(TEST_ALLOWED_SLIPPAGE); // options.slippageTolerance
const minimumAmounts = position.mintAmountsWithSlippage(slippageToPercent(slippage));
const amount0Min = toHex(minimumAmounts.amount0);
const amount1Min = toHex(minimumAmounts.amount1);

Expand Down Expand Up @@ -240,6 +238,7 @@ export function useAddLiquidityParams({
addLiquidityType,
position,
tokenId,
slippage,
]);

return { addLiquidityParams, addLiquidityType };
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { ERC20_ABI } from "@/config/abis/erc20";
import { NONFUNGIBLE_POSITION_MANAGER_ABI } from "@/config/abis/nonfungiblePositionManager";
import { getTransactionWithRetries } from "@/functions/getTransactionWithRetries";
import { IIFE } from "@/functions/iife";
import { slippageToPercent } from "@/functions/slippageToPercent";
import useCurrentChainId from "@/hooks/useCurrentChainId";
import useDeepEffect from "@/hooks/useDeepEffect";
import useTransactionDeadline from "@/hooks/useTransactionDeadline";
Expand Down Expand Up @@ -34,7 +35,7 @@ import { useRemoveLiquidityStore } from "../stores/useRemoveLiquidityStore";

const useRemoveLiquidityParams = () => {
const { percentage, tokenId, position } = useRemoveLiquidityStore();
const { deadline: _deadline } = useTransactionSettingsStore();
const { slippage, deadline: _deadline } = useTransactionSettingsStore();
const deadline = useTransactionDeadline(_deadline);
const chainId = useCurrentChainId();
const { address: accountAddress } = useAccount();
Expand All @@ -50,10 +51,8 @@ const useRemoveLiquidityParams = () => {
tickUpper: position.tickUpper,
});

const TEST_ALLOWED_SLIPPAGE = new Percent(2, 100);

// adjust for slippage
const minimumAmounts = partialPosition.burnAmountsWithSlippage(TEST_ALLOWED_SLIPPAGE); // options.slippageTolerance
const minimumAmounts = partialPosition.burnAmountsWithSlippage(slippageToPercent(slippage));
const amount0Min = toHex(minimumAmounts.amount0);
const amount1Min = toHex(minimumAmounts.amount1);

Expand Down Expand Up @@ -83,7 +82,7 @@ const useRemoveLiquidityParams = () => {
removeLiquidityParams,
minimumAmounts,
};
}, [accountAddress, chainId, deadline, percentage, tokenId, position]);
}, [accountAddress, chainId, deadline, percentage, tokenId, position, slippage]);
};

// Shown when estimation fails (no wallet, RPC error). decreaseLiquidity on this position
Expand Down
Loading