chore: Cleanup

lib/modules/pool/actions/PoolActionsPriceImpactDetails.tsx

@@ -2,34 +2,30 @@ import { NumberText } from '@/lib/shared/components/typography/NumberText'
 import { fNum, bn } from '@/lib/shared/utils/numbers'
 import { HStack, VStack, Text, Tooltip, Icon, Box, Skeleton } from '@chakra-ui/react'
 import { usePriceImpact } from '@/lib/modules/price-impact/PriceImpactProvider'
-import { useUserSettings } from '@/lib/modules/user/settings/UserSettingsProvider'
 import { useCurrency } from '@/lib/shared/hooks/useCurrency'
 import { usePool } from '../PoolProvider'
 import { ArrowRight } from 'react-feather'
 import { calcShareOfPool, calcUserShareOfPool } from '../pool.helpers'
 import { isNumber } from 'lodash'
 import { InfoIcon } from '@/lib/shared/components/icons/InfoIcon'
-import { useAddLiquidity } from './add-liquidity/AddLiquidityProvider'
 
 interface PoolActionsPriceImpactDetailsProps {
   bptAmount: bigint | undefined
   totalUSDValue: string
+  slippage: string
   isAddLiquidity?: boolean
   isLoading?: boolean
 }
 
 export function PoolActionsPriceImpactDetails({
   bptAmount,
   totalUSDValue,
+  slippage,
   isAddLiquidity = false,
   isLoading = false,
 }: PoolActionsPriceImpactDetailsProps) {
-  const { slippage: userSlippage } = useUserSettings()
   const { toCurrency } = useCurrency()
   const { pool } = usePool()
-  const { isForcedProportionalAdd, proportionalSlippage } = useAddLiquidity()
-
-  const slippage = isForcedProportionalAdd ? proportionalSlippage : userSlippage
 
   const { priceImpactLevel, priceImpactColor, PriceImpactIcon, priceImpact } = usePriceImpact()
 

lib/modules/pool/actions/add-liquidity/AddLiquidityProvider.tsx

@@ -47,7 +47,7 @@ export function _useAddLiquidity(urlTxHash?: Hash) {
     useTokens()
   const { isConnected } = useUserAccount()
   const { hasValidationErrors } = useTokenInputsValidation()
-  const { slippage } = useUserSettings()
+  const { slippage: userSlippage } = useUserSettings()
 
   const handler = useMemo(() => selectAddLiquidityHandler(pool), [pool.id, isLoading])
 
@@ -60,7 +60,7 @@ export function _useAddLiquidity(urlTxHash?: Hash) {
   const nativeAsset = getNativeAssetToken(chain)
   const wNativeAsset = getWrappedNativeAssetToken(chain)
   const isForcedProportionalAdd = requiresProportionalInput(pool.type)
-
+  const slippage = isForcedProportionalAdd ? proportionalSlippage : userSlippage
   const tokens = getPoolTokens(pool, getToken)
 
   function setInitialHumanAmountsIn() {
@@ -119,7 +119,7 @@ export function _useAddLiquidity(urlTxHash?: Hash) {
     handler,
     humanAmountsIn,
     simulationQuery,
-    slippage: isForcedProportionalAdd ? proportionalSlippage : slippage,
+    slippage,
   })
   const transactionSteps = useTransactionSteps(steps, isLoadingSteps)
 
@@ -191,6 +191,7 @@ export function _useAddLiquidity(urlTxHash?: Hash) {
     addLiquidityTxHash,
     hasQuoteContext,
     addLiquidityTxSuccess,
+    slippage,
     proportionalSlippage,
     isForcedProportionalAdd,
     setProportionalSlippage,

lib/modules/pool/actions/add-liquidity/form/AddLiquidityForm.tsx

@@ -82,6 +82,7 @@ function AddLiquidityMainForm() {
     wNativeAsset,
     previewModalDisclosure,
     proportionalSlippage,
+    slippage,
     setProportionalSlippage,
   } = useAddLiquidity()
 
@@ -217,6 +218,7 @@ function AddLiquidityMainForm() {
                   <PoolActionsPriceImpactDetails
                     totalUSDValue={totalUSDValue}
                     bptAmount={simulationQuery.data?.bptOut.amount}
+                    slippage={slippage}
                     isAddLiquidity
                     isLoading={isFetching}
                   />

lib/modules/pool/actions/add-liquidity/modal/AddLiquiditySummary.tsx

@@ -34,6 +34,7 @@ export function AddLiquiditySummary({
     tokens,
     addLiquidityTxHash,
     addLiquidityTxSuccess,
+    slippage,
   } = useAddLiquidity()
   const { pool } = usePool()
   const { isMobile } = useBreakpoints()
@@ -123,6 +124,7 @@ export function AddLiquiditySummary({
               <PoolActionsPriceImpactDetails
                 totalUSDValue={totalUSDValue}
                 bptAmount={simulationQuery.data?.bptOut.amount}
+                slippage={slippage}
                 isAddLiquidity
               />
             </VStack>

lib/modules/pool/actions/remove-liquidity/form/RemoveLiquidityForm.tsx

@@ -35,6 +35,7 @@ import { SimulationError } from '@/lib/shared/components/errors/SimulationError'
 import { InfoIcon } from '@/lib/shared/components/icons/InfoIcon'
 import { SafeAppAlert } from '@/lib/shared/components/alerts/SafeAppAlert'
 import { useTokens } from '@/lib/modules/tokens/TokensProvider'
+import { useUserSettings } from '@/lib/modules/user/settings/UserSettingsProvider'
 const TABS: ButtonGroupOption[] = [
   {
     value: 'proportional',
@@ -71,6 +72,7 @@ export function RemoveLiquidityForm() {
   const nextBtn = useRef(null)
   const [activeTab, setActiveTab] = useState(TABS[0])
   const { startTokenPricePolling } = useTokens()
+  const { slippage } = useUserSettings()
 
   useEffect(() => {
     setPriceImpact(priceImpactQuery.data)
@@ -177,6 +179,7 @@ export function RemoveLiquidityForm() {
                     <PoolActionsPriceImpactDetails
                       totalUSDValue={totalUSDValue}
                       bptAmount={BigInt(parseUnits(quoteBptIn, 18))}
+                      slippage={slippage}
                       isLoading={isFetching}
                     />
                   }

lib/modules/pool/actions/remove-liquidity/modal/RemoveLiquiditySummary.tsx

@@ -14,6 +14,7 @@ import { RemoveLiquidityReceiptResult } from '@/lib/modules/transactions/transac
 import { BalAlert } from '@/lib/shared/components/alerts/BalAlert'
 import { useTokens } from '@/lib/modules/tokens/TokensProvider'
 import { CardPopAnim } from '@/lib/shared/components/animations/CardPopAnim'
+import { useUserSettings } from '@/lib/modules/user/settings/UserSettingsProvider'
 
 export function RemoveLiquiditySummary({
   isLoading: isLoadingReceipt,
@@ -34,6 +35,7 @@ export function RemoveLiquiditySummary({
   const { getTokensByChain } = useTokens()
   const { pool } = usePool()
   const { userAddress, isLoading: isUserAddressLoading } = useUserAccount()
+  const { slippage } = useUserSettings()
 
   const _amountsOut = amountsOut.filter(amount => bn(amount.humanAmount).gt(0))
 
@@ -87,6 +89,7 @@ export function RemoveLiquiditySummary({
             <VStack align="start" spacing="sm">
               <PoolActionsPriceImpactDetails
                 totalUSDValue={totalUSDValue}
+                slippage={slippage}
                 bptAmount={BigInt(parseUnits(quoteBptIn, 18))}
               />
             </VStack>