diff --git a/apps/frontend-v3/app/api/rpc/[chain]/route.ts b/apps/frontend-v3/app/api/rpc/[chain]/route.ts
index cbd60b37a..204f256b3 100644
--- a/apps/frontend-v3/app/api/rpc/[chain]/route.ts
+++ b/apps/frontend-v3/app/api/rpc/[chain]/route.ts
@@ -19,6 +19,8 @@ const chainToRpcMap: Record<GqlChain, string | undefined> = {
   [GqlChain.Avalanche]: dRpcUrl('avalanche'),
   [GqlChain.Fantom]: dRpcUrl('fantom'),
   [GqlChain.Sepolia]: dRpcUrl('sepolia'),
+  // DEBUG:
+  // [GqlChain.Sepolia]: 'https://eth-sepolia.g.alchemy.com/v2/<KEY>',
   [GqlChain.Fraxtal]: dRpcUrl('fraxtal'),
   [GqlChain.Gnosis]: dRpcUrl('gnosis'),
   [GqlChain.Mode]: dRpcUrl('mode'),
diff --git a/packages/lib/modules/pool/PoolDetail/PoolMyLiquidity.tsx b/packages/lib/modules/pool/PoolDetail/PoolMyLiquidity.tsx
index b3082bc27..4602b474e 100644
--- a/packages/lib/modules/pool/PoolDetail/PoolMyLiquidity.tsx
+++ b/packages/lib/modules/pool/PoolDetail/PoolMyLiquidity.tsx
@@ -17,7 +17,7 @@ import {
   Tooltip,
   useDisclosure,
 } from '@chakra-ui/react'
-import React, { useMemo, useState, useLayoutEffect } from 'react'
+import { useMemo, useState, useLayoutEffect } from 'react'
 import { usePool } from '../PoolProvider'
 import { Address } from 'viem'
 import { usePathname, useRouter } from 'next/navigation'
diff --git a/packages/lib/modules/pool/actions/LiquidityActionHelpers.integration.spec.ts b/packages/lib/modules/pool/actions/LiquidityActionHelpers.integration.spec.ts
index eef8b9171..ed14f9c2c 100644
--- a/packages/lib/modules/pool/actions/LiquidityActionHelpers.integration.spec.ts
+++ b/packages/lib/modules/pool/actions/LiquidityActionHelpers.integration.spec.ts
@@ -14,6 +14,7 @@ import { GqlChain, GqlPoolElement } from '@repo/lib/shared/services/api/generate
 import { getPoolMock } from '../__mocks__/getPoolMock'
 import { allPoolTokens } from '../pool.helpers'
 import { LiquidityActionHelpers } from './LiquidityActionHelpers'
+import { Pool } from '../PoolProvider'
 
 describe('Calculates toInputAmounts from allPoolTokens', () => {
   it('for v2 weighted pool with no nested tokens', async () => {
@@ -293,3 +294,163 @@ describe.skip('Liquidity helpers for V3 NESTED pool', async () => {
     ])
   })
 })
+
+// Unskip when sepolia V3 pools are available in production api
+test.skip('Nested pool state for V3 BOOSTED POOL', async () => {
+  // const poolId = '0xbb83ba331c3254c8c44645430126797dceda89c0' // Sepolia Balancer 50 WETH 50 stataUSDC
+
+  // const v3Pool = await getPoolMock(poolId, GqlChain.Sepolia)
+  const v3Pool = {} as Pool
+
+  const helpers = new LiquidityActionHelpers(v3Pool)
+
+  const state = helpers.boostedPoolState
+
+  expect(state).toMatchInlineSnapshot(`
+    {
+      "address": "0xbb83ba331c3254c8c44645430126797dceda89c0",
+      "id": "0xbb83ba331c3254c8c44645430126797dceda89c0",
+      "protocolVersion": 3,
+      "tokens": [
+        {
+          "address": "0x7b79995e5f793a07bc00c21412e50ecae098e7f9",
+          "balance": "10.030375954528889",
+          "balanceUSD": "35947.96468719563",
+          "decimals": 18,
+          "erc4626ReviewData": null,
+          "hasNestedPool": false,
+          "id": "0xbb83ba331c3254c8c44645430126797dceda89c0-0x7b79995e5f793a07bc00c21412e50ecae098e7f9",
+          "index": 0,
+          "isAllowed": true,
+          "isErc4626": false,
+          "name": "Wrapped Ether",
+          "nestedPool": null,
+          "priceRate": "1",
+          "priceRateProvider": "0x0000000000000000000000000000000000000000",
+          "priceRateProviderData": null,
+          "symbol": "WETH",
+          "underlyingToken": null,
+          "weight": "0.5",
+        },
+        {
+          "address": "0x8a88124522dbbf1e56352ba3de1d9f78c143751e",
+          "balance": "25922.046716",
+          "balanceUSD": "30847.23559204",
+          "decimals": 6,
+          "erc4626ReviewData": null,
+          "hasNestedPool": false,
+          "id": "0xbb83ba331c3254c8c44645430126797dceda89c0-0x8a88124522dbbf1e56352ba3de1d9f78c143751e",
+          "index": 1,
+          "isAllowed": true,
+          "isErc4626": true,
+          "name": "Static Aave Ethereum USDC",
+          "nestedPool": null,
+          "priceRate": "1.188770181245210492",
+          "priceRateProvider": "0x34101091673238545de8a846621823d9993c3085",
+          "priceRateProviderData": {
+            "address": "0x34101091673238545de8a846621823d9993c3085",
+            "factory": null,
+            "name": "waUSDC Rate Provider",
+            "reviewFile": "./StatATokenTestnetRateProvider.md",
+            "reviewed": true,
+            "summary": "safe",
+            "upgradeableComponents": [],
+            "warnings": [
+              "",
+            ],
+          },
+          "symbol": "stataEthUSDC",
+          "underlyingToken": {
+            "address": "0x94a9d9ac8a22534e3faca9f4e7f2e2cf85d5e4c8",
+            "chainId": 11155111,
+            "decimals": 6,
+            "index": 1,
+            "name": "USDC (AAVE Faucet)",
+            "symbol": "usdc-aave",
+          },
+          "weight": "0.5",
+        },
+      ],
+      "totalShares": "555.900851855167757901",
+      "type": "Weighted",
+    }
+  `)
+})
+
+// Unskip when sepolia V3 pools are available in production api
+test.skip('Nested pool state for V3 NESTED POOL', async () => {
+  // const poolId = '0xc9233cc69435591b193b50f702ac31e404a08b10' // Sepolia Balancer 50 WETH 50 USD
+
+  const usdcSepoliaAddress = '0x94a9d9ac8a22534e3faca9f4e7f2e2cf85d5e4c8'
+  const daiSepoliaAddress = '0xff34b3d4aee8ddcd6f9afffb6fe49bd371b8a357'
+  const wethSepoliaAddress = '0x7b79995e5f793a07bc00c21412e50ecae098e7f9'
+  // const v3Pool = await getPoolMock(poolId, GqlChain.Sepolia)
+  const v3Pool = {} as Pool
+
+  const helpers = new LiquidityActionHelpers(v3Pool)
+
+  const state = helpers.nestedPoolStateV3
+
+  expect(state).toEqual({
+    mainTokens: [
+      {
+        address: wethSepoliaAddress,
+        decimals: 18,
+        index: 0,
+      },
+      {
+        address: usdcSepoliaAddress,
+        decimals: 6,
+        index: 0,
+      },
+      {
+        address: daiSepoliaAddress,
+        decimals: 18,
+        index: 1,
+      },
+    ],
+    pools: [
+      {
+        address: '0xc9233cc69435591b193b50f702ac31e404a08b10',
+        id: '0xc9233cc69435591b193b50f702ac31e404a08b10',
+        level: 1,
+        tokens: [
+          {
+            address: wethSepoliaAddress,
+            decimals: 18,
+            index: 0,
+            underlyingToken: null,
+          },
+          {
+            address: '0x946e59e9637f44eb122fe64b372aaf6ed0441da1',
+            decimals: 18,
+            index: 1,
+            underlyingToken: null,
+          },
+        ],
+        type: 'Weighted',
+      },
+      {
+        address: '0x946e59e9637f44eb122fe64b372aaf6ed0441da1',
+        id: '0x946e59e9637f44eb122fe64b372aaf6ed0441da1',
+        level: 0,
+        tokens: [
+          {
+            address: usdcSepoliaAddress,
+            decimals: 6,
+            index: 0,
+            underlyingToken: null,
+          },
+          {
+            address: daiSepoliaAddress,
+            decimals: 18,
+            index: 1,
+            underlyingToken: null,
+          },
+        ],
+        type: 'Weighted',
+      },
+    ],
+    protocolVersion: 3,
+  })
+})
diff --git a/packages/lib/modules/pool/actions/LiquidityActionHelpers.ts b/packages/lib/modules/pool/actions/LiquidityActionHelpers.ts
index 761d37902..629d622ab 100644
--- a/packages/lib/modules/pool/actions/LiquidityActionHelpers.ts
+++ b/packages/lib/modules/pool/actions/LiquidityActionHelpers.ts
@@ -43,7 +43,7 @@ import {
   isUnbalancedLiquidityDisabled,
   isV2Pool,
   isV3Pool,
-  isV3WithNestedActionsPool,
+  isV3NotSupportingWethIsEth,
 } from '../pool.helpers'
 import { TokenAmountIn } from '../../tokens/approvals/permit2/useSignPermit2'
 
@@ -84,16 +84,18 @@ export class LiquidityActionHelpers {
   /* Used by V3 boosted SDK handlers */
   public get boostedPoolState(): PoolStateWithUnderlyings & { totalShares: HumanAmount } {
     const poolTokensWithUnderlyings: PoolTokenWithUnderlying[] = this.pool.poolTokens.map(
-      (token, index) => ({
+      token => ({
         ...token,
         address: token.address as Address,
         balance: token.balance as HumanAmount,
-        underlyingToken: {
-          ...token.underlyingToken,
-          address: token.underlyingToken?.address as Address,
-          decimals: token.underlyingToken?.decimals as number,
-          index, //TODO: review that this index is always the expected one
-        },
+        underlyingToken: token.underlyingToken?.address
+          ? {
+              ...token.underlyingToken,
+              address: token.underlyingToken?.address as Address,
+              decimals: token.underlyingToken?.decimals as number,
+              index: token.index, //TODO: review that this index is always the expected one
+            }
+          : null,
       })
     )
     const state: PoolStateWithUnderlyings & { totalShares: HumanAmount } = {
@@ -359,7 +361,7 @@ export function emptyTokenAmounts(pool: Pool): TokenAmount[] {
 
 export function shouldShowNativeWrappedSelector(token: GqlToken, pool: Pool) {
   return (
-    !isV3WithNestedActionsPool(pool) && // V3 nested actions don't support wethIsEth currently
+    !isV3NotSupportingWethIsEth(pool) && // V3 boosted/nested actions don't support wethIsEth currently
     !isCowAmmPool(pool.type) && // Cow AMM pools don't support wethIsEth
     isNativeOrWrappedNative(token.address as Address, token.chain)
   )
diff --git a/packages/lib/modules/pool/actions/add-liquidity/AddLiquidityProvider.tsx b/packages/lib/modules/pool/actions/add-liquidity/AddLiquidityProvider.tsx
index c251f2266..63eee9949 100644
--- a/packages/lib/modules/pool/actions/add-liquidity/AddLiquidityProvider.tsx
+++ b/packages/lib/modules/pool/actions/add-liquidity/AddLiquidityProvider.tsx
@@ -3,7 +3,7 @@
 
 import { useTokens } from '@repo/lib/modules/tokens/TokensProvider'
 import { useMandatoryContext } from '@repo/lib/shared/utils/contexts'
-import { HumanAmount } from '@balancer/sdk'
+import { HumanAmount, isSameAddress } from '@balancer/sdk'
 import { PropsWithChildren, createContext, useEffect, useMemo, useState } from 'react'
 import { Address, Hash } from 'viem'
 import { usePool } from '../../PoolProvider'
@@ -28,7 +28,7 @@ import { useTotalUsdValue } from '@repo/lib/modules/tokens/useTotalUsdValue'
 import { HumanTokenAmountWithAddress } from '@repo/lib/modules/tokens/token.types'
 import { isUnhandledAddPriceImpactError } from '@repo/lib/modules/price-impact/price-impact.utils'
 import { useModalWithPoolRedirect } from '../../useModalWithPoolRedirect'
-import { getPoolActionableTokens, isV3WithNestedActionsPool } from '../../pool.helpers'
+import { getPoolActionableTokens, isV3NotSupportingWethIsEth } from '../../pool.helpers'
 import { useUserSettings } from '@repo/lib/modules/user/settings/UserSettingsProvider'
 import { isUnbalancedAddErrorMessage } from '@repo/lib/shared/utils/error-filters'
 
@@ -37,6 +37,8 @@ export const AddLiquidityContext = createContext<UseAddLiquidityResponse | null>
 
 export function _useAddLiquidity(urlTxHash?: Hash) {
   const [humanAmountsIn, setHumanAmountsIn] = useState<HumanTokenAmountWithAddress[]>([])
+  // only used by Proportional handlers that require a referenceAmount
+  const [referenceAmountAddress, setReferenceAmountAddress] = useState<Address | undefined>()
   const [needsToAcceptHighPI, setNeedsToAcceptHighPI] = useState(false)
   const [acceptPoolRisks, setAcceptPoolRisks] = useState(false)
   const [wethIsEth, setWethIsEth] = useState(false)
@@ -91,6 +93,19 @@ export function _useAddLiquidity(urlTxHash?: Hash) {
     ])
   }
 
+  function clearAmountsIn(changedAmount?: HumanTokenAmountWithAddress) {
+    setHumanAmountsIn(
+      humanAmountsIn.map(({ tokenAddress }) => {
+        // Keeps user inputs like '0' or '0.' instead of replacing them with ''
+        if (changedAmount && isSameAddress(changedAmount.tokenAddress, tokenAddress)) {
+          return changedAmount
+        }
+
+        return { tokenAddress, humanAmount: '' }
+      })
+    )
+  }
+
   const tokensWithNativeAsset = replaceWrappedWithNativeAsset(tokens, nativeAsset)
 
   const validTokens = injectNativeAsset(tokens, nativeAsset, pool)
@@ -110,6 +125,7 @@ export function _useAddLiquidity(urlTxHash?: Hash) {
     handler,
     humanAmountsIn,
     enabled: !urlTxHash,
+    referenceAmountAddress,
   })
   const priceImpactQuery = useAddLiquidityPriceImpactQuery({
     handler,
@@ -179,7 +195,7 @@ export function _useAddLiquidity(urlTxHash?: Hash) {
   return {
     transactionSteps,
     humanAmountsIn,
-    tokens: wethIsEth && !isV3WithNestedActionsPool(pool) ? tokensWithNativeAsset : tokens,
+    tokens: wethIsEth && !isV3NotSupportingWethIsEth(pool) ? tokensWithNativeAsset : tokens,
     validTokens,
     totalUSDValue,
     simulationQuery,
@@ -202,11 +218,14 @@ export function _useAddLiquidity(urlTxHash?: Hash) {
     proportionalSlippage,
     isForcedProportionalAdd,
     wantsProportional,
+    referenceAmountAddress,
     setWantsProportional,
     setProportionalSlippage,
     refetchQuote,
     setHumanAmountIn,
     setHumanAmountsIn,
+    clearAmountsIn,
+    setReferenceAmountAddress,
     setNeedsToAcceptHighPI,
     setAcceptPoolRisks,
     setWethIsEth,
diff --git a/packages/lib/modules/pool/actions/add-liquidity/form/AddLiquidityForm.tsx b/packages/lib/modules/pool/actions/add-liquidity/form/AddLiquidityForm.tsx
index 0b0e5530b..2b5d7e8eb 100644
--- a/packages/lib/modules/pool/actions/add-liquidity/form/AddLiquidityForm.tsx
+++ b/packages/lib/modules/pool/actions/add-liquidity/form/AddLiquidityForm.tsx
@@ -19,7 +19,7 @@ import {
   VStack,
   useDisclosure,
 } from '@chakra-ui/react'
-import { useEffect, useRef } from 'react'
+import { useEffect, useRef, useState } from 'react'
 import { Address } from 'viem'
 import { AddLiquidityModal } from '../modal/AddLiquidityModal'
 import { useAddLiquidity } from '../AddLiquidityProvider'
@@ -28,8 +28,6 @@ import {
   ProportionalTransactionSettings,
   TransactionSettings,
 } from '@repo/lib/modules/user/settings/TransactionSettings'
-import { TokenInputs } from './TokenInputs'
-import { TokenInputsWithAddable } from './TokenInputsWithAddable'
 import { usePool } from '../../../PoolProvider'
 import {
   hasNoLiquidity,
@@ -55,7 +53,10 @@ import { ConnectWallet } from '@repo/lib/modules/web3/ConnectWallet'
 import { BalAlert } from '@repo/lib/shared/components/alerts/BalAlert'
 import { SafeAppAlert } from '@repo/lib/shared/components/alerts/SafeAppAlert'
 import { useTokens } from '@repo/lib/modules/tokens/TokensProvider'
+import { AddLiquidityFormTabs } from './AddLiquidityFormTabs'
 import { UnbalancedAddError } from '@repo/lib/shared/components/errors/UnbalancedAddError'
+import { isUnbalancedAddError } from '@repo/lib/shared/utils/error-filters'
+import { isV3NotSupportingWethIsEth } from '../../../pool.helpers'
 
 // small wrapper to prevent out of context error
 export function AddLiquidityForm() {
@@ -88,6 +89,7 @@ function AddLiquidityMainForm() {
     proportionalSlippage,
     slippage,
     setProportionalSlippage,
+    setWantsProportional,
     wantsProportional,
   } = useAddLiquidity()
 
@@ -100,6 +102,16 @@ function AddLiquidityMainForm() {
   const { balanceFor, isBalancesLoading } = useTokenBalances()
   const { isConnected } = useUserAccount()
   const { startTokenPricePolling } = useTokens()
+  const [tabIndex, setTabIndex] = useState(0)
+
+  const setUnbalancedTab = () => {
+    setTabIndex(0)
+    setWantsProportional(false)
+  }
+  const setProportionalTab = () => {
+    setTabIndex(1)
+    setWantsProportional(true)
+  }
 
   useEffect(() => {
     setPriceImpact(priceImpactQuery.data)
@@ -108,9 +120,12 @@ function AddLiquidityMainForm() {
   const hasPriceImpact = priceImpact !== undefined && priceImpact !== null
   const priceImpactLabel = hasPriceImpact ? fNum('priceImpact', priceImpact) : '-'
 
+  const nestedAddLiquidityEnabled = supportsNestedActions(pool) // TODO && !userToggledEscapeHatch
+
+  const isUnbalancedError = isUnbalancedAddError(simulationQuery.error || priceImpactQuery.error)
+
   const weeklyYield = calcPotentialYieldFor(pool, totalUSDValue)
 
-  const nestedAddLiquidityEnabled = supportsNestedActions(pool) // TODO && !userToggledEscapeHatch
   const isLoading = simulationQuery.isLoading || priceImpactQuery.isLoading
   const isFetching = simulationQuery.isFetching || priceImpactQuery.isFetching
 
@@ -128,7 +143,7 @@ function AddLiquidityMainForm() {
 
   // if native asset balance is higher set that asset as the 'default'
   useEffect(() => {
-    if (!isBalancesLoading && nativeAsset && wNativeAsset) {
+    if (!isBalancesLoading && nativeAsset && wNativeAsset && !isV3NotSupportingWethIsEth(pool)) {
       const nativeAssetBalance = balanceFor(nativeAsset.address)
       const wNativeAssetBalance = balanceFor(wNativeAsset.address)
       if (
@@ -190,14 +205,20 @@ function AddLiquidityMainForm() {
             <BalAlert content="You cannot add because the pool has no liquidity" status="warning" />
           )}
           <SafeAppAlert />
-          {!nestedAddLiquidityEnabled ? (
-            <TokenInputsWithAddable
-              requiresProportionalInput={requiresProportionalInput(pool)}
-              tokenSelectDisclosureOpen={() => tokenSelectDisclosure.onOpen()}
-              totalUSDValue={totalUSDValue}
+          <AddLiquidityFormTabs
+            nestedAddLiquidityEnabled={nestedAddLiquidityEnabled}
+            setProportionalTab={setProportionalTab}
+            setUnbalancedTab={setUnbalancedTab}
+            tabIndex={tabIndex}
+            tokenSelectDisclosure={tokenSelectDisclosure}
+            totalUSDValue={totalUSDValue}
+          />
+          {!wantsProportional && isUnbalancedError && (
+            <UnbalancedAddError
+              error={simulationQuery.error || priceImpactQuery.error}
+              goToProportionalAdds={setProportionalTab}
+              isProportionalSupported={!nestedAddLiquidityEnabled}
             />
-          ) : (
-            <TokenInputs tokenSelectDisclosureOpen={() => tokenSelectDisclosure.onOpen()} />
           )}
           <VStack align="start" spacing="sm" w="full">
             {!simulationQuery.isError && (
@@ -225,6 +246,7 @@ function AddLiquidityMainForm() {
                     totalUSDValue={totalUSDValue}
                   />
                 }
+                avoidPriceImpactAlert={isUnbalancedError && !nestedAddLiquidityEnabled}
                 cannotCalculatePriceImpact={cannotCalculatePriceImpactError(priceImpactQuery.error)}
                 isDisabled={!priceImpactQuery.data}
                 setNeedsToAcceptPIRisk={setNeedsToAcceptHighPI}
@@ -263,11 +285,10 @@ function AddLiquidityMainForm() {
             <GenericError
               customErrorName="Error in query simulation"
               error={simulationQuery.error}
+              skipError={isUnbalancedError}
             />
           )}
-          {(simulationQuery.isError || priceImpactQuery.isError) && (
-            <UnbalancedAddError error={simulationQuery.error || priceImpactQuery.error} />
-          )}
+
           {isConnected ? (
             <Tooltip label={isDisabled ? disabledReason : ''}>
               <Button
diff --git a/packages/lib/modules/pool/actions/add-liquidity/form/AddLiquidityFormTabs.tsx b/packages/lib/modules/pool/actions/add-liquidity/form/AddLiquidityFormTabs.tsx
new file mode 100644
index 000000000..d1ce0c983
--- /dev/null
+++ b/packages/lib/modules/pool/actions/add-liquidity/form/AddLiquidityFormTabs.tsx
@@ -0,0 +1,105 @@
+import { UseDisclosureReturn, VStack } from '@chakra-ui/react'
+import ButtonGroup, {
+  ButtonGroupOption,
+} from '@repo/lib/shared/components/btns/button-group/ButtonGroup'
+import { bn } from '@repo/lib/shared/utils/numbers'
+import { useEffect } from 'react'
+import { usePool } from '../../../PoolProvider'
+import {
+  requiresProportionalInput,
+  supportsProportionalAddLiquidityKind,
+} from '../../LiquidityActionHelpers'
+import { useAddLiquidity } from '../AddLiquidityProvider'
+import { TokenInputsMaybeProportional } from './TokenInputsMaybeProportional'
+const MIN_LIQUIDITY_FOR_BALANCED_ADD = 50000
+
+export function AddLiquidityFormTabs({
+  tokenSelectDisclosure,
+  totalUSDValue,
+  nestedAddLiquidityEnabled,
+  tabIndex,
+  setUnbalancedTab,
+  setProportionalTab,
+}: {
+  tokenSelectDisclosure: UseDisclosureReturn
+  totalUSDValue: string
+  nestedAddLiquidityEnabled: boolean
+  tabIndex: number
+  setUnbalancedTab: () => void
+  setProportionalTab: () => void
+}) {
+  const { clearAmountsIn } = useAddLiquidity()
+  const { isLoading, pool } = usePool()
+
+  const isDisabledProportionalTab =
+    nestedAddLiquidityEnabled || !supportsProportionalAddLiquidityKind(pool)
+  /* TODO: test nested unbalanced + proportional calculations
+  it does not work now due to "'Reference amount must be relative to a token in the pool or its BPT',"
+  cause tokensWithBpt does not contain leaf tokens inside BPT:
+  http://localhost:3000/pools/sepolia/v3/0xc9233cc69435591b193b50f702ac31e404a08b10
+  */
+  // const isDisabledProportionalTab = !supportsProportionalAddLiquidityKind(pool)
+
+  const isBelowMinTvlThreshold =
+    !isDisabledProportionalTab &&
+    bn(pool.dynamicData.totalLiquidity).lt(bn(MIN_LIQUIDITY_FOR_BALANCED_ADD))
+
+  const isDisabledUnbalancedTab = requiresProportionalInput(pool) || isBelowMinTvlThreshold
+
+  const unbalancedTabTooltipLabel = requiresProportionalInput(pool)
+    ? 'This pool requires liquidity to be added proportionally'
+    : isBelowMinTvlThreshold
+      ? `Liquidity must be added proportionally until the pool TVL is greater than $${MIN_LIQUIDITY_FOR_BALANCED_ADD}`
+      : undefined
+
+  function handleTabChanged(option: ButtonGroupOption): void {
+    clearAmountsIn()
+    option.value === '0' ? setUnbalancedTab() : setProportionalTab()
+  }
+
+  const options: ButtonGroupOption[] = [
+    {
+      value: '0',
+      label: 'Flexible',
+      disabled: isDisabledUnbalancedTab,
+      tooltipLabel: unbalancedTabTooltipLabel,
+    },
+    {
+      value: '1',
+      label: 'Proportional',
+      disabled: isDisabledProportionalTab,
+      tooltipLabel: isDisabledProportionalTab
+        ? 'This pool does not support liquidity to be added proportionally'
+        : undefined,
+    },
+  ]
+
+  useEffect(() => {
+    if (!isLoading && isDisabledUnbalancedTab) {
+      setProportionalTab()
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [isDisabledUnbalancedTab, isLoading])
+
+  const isProportional = tabIndex === 1
+
+  return (
+    <VStack>
+      <ButtonGroup
+        currentOption={options[tabIndex]}
+        groupId="my-liquidity"
+        hasLargeTextLabel
+        isFullWidth
+        onChange={handleTabChanged}
+        options={options}
+        size="md"
+        width="50%"
+      />
+      <TokenInputsMaybeProportional
+        isProportional={isProportional}
+        tokenSelectDisclosureOpen={() => tokenSelectDisclosure.onOpen()}
+        totalUSDValue={totalUSDValue}
+      />
+    </VStack>
+  )
+}
diff --git a/packages/lib/modules/pool/actions/add-liquidity/form/TokenInputsMaybeProportional.tsx b/packages/lib/modules/pool/actions/add-liquidity/form/TokenInputsMaybeProportional.tsx
new file mode 100644
index 000000000..1f58b4ba7
--- /dev/null
+++ b/packages/lib/modules/pool/actions/add-liquidity/form/TokenInputsMaybeProportional.tsx
@@ -0,0 +1,29 @@
+/* eslint-disable max-len */
+import { VStack } from '@chakra-ui/react'
+import { useAddLiquidity } from '../AddLiquidityProvider'
+import { TokenInputs } from './TokenInputs'
+import { useProportionalInputs } from './useProportionalInputs'
+
+type Props = {
+  tokenSelectDisclosureOpen: () => void
+  isProportional: boolean
+  totalUSDValue: string
+}
+
+export function TokenInputsMaybeProportional({ tokenSelectDisclosureOpen, isProportional }: Props) {
+  const { setHumanAmountIn } = useAddLiquidity()
+
+  const { handleProportionalHumanInputChange } = useProportionalInputs()
+
+  const setAmountIn = isProportional ? handleProportionalHumanInputChange : setHumanAmountIn
+
+  return (
+    <VStack spacing="md" w="full">
+      {/* TODO: show missing alerts here? */}
+      <TokenInputs
+        customSetAmountIn={setAmountIn}
+        tokenSelectDisclosureOpen={tokenSelectDisclosureOpen}
+      />
+    </VStack>
+  )
+}
diff --git a/packages/lib/modules/pool/actions/add-liquidity/form/TokenInputsWithAddable.tsx b/packages/lib/modules/pool/actions/add-liquidity/form/TokenInputsWithAddable.tsx
deleted file mode 100644
index 04f06055d..000000000
--- a/packages/lib/modules/pool/actions/add-liquidity/form/TokenInputsWithAddable.tsx
+++ /dev/null
@@ -1,164 +0,0 @@
-/* eslint-disable max-len */
-import { useUserAccount } from '@repo/lib/modules/web3/UserAccountProvider'
-import { WalletIcon } from '@repo/lib/shared/components/icons/WalletIcon'
-import { useCurrency } from '@repo/lib/shared/hooks/useCurrency'
-import { Card, HStack, Spacer, VStack, Text, Box, Tooltip } from '@chakra-ui/react'
-import { useEffect } from 'react'
-import { XOctagon } from 'react-feather'
-import { useAddLiquidity } from '../AddLiquidityProvider'
-import { TokenInputs } from './TokenInputs'
-import { useProportionalInputs } from './useProportionalInputs'
-import { useMaximumInputs } from './useMaximumInputs'
-import { BalAlert } from '@repo/lib/shared/components/alerts/BalAlert'
-import { hasNoLiquidity } from '../../LiquidityActionHelpers'
-import { usePool } from '../../../PoolProvider'
-
-type Props = {
-  tokenSelectDisclosureOpen: () => void
-  requiresProportionalInput: boolean
-  totalUSDValue: string
-}
-
-export function TokenInputsWithAddable({
-  tokenSelectDisclosureOpen,
-  requiresProportionalInput,
-  totalUSDValue,
-}: Props) {
-  const { isConnected } = useUserAccount()
-  const { toCurrency } = useCurrency()
-  const { setHumanAmountIn, wantsProportional, setWantsProportional } = useAddLiquidity()
-
-  const {
-    handleProportionalHumanInputChange,
-    handleMaximizeUserAmounts: handleMaximizeUserAmountsForProportionalInput,
-    isMaximized: isMaximizedForProportionalInput,
-    maximizedUsdValue: maximizedUsdValueForProportionalInput,
-    canMaximize: canMaximizeForProportionalInput,
-    setIsMaximized: setIsMaximizedForProportionalInput,
-    clearAmountsIn,
-  } = useProportionalInputs()
-  const { pool } = usePool()
-
-  const {
-    canMaximize: canMaximizeForMaximumInput,
-    isMaximized: isMaximizedForMaximumInput,
-    maximizedUsdValue: maximizedUsdValueForMaximumInput,
-    handleMaximizeUserAmounts: handleMaximizeUserAmountsForMaximumInput,
-    setIsMaximized: setIsMaximizedForMaximumInput,
-  } = useMaximumInputs()
-
-  const isProportional = requiresProportionalInput || wantsProportional
-
-  const handleMaximizeUserAmounts = isProportional
-    ? handleMaximizeUserAmountsForProportionalInput
-    : handleMaximizeUserAmountsForMaximumInput
-
-  const isMaximized = isProportional ? isMaximizedForProportionalInput : isMaximizedForMaximumInput
-
-  const maximizedUsdValue = isProportional
-    ? maximizedUsdValueForProportionalInput
-    : maximizedUsdValueForMaximumInput
-
-  const canMaximize = isProportional ? canMaximizeForProportionalInput : canMaximizeForMaximumInput
-
-  const setIsMaximized = isProportional
-    ? setIsMaximizedForProportionalInput
-    : setIsMaximizedForMaximumInput
-
-  const setAmountIn = isProportional ? handleProportionalHumanInputChange : setHumanAmountIn
-
-  useEffect(() => {
-    if (totalUSDValue !== maximizedUsdValue) {
-      setIsMaximized(false)
-    } else {
-      setIsMaximized(true)
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [totalUSDValue, wantsProportional])
-
-  function handleWantsProportional() {
-    setWantsProportional(!wantsProportional)
-    clearAmountsIn()
-  }
-
-  return (
-    <VStack spacing="md" w="full">
-      {requiresProportionalInput && !hasNoLiquidity(pool) && (
-        <BalAlert content="This pool requires liquidity to be added proportionally" status="info" />
-      )}
-      {isConnected && (
-        <Card p={['sm', 'ms']} variant="subSection" w="full">
-          <HStack w="full">
-            <Box as="span" color="grayText">
-              <WalletIcon size={18} />
-            </Box>
-            <HStack spacing="xs">
-              {!requiresProportionalInput && canMaximizeForProportionalInput ? (
-                <Text color="grayText" fontSize="sm">
-                  <Box
-                    as="span"
-                    color="font.highlight"
-                    cursor="pointer"
-                    onClick={handleWantsProportional}
-                  >
-                    {`${wantsProportional ? 'Proportional ' : 'Total '}`}
-                  </Box>
-                  addable pool tokens
-                </Text>
-              ) : (
-                <Text color="grayText" fontSize="sm">
-                  Addable pool tokens
-                </Text>
-              )}
-            </HStack>
-            <Spacer />
-            {canMaximize && (
-              <>
-                <Text color="grayText" fontSize="sm">
-                  {toCurrency(maximizedUsdValue, { abbreviated: false })}
-                </Text>
-                {isMaximized && (
-                  <Text color="grayText" cursor="not-allowed" fontSize="sm" opacity="0.5">
-                    Maxed
-                  </Text>
-                )}
-                {!isMaximized && (
-                  <Text
-                    color="font.highlight"
-                    cursor="pointer"
-                    fontSize="sm"
-                    onClick={() => handleMaximizeUserAmounts()}
-                  >
-                    Max
-                  </Text>
-                )}
-              </>
-            )}
-            {!canMaximize && (
-              <Tooltip
-                label={
-                  requiresProportionalInput
-                    ? 'For pools that require proportional liquidity, you need a balance above zero for every token in order to add any liquidity.'
-                    : 'You have no eligible tokens that can be added to this pool. Go swap to get at least one pool token. '
-                }
-              >
-                <HStack>
-                  <Text color="red.400" fontSize="sm">
-                    {toCurrency('0', { abbreviated: false })}
-                  </Text>
-                  <Box color="red.400">
-                    <XOctagon size={14} />
-                  </Box>
-                </HStack>
-              </Tooltip>
-            )}
-          </HStack>
-        </Card>
-      )}
-      <TokenInputs
-        customSetAmountIn={setAmountIn}
-        tokenSelectDisclosureOpen={tokenSelectDisclosureOpen}
-      />
-    </VStack>
-  )
-}
diff --git a/packages/lib/modules/pool/actions/add-liquidity/form/useProportionalInputs.tsx b/packages/lib/modules/pool/actions/add-liquidity/form/useProportionalInputs.tsx
index 387b7be27..9cd461945 100644
--- a/packages/lib/modules/pool/actions/add-liquidity/form/useProportionalInputs.tsx
+++ b/packages/lib/modules/pool/actions/add-liquidity/form/useProportionalInputs.tsx
@@ -1,87 +1,29 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 'use client'
 
+import { Address, HumanAmount, InputAmount, calculateProportionalAmounts } from '@balancer/sdk'
+import { swapWrappedWithNative } from '@repo/lib/modules/tokens/token.helpers'
+import { HumanTokenAmountWithAddress } from '@repo/lib/modules/tokens/token.types'
 import { useTokenBalances } from '@repo/lib/modules/tokens/TokenBalancesProvider'
-import { useTokens } from '@repo/lib/modules/tokens/TokensProvider'
 import { useUserAccount } from '@repo/lib/modules/web3/UserAccountProvider'
 import { isSameAddress } from '@repo/lib/shared/utils/addresses'
-import { bn } from '@repo/lib/shared/utils/numbers'
-import { Address, HumanAmount, InputAmount, calculateProportionalAmounts } from '@balancer/sdk'
-import { useMemo, useState } from 'react'
 import { formatUnits } from 'viem'
 import { usePool } from '../../../PoolProvider'
-import {
-  LiquidityActionHelpers,
-  hasNoLiquidity,
-  isEmptyHumanAmount,
-} from '../../LiquidityActionHelpers'
+import { LiquidityActionHelpers, isEmptyHumanAmount } from '../../LiquidityActionHelpers'
 import { useAddLiquidity } from '../AddLiquidityProvider'
-import { useTotalUsdValue } from '@repo/lib/modules/tokens/useTotalUsdValue'
-import { HumanTokenAmountWithAddress, TokenAmount } from '@repo/lib/modules/tokens/token.types'
-import { swapWrappedWithNative } from '@repo/lib/modules/tokens/token.helpers'
-
-type OptimalToken = {
-  tokenAddress: Address
-  userBalance: HumanAmount
-}
 
 export function useProportionalInputs() {
   const { isConnected } = useUserAccount()
-  const {
-    validTokens,
-    helpers,
-    humanAmountsIn,
-    setHumanAmountsIn,
-    wethIsEth,
-    nativeAsset,
-    wNativeAsset,
-  } = useAddLiquidity()
-  const { usdValueFor } = useTotalUsdValue(validTokens)
-  const { balanceFor, balances, isBalancesLoading } = useTokenBalances()
-  const { isLoading: isPoolLoading, pool } = usePool()
-  const [isMaximized, setIsMaximized] = useState(false)
-  const { isLoadingTokenPrices } = useTokens()
-
-  // Depending on if the user is using WETH or ETH, we need to filter out the
-  // native asset or wrapped native asset.
-  const nativeAssetFilter = (balance: TokenAmount) =>
-    wethIsEth
-      ? wNativeAsset && balance.address !== wNativeAsset.address
-      : nativeAsset && balance.address !== nativeAsset.address
-
-  const filteredBalances = useMemo(() => {
-    return balances.filter(nativeAssetFilter)
-  }, [wethIsEth, isBalancesLoading, balances])
-
-  function clearAmountsIn(changedAmount?: HumanTokenAmountWithAddress) {
-    setHumanAmountsIn(
-      humanAmountsIn.map(({ tokenAddress }) => {
-        // Keeps user inputs like '0' or '0.' instead of replacing them with ''
-        if (changedAmount && isSameAddress(changedAmount.tokenAddress, tokenAddress)) {
-          return changedAmount
-        }
-
-        return { tokenAddress, humanAmount: '' }
-      })
-    )
-  }
-
-  function handleMaximizeUserAmounts() {
-    if (!optimalToken) return
-    if (isMaximized) return setIsMaximized(false)
-    handleProportionalHumanInputChange(optimalToken.tokenAddress, optimalToken.userBalance)
-    setIsMaximized(true)
-  }
+  const { helpers, setHumanAmountsIn, clearAmountsIn, wethIsEth, setReferenceAmountAddress } =
+    useAddLiquidity()
+  const { balances, isBalancesLoading } = useTokenBalances()
+  const { isLoading: isPoolLoading } = usePool()
 
   function handleProportionalHumanInputChange(tokenAddress: Address, humanAmount: HumanAmount) {
-    // Checks if the user is entering the max amount for the tokenWithMinValue
-    const isMaximizing: boolean =
-      tokenAddress === optimalToken?.tokenAddress && humanAmount === optimalToken?.userBalance
-
-    setIsMaximized(isMaximizing)
-
     if (isEmptyHumanAmount(humanAmount)) return clearAmountsIn({ tokenAddress, humanAmount })
 
+    setReferenceAmountAddress(tokenAddress)
+
     const proportionalHumanAmountsIn = _calculateProportionalHumanAmountsIn({
       tokenAddress,
       humanAmount,
@@ -92,71 +34,18 @@ export function useProportionalInputs() {
     setHumanAmountsIn(proportionalHumanAmountsIn)
   }
 
-  const shouldCalculateMaximizeAmounts =
-    isConnected && !isBalancesLoading && !isPoolLoading && balances.length > 0
-
   /*
-    Finds the optimal token.
-    A token is optimal when using its maximum user balance produces a valid proportional amounts result
-    (where the rest of the tokens have enough user balance for that proportional result).
+    TODO: show warning/tooltip/alert when one of the tokens have zero balance
+    (same for unbalanced tab when all tokens have zero balance)
+    Old implementation:
+    https://github.com/balancer/frontend-monorepo/blob/f68ad17b46f559e2e5556d972a193b3fa6e3706b/packages/lib/modules/pool/actions/add-liquidity/form/TokenInputsWithAddable.tsx#L122
   */
-  const optimalToken = useMemo((): OptimalToken | undefined => {
-    if (isLoadingTokenPrices || !shouldCalculateMaximizeAmounts || hasNoLiquidity(pool)) return
-
-    const humanBalanceFor = (tokenAddress: string): HumanAmount => {
-      return (balanceFor(tokenAddress)?.formatted || '0') as HumanAmount
-    }
-
-    const optimalToken = filteredBalances.find(({ address }) => {
-      const humanBalance = humanBalanceFor(address)
-      if (isEmptyHumanAmount(humanBalance)) return false
-
-      const proportionalAmounts = _calculateProportionalHumanAmountsIn({
-        tokenAddress: address as Address,
-        humanAmount: humanBalance,
-        helpers,
-        wethIsEth,
-      })
-
-      // The user must have enough token balance for this proportional result
-      const haveEnoughBalance = proportionalAmounts.every(({ tokenAddress, humanAmount }) => {
-        return bn(humanBalanceFor(tokenAddress)).gte(bn(humanAmount))
-      })
-
-      return haveEnoughBalance
-    })
-
-    if (!optimalToken) return
-
-    return {
-      tokenAddress: optimalToken.address,
-      userBalance: humanBalanceFor(optimalToken.address),
-    } as OptimalToken
-  }, [shouldCalculateMaximizeAmounts, filteredBalances])
-
-  const maximizedUsdValue = useMemo(() => {
-    if (!shouldCalculateMaximizeAmounts || !optimalToken) return ''
-
-    const maxProportionalHumanAmountsIn = _calculateProportionalHumanAmountsIn({
-      tokenAddress: optimalToken.tokenAddress as Address,
-      humanAmount: optimalToken.userBalance,
-      helpers,
-      wethIsEth,
-    })
-
-    return usdValueFor(maxProportionalHumanAmountsIn)
-  }, [shouldCalculateMaximizeAmounts, optimalToken, isLoadingTokenPrices])
-
-  const canMaximize = !!optimalToken?.userBalance
+  const hasBalanceForAllTokens =
+    isConnected && !isBalancesLoading && !isPoolLoading && balances.length > 0
 
   return {
-    canMaximize,
-    isMaximized,
-    maximizedUsdValue,
+    hasBalanceForAllTokens,
     handleProportionalHumanInputChange,
-    handleMaximizeUserAmounts,
-    setIsMaximized,
-    clearAmountsIn,
   }
 }
 
@@ -172,8 +61,17 @@ export function _calculateProportionalHumanAmountsIn({
   helpers,
   wethIsEth,
 }: Params): HumanTokenAmountWithAddress[] {
-  const amountIn: InputAmount = helpers.toSdkInputAmounts([{ tokenAddress, humanAmount }])[0]
-  const proportionalAmounts = calculateProportionalAmounts(helpers.poolStateWithBalances, amountIn)
+  const referenceAmount: InputAmount = helpers.toSdkInputAmounts([{ tokenAddress, humanAmount }])[0]
+
+  // getBptAmountFromReferenceAmount(
+  //   constructProportionalSdkAddInput(helpers.chainId, referenceAmount, userAddress as Address),
+  //   helpers.poolStateWithBalances
+  // ).then(result => console.log({ result }))
+
+  const proportionalAmounts = calculateProportionalAmounts(
+    helpers.poolStateWithBalances,
+    referenceAmount
+  )
     .tokenAmounts.map(({ address, rawAmount, decimals }) => {
       // Use the humanAmount entered by the user to avoid displaying rounding updates from calculateProportionalAmounts
       if (address === tokenAddress) return { tokenAddress, humanAmount }
diff --git a/packages/lib/modules/pool/actions/add-liquidity/handlers/AddLiquidity.handler.ts b/packages/lib/modules/pool/actions/add-liquidity/handlers/AddLiquidity.handler.ts
index 611a51ce2..783967b4e 100644
--- a/packages/lib/modules/pool/actions/add-liquidity/handlers/AddLiquidity.handler.ts
+++ b/packages/lib/modules/pool/actions/add-liquidity/handlers/AddLiquidity.handler.ts
@@ -21,7 +21,8 @@ export interface AddLiquidityHandler {
   // Also returns bptOut to be used by the UI
   simulate(
     humanAmountsIn: HumanTokenAmountWithAddress[],
-    sender: Address
+    sender: Address,
+    referenceAmountAddress?: Address // only used by Proportional handlers that require a referenceAmount
   ): Promise<QueryAddLiquidityOutput>
 
   // Calculate the price impact of adding liquidity
diff --git a/packages/lib/modules/pool/actions/add-liquidity/handlers/BaseProportionalAddLiquidity.handler.ts b/packages/lib/modules/pool/actions/add-liquidity/handlers/BaseProportionalAddLiquidity.handler.ts
index 571c5ad5e..8a9376a3c 100644
--- a/packages/lib/modules/pool/actions/add-liquidity/handlers/BaseProportionalAddLiquidity.handler.ts
+++ b/packages/lib/modules/pool/actions/add-liquidity/handlers/BaseProportionalAddLiquidity.handler.ts
@@ -33,6 +33,7 @@ export abstract class BaseProportionalAddLiquidityHandler implements AddLiquidit
     humanAmountsIn: HumanTokenAmountWithAddress[],
     userAddress: Address
   ): Promise<SdkQueryAddLiquidityOutput> {
+    //TODO: instead of getting the zero index we should get the one that the user introduced
     const referenceAmount = this.helpers.toSdkInputAmounts(humanAmountsIn)[0]
 
     const addLiquidity = new AddLiquidity()
diff --git a/packages/lib/modules/pool/actions/add-liquidity/handlers/NestedAddLiquidityV3.handler.ts b/packages/lib/modules/pool/actions/add-liquidity/handlers/NestedAddLiquidityV3.handler.ts
index 4c14e3076..d83da2ce1 100644
--- a/packages/lib/modules/pool/actions/add-liquidity/handlers/NestedAddLiquidityV3.handler.ts
+++ b/packages/lib/modules/pool/actions/add-liquidity/handlers/NestedAddLiquidityV3.handler.ts
@@ -31,6 +31,7 @@ export class NestedAddLiquidityV3Handler implements AddLiquidityHandler {
       return 0
     }
     const input = this.constructSdkInput(humanAmountsIn)
+
     const priceImpactABA = await PriceImpact.addLiquidityNested(
       input,
       this.helpers.nestedPoolStateV3
diff --git a/packages/lib/modules/pool/actions/add-liquidity/handlers/ProportionalBoostedAddLiquidityV3.handler.ts b/packages/lib/modules/pool/actions/add-liquidity/handlers/ProportionalBoostedAddLiquidityV3.handler.ts
new file mode 100644
index 000000000..578b106a5
--- /dev/null
+++ b/packages/lib/modules/pool/actions/add-liquidity/handlers/ProportionalBoostedAddLiquidityV3.handler.ts
@@ -0,0 +1,104 @@
+import {
+  AddLiquidityBoostedBuildCallInput,
+  AddLiquidityBoostedV3,
+  AddLiquidityKind,
+  AddLiquidityProportionalInput,
+  Address,
+  Hex,
+  InputAmount,
+  isSameAddress,
+} from '@balancer/sdk'
+import { HumanTokenAmountWithAddress } from '@repo/lib/modules/tokens/token.types'
+import { TransactionConfig } from '@repo/lib/modules/web3/contracts/contract.types'
+import { getRpcUrl } from '@repo/lib/modules/web3/transports'
+import { Pool } from '../../../PoolProvider'
+import { LiquidityActionHelpers } from '../../LiquidityActionHelpers'
+import { SdkBuildAddLiquidityInput, SdkQueryAddLiquidityOutput } from '../add-liquidity.types'
+import { constructBaseBuildCallInput } from './add-liquidity.utils'
+import { AddLiquidityHandler } from './AddLiquidity.handler'
+
+export class ProportionalBoostedAddLiquidityV3 implements AddLiquidityHandler {
+  protected helpers: LiquidityActionHelpers
+
+  constructor(pool: Pool) {
+    this.helpers = new LiquidityActionHelpers(pool)
+  }
+
+  public async getPriceImpact(): Promise<number> {
+    return 0 // Proportional joins don't have price impact
+  }
+
+  public async simulate(
+    humanAmountsIn: HumanTokenAmountWithAddress[],
+    userAddress: Address,
+    referenceAmountAddress?: Address
+  ): Promise<SdkQueryAddLiquidityOutput> {
+    // TODO: generalize to other handlers with referenceAmountAddress
+    const inputAmounts = this.helpers.toSdkInputAmounts(humanAmountsIn)
+    const foundReferenceAmount =
+      referenceAmountAddress &&
+      inputAmounts.find(item => isSameAddress(item.address, referenceAmountAddress))
+    const referenceAmount = foundReferenceAmount || inputAmounts[0]
+
+    console.log({ referenceAmount })
+
+    const addLiquidity = new AddLiquidityBoostedV3()
+
+    const addLiquidityInput = this.constructSdkInput(referenceAmount, userAddress)
+    const sdkQueryOutput = await addLiquidity.query(
+      addLiquidityInput,
+      this.helpers.boostedPoolState
+    )
+
+    return { bptOut: sdkQueryOutput.bptOut, to: sdkQueryOutput.to, sdkQueryOutput }
+  }
+
+  public async buildCallData({
+    account,
+    queryOutput,
+    humanAmountsIn,
+    slippagePercent,
+    permit2,
+  }: SdkBuildAddLiquidityInput): Promise<TransactionConfig> {
+    const addLiquidity = new AddLiquidityBoostedV3()
+
+    const buildCallParams: AddLiquidityBoostedBuildCallInput = {
+      ...constructBaseBuildCallInput({
+        humanAmountsIn,
+        sdkQueryOutput: queryOutput.sdkQueryOutput,
+        slippagePercent: slippagePercent,
+        pool: this.helpers.pool,
+      }),
+      protocolVersion: 3,
+      userData: '0x' as Hex,
+    }
+
+    const { callData, to, value } = permit2
+      ? addLiquidity.buildCallWithPermit2(buildCallParams, permit2)
+      : addLiquidity.buildCall(buildCallParams)
+
+    return {
+      account,
+      chainId: this.helpers.chainId,
+      data: callData,
+      to,
+      value,
+    }
+  }
+
+  /**
+   * PRIVATE METHODS
+   */
+  private constructSdkInput(
+    referenceAmount: InputAmount,
+    userAddress: Address
+  ): AddLiquidityProportionalInput {
+    return {
+      chainId: this.helpers.chainId,
+      rpcUrl: getRpcUrl(this.helpers.chainId),
+      referenceAmount,
+      kind: AddLiquidityKind.Proportional,
+      sender: userAddress,
+    }
+  }
+}
diff --git a/packages/lib/modules/pool/actions/add-liquidity/handlers/ProportionalBoostedUnbalancedAddLiquidityV3.handler.ts b/packages/lib/modules/pool/actions/add-liquidity/handlers/ProportionalBoostedUnbalancedAddLiquidityV3.handler.ts
deleted file mode 100644
index bb37196b4..000000000
--- a/packages/lib/modules/pool/actions/add-liquidity/handlers/ProportionalBoostedUnbalancedAddLiquidityV3.handler.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { AddLiquidityBoostedBuildCallInput, AddLiquidityBoostedV3, Hex } from '@balancer/sdk'
-import { TransactionConfig } from '@repo/lib/modules/web3/contracts/contract.types'
-import { SdkBuildAddLiquidityInput } from '../add-liquidity.types'
-import { BaseProportionalAddLiquidityHandler } from './BaseProportionalAddLiquidity.handler'
-import { constructBaseBuildCallInput } from './add-liquidity.utils'
-
-export class ProportionalBoostedUnbalancedAddLiquidityV3Handler extends BaseProportionalAddLiquidityHandler {
-  public async buildCallData({
-    humanAmountsIn,
-    slippagePercent,
-    queryOutput,
-    account,
-    permit2,
-  }: SdkBuildAddLiquidityInput): Promise<TransactionConfig> {
-    const addLiquidity = new AddLiquidityBoostedV3()
-
-    const buildCallParams: AddLiquidityBoostedBuildCallInput = {
-      ...constructBaseBuildCallInput({
-        humanAmountsIn,
-        sdkQueryOutput: queryOutput.sdkQueryOutput,
-        slippagePercent: slippagePercent,
-        pool: this.helpers.pool,
-      }),
-      protocolVersion: 3,
-      userData: '0x' as Hex,
-    }
-
-    const { callData, to, value } = permit2
-      ? addLiquidity.buildCallWithPermit2(buildCallParams, permit2)
-      : addLiquidity.buildCall(buildCallParams)
-
-    return {
-      account,
-      chainId: this.helpers.chainId,
-      data: callData,
-      to,
-      value,
-    }
-  }
-}
diff --git a/packages/lib/modules/pool/actions/add-liquidity/handlers/add-liquidity.utils.ts b/packages/lib/modules/pool/actions/add-liquidity/handlers/add-liquidity.utils.ts
index 400e7d970..b3ccf4b5b 100644
--- a/packages/lib/modules/pool/actions/add-liquidity/handlers/add-liquidity.utils.ts
+++ b/packages/lib/modules/pool/actions/add-liquidity/handlers/add-liquidity.utils.ts
@@ -3,6 +3,10 @@
 import {
   AddLiquidityBaseBuildCallInput,
   AddLiquidityBaseQueryOutput,
+  AddLiquidityKind,
+  AddLiquidityProportionalInput,
+  Address,
+  InputAmount,
   RemoveLiquidityBaseBuildCallInput,
   RemoveLiquidityQueryOutput,
   Slippage,
@@ -10,6 +14,7 @@ import {
 import { Pool } from '../../../PoolProvider'
 import { LiquidityActionHelpers } from '../../LiquidityActionHelpers'
 import { HumanTokenAmountWithAddress } from '@repo/lib/modules/tokens/token.types'
+import { getRpcUrl } from '@repo/lib/modules/web3/transports'
 
 // For now only valid for unbalanced and proportional adds
 export function constructBaseBuildCallInput({
@@ -36,6 +41,20 @@ export function constructBaseBuildCallInput({
   return baseBuildCallParams
 }
 
+export function constructProportionalSdkAddInput(
+  chainId: number,
+  referenceAmount: InputAmount,
+  userAddress: Address
+): AddLiquidityProportionalInput {
+  return {
+    chainId,
+    rpcUrl: getRpcUrl(chainId),
+    referenceAmount,
+    kind: AddLiquidityKind.Proportional,
+    sender: userAddress,
+  }
+}
+
 // For now only valid for unbalanced removes
 export function constructRemoveBaseBuildCallInput({
   slippagePercent,
diff --git a/packages/lib/modules/pool/actions/add-liquidity/handlers/selectAddLiquidityHandler.ts b/packages/lib/modules/pool/actions/add-liquidity/handlers/selectAddLiquidityHandler.ts
index 9c159763f..ac46c1080 100644
--- a/packages/lib/modules/pool/actions/add-liquidity/handlers/selectAddLiquidityHandler.ts
+++ b/packages/lib/modules/pool/actions/add-liquidity/handlers/selectAddLiquidityHandler.ts
@@ -5,18 +5,14 @@ import { TwammAddLiquidityHandler } from './TwammAddLiquidity.handler'
 import { UnbalancedAddLiquidityV2Handler } from './UnbalancedAddLiquidityV2.handler'
 import { AddLiquidityHandler } from './AddLiquidity.handler'
 import { NestedAddLiquidityV2Handler } from './NestedAddLiquidityV2.handler'
-import {
-  requiresProportionalInput,
-  supportsProportionalAddLiquidityKind,
-  supportsNestedActions,
-} from '../../LiquidityActionHelpers'
+import { requiresProportionalInput, supportsNestedActions } from '../../LiquidityActionHelpers'
 import { ProportionalAddLiquidityHandler } from './ProportionalAddLiquidity.handler'
 import { isBoosted, isV3Pool } from '../../../pool.helpers'
 import { ProportionalAddLiquidityHandlerV3 } from './ProportionalAddLiquidityV3.handler'
 import { UnbalancedAddLiquidityV3Handler } from './UnbalancedAddLiquidityV3.handler'
 import { BoostedUnbalancedAddLiquidityV3Handler } from './BoostedUnbalancedAddLiquidityV3.handler'
 import { NestedAddLiquidityV3Handler } from './NestedAddLiquidityV3.handler'
-import { ProportionalBoostedUnbalancedAddLiquidityV3Handler } from './ProportionalBoostedUnbalancedAddLiquidityV3.handler'
+import { ProportionalBoostedAddLiquidityV3 } from './ProportionalBoostedAddLiquidityV3.handler'
 
 export function selectAddLiquidityHandler(
   pool: Pool,
@@ -29,14 +25,18 @@ export function selectAddLiquidityHandler(
   // We should add a toggle to the form which allows the user to revert to
   // adding liquidity in the first level pool tokens.
   if (supportsNestedActions(pool)) {
+    // TODO: console.log(
+    //   'NestedAddLiquidityV3Handler should work with unbalanced + calculate proportional',
+    //   { wantsProportional }
+    // )
     return isV3Pool(pool)
       ? new NestedAddLiquidityV3Handler(pool)
       : new NestedAddLiquidityV2Handler(pool)
   }
 
   if (isBoosted(pool)) {
-    if (wantsProportional && supportsProportionalAddLiquidityKind(pool)) {
-      return new ProportionalBoostedUnbalancedAddLiquidityV3Handler(pool)
+    if (wantsProportional) {
+      return new ProportionalBoostedAddLiquidityV3(pool)
     }
     return new BoostedUnbalancedAddLiquidityV3Handler(pool)
   }
diff --git a/packages/lib/modules/pool/actions/add-liquidity/queries/useAddLiquidityPriceImpactQuery.ts b/packages/lib/modules/pool/actions/add-liquidity/queries/useAddLiquidityPriceImpactQuery.ts
index a42053a75..831e4f024 100644
--- a/packages/lib/modules/pool/actions/add-liquidity/queries/useAddLiquidityPriceImpactQuery.ts
+++ b/packages/lib/modules/pool/actions/add-liquidity/queries/useAddLiquidityPriceImpactQuery.ts
@@ -45,8 +45,10 @@ export function useAddLiquidityPriceImpactQuery({ handler, humanAmountsIn, enabl
     enabled: enabled && !areEmptyAmounts(debouncedHumanAmountsIn),
     retry(failureCount, error) {
       if (isInvariantRatioPIErrorMessage(error?.message)) {
+        if (failureCount === 1) console.log('Silenced PI error: ', { error })
         // Avoid more retries
-        return false
+        // return false
+        return failureCount < 3
       }
       // 3 retries by default
       return failureCount < 3
diff --git a/packages/lib/modules/pool/actions/add-liquidity/queries/useAddLiquiditySimulationQuery.ts b/packages/lib/modules/pool/actions/add-liquidity/queries/useAddLiquiditySimulationQuery.ts
index 76bec5fdd..5f5191fd7 100644
--- a/packages/lib/modules/pool/actions/add-liquidity/queries/useAddLiquiditySimulationQuery.ts
+++ b/packages/lib/modules/pool/actions/add-liquidity/queries/useAddLiquiditySimulationQuery.ts
@@ -13,6 +13,7 @@ import { sentryMetaForAddLiquidityHandler } from '@repo/lib/shared/utils/query-e
 import { HumanTokenAmountWithAddress } from '@repo/lib/modules/tokens/token.types'
 import { useBlockNumber } from 'wagmi'
 import { isInvariantRatioSimulationErrorMessage } from '@repo/lib/shared/utils/error-filters'
+import { Address } from 'viem'
 
 export type AddLiquiditySimulationQueryResult = ReturnType<typeof useAddLiquiditySimulationQuery>
 
@@ -20,9 +21,15 @@ type Params = {
   handler: AddLiquidityHandler
   humanAmountsIn: HumanTokenAmountWithAddress[]
   enabled: boolean
+  referenceAmountAddress?: Address // only used by Proportional handlers that require a referenceAmount
 }
 
-export function useAddLiquiditySimulationQuery({ handler, humanAmountsIn, enabled }: Params) {
+export function useAddLiquiditySimulationQuery({
+  handler,
+  humanAmountsIn,
+  enabled,
+  referenceAmountAddress,
+}: Params) {
   const { userAddress } = useUserAccount()
   const { pool, chainId } = usePool()
   const { data: blockNumber } = useBlockNumber({ chainId })
@@ -39,7 +46,8 @@ export function useAddLiquiditySimulationQuery({ handler, humanAmountsIn, enable
 
   const queryKey = addLiquidityKeys.preview(params)
 
-  const queryFn = async () => handler.simulate(debouncedHumanAmountsIn, userAddress)
+  const queryFn = async () =>
+    handler.simulate(debouncedHumanAmountsIn, userAddress, referenceAmountAddress)
 
   return useQuery({
     queryKey,
@@ -48,6 +56,7 @@ export function useAddLiquiditySimulationQuery({ handler, humanAmountsIn, enable
     gcTime: 0,
     retry(failureCount, error) {
       if (isInvariantRatioSimulationErrorMessage(error?.message)) {
+        if (failureCount === 1) console.log('Silenced simulation error: ', { error })
         // Avoid more retries
         return false
       }
diff --git a/packages/lib/modules/pool/pool.helpers.ts b/packages/lib/modules/pool/pool.helpers.ts
index e935da85d..8cfe55b6a 100644
--- a/packages/lib/modules/pool/pool.helpers.ts
+++ b/packages/lib/modules/pool/pool.helpers.ts
@@ -341,6 +341,10 @@ export function isV3WithNestedActionsPool(pool: Pool): boolean {
   return supportsNestedActions(pool) && isV3Pool(pool)
 }
 
+export function isV3NotSupportingWethIsEth(pool: Pool): boolean {
+  return (supportsNestedActions(pool) || isBoosted(pool)) && isV3Pool(pool)
+}
+
 export function requiresPermit2Approval(pool: Pool): boolean {
   return isV3Pool(pool)
 }
diff --git a/packages/lib/modules/price-impact/PriceImpactAccordion.tsx b/packages/lib/modules/price-impact/PriceImpactAccordion.tsx
index dacb03b2c..e5918fe61 100644
--- a/packages/lib/modules/price-impact/PriceImpactAccordion.tsx
+++ b/packages/lib/modules/price-impact/PriceImpactAccordion.tsx
@@ -30,6 +30,7 @@ interface PriceImpactAccordionProps {
   isDisabled?: boolean
   // Unknown price impact due to limitations in ABA priceImpact calculation
   cannotCalculatePriceImpact?: boolean
+  avoidPriceImpactAlert?: boolean
 }
 export function PriceImpactAccordion({
   setNeedsToAcceptPIRisk,
@@ -37,6 +38,7 @@ export function PriceImpactAccordion({
   accordionPanelComponent,
   isDisabled,
   cannotCalculatePriceImpact = false,
+  avoidPriceImpactAlert = false,
 }: PriceImpactAccordionProps) {
   const acceptHighImpactDisclosure = useDisclosure()
   const {
@@ -91,25 +93,27 @@ export function PriceImpactAccordion({
       {(priceImpactLevel === 'high' || priceImpactLevel === 'max' || isUnknownPriceImpact) && (
         <>
           <VStack align="start" mt="md" spacing="md" w="full">
-            <Alert status="error">
-              <PriceImpactIcon mt="1" priceImpactLevel={priceImpactLevel} size={24} />
-              <Box ml="md">
-                <AlertTitle>
-                  {isUnknownPriceImpact
-                    ? 'Unknown price impact'
-                    : `Price impact is high: Exceeds ${
-                        priceImpactLevel === 'high' ? '1' : '5'
-                      }.00%`}
-                </AlertTitle>
-                <AlertDescription>
-                  <Text color="font.dark" fontSize="sm">
+            {!avoidPriceImpactAlert && (
+              <Alert status="error">
+                <PriceImpactIcon mt="1" priceImpactLevel={priceImpactLevel} size={24} />
+                <Box ml="md">
+                  <AlertTitle>
                     {isUnknownPriceImpact
-                      ? 'The price impact cannot be calculated. Only proceed if you know exactly what you are doing.'
-                      : 'The higher the price impact, the worse exchange rate you get for this swap.'}
-                  </Text>
-                </AlertDescription>
-              </Box>
-            </Alert>
+                      ? 'Unknown price impact'
+                      : `Price impact is high: Exceeds ${
+                          priceImpactLevel === 'high' ? '1' : '5'
+                        }.00%`}
+                  </AlertTitle>
+                  <AlertDescription>
+                    <Text color="font.dark" fontSize="sm">
+                      {isUnknownPriceImpact
+                        ? 'The price impact cannot be calculated. Only proceed if you know exactly what you are doing.'
+                        : 'The higher the price impact, the worse exchange rate you get for this swap.'}
+                    </Text>
+                  </AlertDescription>
+                </Box>
+              </Alert>
+            )}
             <Card variant="subSection">
               <CardBody>
                 <Text fontWeight="bold" mb="sm">
diff --git a/packages/lib/modules/protocols/useProtocols.ts b/packages/lib/modules/protocols/useProtocols.ts
index 26af1ab49..86e46ca5e 100644
--- a/packages/lib/modules/protocols/useProtocols.ts
+++ b/packages/lib/modules/protocols/useProtocols.ts
@@ -50,5 +50,5 @@ export type boostedProtocols = Protocol.Aave
 
 export const protocolDescriptions: Record<boostedProtocols, string> = {
   [Protocol.Aave]:
-    "The magic of this Boosted pool lies in its composition—under the hood, it contains wrapped Aave tokens that earn interest from Aave borrowers, continuously growing the pool's worth.",
+    "This Boosted pool's underlying mechanics are powered by wrapped Aave tokens, which generate yield from lending activities on the Aave protocol, resulting in continuous appreciation of the pool's total value",
 }
diff --git a/packages/lib/modules/tokens/token.helpers.ts b/packages/lib/modules/tokens/token.helpers.ts
index bbe770a20..bd2c37da2 100644
--- a/packages/lib/modules/tokens/token.helpers.ts
+++ b/packages/lib/modules/tokens/token.helpers.ts
@@ -125,20 +125,27 @@ export function getLeafTokens(poolTokens: PoolToken[]) {
         t => !isSameAddress(t.address, poolToken.address)
       ) as PoolToken[]
 
-      const nestedLeafTokens = nestedTokens.map(t =>
-        t.isErc4626 && t.underlyingToken
-          ? { ...t.underlyingToken, address: t.underlyingToken.address as Address, index: t.index }
-          : { ...t, address: t.address as Address }
-      )
+      const nestedLeafTokens = nestedTokens.map(t => getTokenOrUnderlying(t))
       leafTokens.push(...nestedLeafTokens)
     } else {
-      leafTokens.push(poolToken as TokenCore)
+      // TODO: add unit test for this case: pol id 0x42de4fa875126fdbaf590b2fc3802adbca58acee
+      leafTokens.push(getTokenOrUnderlying(poolToken))
     }
   })
 
   return leafTokens
 }
 
+function getTokenOrUnderlying(token: PoolToken): TokenCore {
+  return token.isErc4626 && token.underlyingToken
+    ? {
+        ...token.underlyingToken,
+        address: token.underlyingToken.address as Address,
+        index: token.index,
+      }
+    : { ...token, address: token.address as Address }
+}
+
 export function getSpenderForAddLiquidity(pool: Pool): Address {
   if (isCowAmmPool(pool.type)) return pool.address as Address
   if (isV3Pool(pool)) {
diff --git a/packages/lib/package.json b/packages/lib/package.json
index bf936fa99..296fecaf8 100644
--- a/packages/lib/package.json
+++ b/packages/lib/package.json
@@ -17,7 +17,7 @@
   },
   "dependencies": {
     "@apollo/client": "^3.11.8",
-    "@balancer/sdk": "0.33.1",
+    "@balancer/sdk": "0.33.2",
     "@chakra-ui/anatomy": "^2.2.2",
     "@chakra-ui/clickable": "^2.1.0",
     "@chakra-ui/hooks": "^2.2.1",
diff --git a/packages/lib/shared/components/btns/button-group/ButtonGroup.tsx b/packages/lib/shared/components/btns/button-group/ButtonGroup.tsx
index a9c847b35..83ec3b85c 100644
--- a/packages/lib/shared/components/btns/button-group/ButtonGroup.tsx
+++ b/packages/lib/shared/components/btns/button-group/ButtonGroup.tsx
@@ -1,66 +1,115 @@
-import { Button, Box, ButtonProps, HStack } from '@chakra-ui/react'
-import React, { ReactNode } from 'react'
-import { motion, LayoutGroup } from 'framer-motion'
+import {
+  Box,
+  Button,
+  ButtonProps,
+  HStack,
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+  Text,
+} from '@chakra-ui/react'
+import { LayoutGroup, motion } from 'framer-motion'
+import { ReactNode } from 'react'
 
 export type ButtonGroupOption = {
   value: string
   label: string | ReactNode
   disabled?: boolean
+  tooltipLabel?: string
+  rightIcon?: ButtonProps['rightIcon']
 }
 
 type Props = {
   currentOption?: ButtonGroupOption
   options: Readonly<ButtonGroupOption[]>
   onChange: (option: ButtonGroupOption) => void
-  size?: ButtonProps['size']
-  width?: string
   groupId: string
+  size?: ButtonProps['size']
+  width?: ButtonProps['width']
+  isFullWidth?: boolean
+  hasLargeTextLabel?: boolean
 }
 
-export default function ButtonGroup({
-  currentOption,
-  options,
-  onChange,
-  size,
-  width,
-  groupId,
-}: Props) {
+export default function ButtonGroup(props: Props) {
+  const { groupId, options, currentOption, isFullWidth } = props
   return (
     <LayoutGroup id={groupId}>
-      <HStack background="level0" p="1" rounded="md" shadow="innerXl" spacing="1">
+      <HStack
+        background="level0"
+        p="1"
+        rounded="md"
+        shadow="innerXl"
+        spacing="1"
+        w={isFullWidth ? 'full' : undefined}
+      >
         {options.map(option => {
           const isActive = currentOption?.value === option.value
-          return (
-            <Button
-              bg="transparent"
-              id={`button-group-${option.value}`}
-              isDisabled={option.disabled}
-              key={`button-group-option-${option.value}`}
-              onClick={() => onChange(option)}
-              position="relative"
-              role="group"
-              size={size}
-              variant={isActive ? 'buttonGroupActive' : 'buttonGroupInactive'}
-              width={width}
-            >
-              {isActive && (
-                <Box
-                  as={motion.div}
-                  bg="background.button.secondary"
-                  borderRadius="4px"
-                  inset="0"
-                  layoutId={`active-${groupId}`}
-                  position="absolute"
-                  shadow="md"
-                />
+          return option?.tooltipLabel ? (
+            <Popover key={`button-group-option-${option.value}`} trigger="hover">
+              <PopoverTrigger>
+                <Box _hover={{ opacity: 0.75 }} transition="opacity 0.2s var(--ease-out-cubic)">
+                  <GroupOptionButton isActive={isActive} option={option} {...props} />
+                </Box>
+              </PopoverTrigger>
+              {option?.tooltipLabel && (
+                <PopoverContent maxW="300px" p="sm" w="auto">
+                  <Text fontSize="sm" variant="secondary">
+                    {option.tooltipLabel}
+                  </Text>
+                </PopoverContent>
               )}
-              <Box position="relative" zIndex="8">
-                {option.label}
-              </Box>
-            </Button>
+            </Popover>
+          ) : (
+            <GroupOptionButton
+              isActive={isActive}
+              key={`button-group-option-${option.value}`}
+              option={option}
+              {...props}
+            />
           )
         })}
       </HStack>
     </LayoutGroup>
   )
 }
+
+function GroupOptionButton({
+  option,
+  isActive,
+  size,
+  width,
+  groupId,
+  hasLargeTextLabel,
+  onChange,
+}: { option: ButtonGroupOption; isActive: boolean } & Props) {
+  return (
+    <Button
+      bg="transparent"
+      id={`button-group-${option.value}`}
+      isDisabled={option.disabled}
+      key={`button-group-option-${option.value}`}
+      onClick={() => onChange(option)}
+      position="relative"
+      rightIcon={option.rightIcon}
+      role="group"
+      size={size}
+      variant={isActive ? 'buttonGroupActive' : 'buttonGroupInactive'}
+      width={width}
+    >
+      {isActive && (
+        <Box
+          as={motion.div}
+          bg="background.button.secondary"
+          borderRadius="4px"
+          inset="0"
+          layoutId={`active-${groupId}`}
+          position="absolute"
+          shadow="md"
+        />
+      )}
+      <Box fontSize={hasLargeTextLabel ? 'lg' : undefined} position="relative" zIndex="8">
+        {option.label}
+      </Box>
+    </Button>
+  )
+}
diff --git a/packages/lib/shared/components/errors/GenericError.tsx b/packages/lib/shared/components/errors/GenericError.tsx
index 25e51691d..96517593c 100644
--- a/packages/lib/shared/components/errors/GenericError.tsx
+++ b/packages/lib/shared/components/errors/GenericError.tsx
@@ -6,7 +6,6 @@ import {
   isNotEnoughGasError,
   isPausedError,
   isTooManyRequestsError,
-  isUnbalancedAddError,
   isUserRejectedError,
   isViemHttpFetchError,
 } from '../../utils/error-filters'
@@ -17,15 +16,15 @@ type ErrorWithOptionalShortMessage = Error & { shortMessage?: string }
 type Props = AlertProps & {
   error: ErrorWithOptionalShortMessage
   customErrorName?: string
+  skipError?: boolean
 }
 
-export function GenericError({ error: _error, customErrorName, ...rest }: Props) {
+export function GenericError({ error: _error, customErrorName, skipError, ...rest }: Props) {
+  if (skipError) return
   const error = ensureError(_error)
   if (isUserRejectedError(error)) return null
   const errorName = customErrorName ? `${customErrorName} (${error.name})` : error.name
 
-  if (isUnbalancedAddError(_error)) return null //We handle this specific error in UnbalancedAddError component
-
   if (isViemHttpFetchError(_error)) {
     return (
       <ErrorAlert title={customErrorName} {...rest}>
diff --git a/packages/lib/shared/components/errors/UnbalancedAddError.tsx b/packages/lib/shared/components/errors/UnbalancedAddError.tsx
index 0e8ac364c..776e51c2e 100644
--- a/packages/lib/shared/components/errors/UnbalancedAddError.tsx
+++ b/packages/lib/shared/components/errors/UnbalancedAddError.tsx
@@ -1,30 +1,94 @@
 'use client'
 
 import { AlertProps, Text } from '@chakra-ui/react'
-import { isUnbalancedAddError } from '../../utils/error-filters'
+import {
+  isInvariantRatioAboveMaxSimulationErrorMessage,
+  isInvariantRatioAboveMinSimulationErrorMessage,
+  isInvariantRatioPIErrorMessage,
+  isUnbalancedAddError,
+  isUnbalancedAddErrorMessage,
+} from '../../utils/error-filters'
 import { BalAlertLink } from '../alerts/BalAlertLink'
 import { ErrorAlert } from './ErrorAlert'
+import { useAddLiquidity } from '@repo/lib/modules/pool/actions/add-liquidity/AddLiquidityProvider'
 
 type Props = AlertProps & {
   error?: Error | null
+  goToProportionalAdds: () => void
+  isProportionalSupported?: boolean
 }
 
-export function UnbalancedAddError({ error }: Props) {
-  function goToProportionalAdds() {
-    // TODO: implement when we have the add tabs (unbalanced and proportional).
-    console.log('Go to proportional adds')
+export function UnbalancedAddError({
+  error,
+  goToProportionalAdds,
+  isProportionalSupported = true,
+}: Props) {
+  const { clearAmountsIn } = useAddLiquidity()
+  const goToProportionalMode = () => {
+    clearAmountsIn()
+    goToProportionalAdds()
   }
 
-  if (isUnbalancedAddError(error)) {
-    return (
-      <ErrorAlert title="Unbalanced error">
-        <Text color="black" variant="secondary">
-          Your input(s) would excessively unbalance the pool.{' '}
-          <BalAlertLink onClick={goToProportionalAdds}>Please use proportional mode.</BalAlertLink>
-        </Text>
-      </ErrorAlert>
-    )
+  if (!isUnbalancedAddError(error)) return null
+
+  const errorLabels = getErrorLabels(isProportionalSupported, error)
+
+  if (!errorLabels) return null
+
+  return (
+    <ErrorAlert title={errorLabels.errorTitle}>
+      <Text color="black" variant="secondary">
+        {errorLabels.errorMessage}{' '}
+        {isProportionalSupported ? (
+          <BalAlertLink onClick={goToProportionalMode}>
+            {errorLabels.proportionalLabel}
+          </BalAlertLink>
+        ) : (
+          errorLabels.proportionalLabel
+        )}
+      </Text>
+    </ErrorAlert>
+  )
+}
+
+export type UnbalancedErrorLabels = {
+  errorTitle: string
+  errorMessage: string
+  proportionalLabel: string
+}
+
+export function getErrorLabels(
+  isProportionalSupported: boolean,
+  error?: Error | null
+): UnbalancedErrorLabels | undefined {
+  let errorTitle = 'Token amounts error'
+  let errorMessage = 'Unexpected error. Please ask for support'
+  let proportionalLabel = 'Please use proportional mode.'
+
+  if (!error) return
+
+  if (isInvariantRatioAboveMaxSimulationErrorMessage(error.message)) {
+    errorTitle = 'Amount exceeds pool limits'
+    errorMessage = 'Your input(s) would cause an invariant error in the vault.'
+  } else if (isInvariantRatioAboveMinSimulationErrorMessage(error.message)) {
+    errorTitle = 'Amount is below pool limits'
+  } else if (isInvariantRatioPIErrorMessage(error.message)) {
+    errorTitle = 'Unknown price impact'
+    errorMessage = isProportionalSupported
+      ? 'The price impact cannot be calculated. Proceed if you know exactly what you are doing or'
+      : 'The price impact cannot be calculated. Proceed if you know exactly what you are doing.'
+    proportionalLabel = 'try proportional mode.'
+  } else if (isUnbalancedAddErrorMessage(error)) {
+    errorMessage = 'Your input(s) would excessively unbalance the pool.'
   }
 
-  return null
+  if (!isProportionalSupported) {
+    proportionalLabel = 'Please try different amounts.'
+  }
+
+  return {
+    errorTitle,
+    errorMessage,
+    proportionalLabel,
+  }
 }
diff --git a/packages/lib/shared/components/errors/UnbalancedError.test.tsx b/packages/lib/shared/components/errors/UnbalancedError.test.tsx
new file mode 100644
index 000000000..fbd34005a
--- /dev/null
+++ b/packages/lib/shared/components/errors/UnbalancedError.test.tsx
@@ -0,0 +1,73 @@
+import { describe, it, expect } from 'vitest'
+import { getErrorLabels } from './UnbalancedAddError'
+
+describe('getErrorLabels', () => {
+  const invariantRatioAboveMaxError = new Error('InvariantRatioAboveMax')
+  const invariantRatioAboveMinError = new Error('InvariantRatioBelowMin')
+  const invariantRatioPIError = new Error(
+    'addLiquidityUnbalanced operation will fail at SC level with user defined input.'
+  )
+  const unbalancedAddErrorV2 = new Error('BAL#304')
+  const unbalancedAddErrorV3 = new Error('queryAddLiquidityUnbalanced')
+
+  it('should return default error labels when no error is provided', () => {
+    const result = getErrorLabels(true, null)
+    expect(result).toBeUndefined()
+  })
+
+  it('should return correct labels for isInvariantRatioAboveMaxSimulationErrorMessage', () => {
+    const result = getErrorLabels(true, invariantRatioAboveMaxError)
+    expect(result).toEqual({
+      errorTitle: 'Amount exceeds pool limits',
+      errorMessage: 'Your input(s) would cause an invariant error in the vault.',
+      proportionalLabel: 'Please use proportional mode.',
+    })
+  })
+
+  it('should return correct labels for isInvariantRatioAboveMinSimulationErrorMessage', () => {
+    const result = getErrorLabels(true, invariantRatioAboveMinError)
+    expect(result).toEqual({
+      errorTitle: 'Amount is below pool limits',
+      errorMessage: 'Unexpected error. Please ask for support',
+      proportionalLabel: 'Please use proportional mode.',
+    })
+  })
+
+  it('should return correct labels for isInvariantRatioPIErrorMessage when proportional is supported', () => {
+    const result = getErrorLabels(true, invariantRatioPIError)
+    expect(result).toEqual({
+      errorTitle: 'Unknown price impact',
+      errorMessage:
+        'The price impact cannot be calculated. Proceed if you know exactly what you are doing or',
+      proportionalLabel: 'try proportional mode.',
+    })
+  })
+
+  it('should return correct labels for isInvariantRatioPIErrorMessage when proportional is not supported', () => {
+    const result = getErrorLabels(false, invariantRatioPIError)
+    expect(result).toEqual({
+      errorTitle: 'Unknown price impact',
+      errorMessage:
+        'The price impact cannot be calculated. Proceed if you know exactly what you are doing.',
+      proportionalLabel: 'Please try different amounts.',
+    })
+  })
+
+  it('should return correct labels for isUnbalancedAddErrorMessage (v2)', () => {
+    const result = getErrorLabels(true, unbalancedAddErrorV2)
+    expect(result).toEqual({
+      errorTitle: 'Token amounts error',
+      errorMessage: 'Your input(s) would excessively unbalance the pool.',
+      proportionalLabel: 'Please use proportional mode.',
+    })
+  })
+
+  it('should return correct labels for isUnbalancedAddErrorMessage (v3)', () => {
+    const result = getErrorLabels(true, unbalancedAddErrorV3)
+    expect(result).toEqual({
+      errorTitle: 'Token amounts error',
+      errorMessage: 'Your input(s) would excessively unbalance the pool.',
+      proportionalLabel: 'Please use proportional mode.',
+    })
+  })
+})
diff --git a/packages/lib/shared/utils/error-filters.ts b/packages/lib/shared/utils/error-filters.ts
index 6db7f6bfd..acad457db 100644
--- a/packages/lib/shared/utils/error-filters.ts
+++ b/packages/lib/shared/utils/error-filters.ts
@@ -57,7 +57,7 @@ export function isUnbalancedAddError(error?: Error | null): boolean {
   return false
 }
 
-export function isUnbalancedAddErrorMessage(error: Error | null): boolean {
+export function isUnbalancedAddErrorMessage(error?: Error | null): boolean {
   const errorStrings = ['BAL#304', 'queryAddLiquidityUnbalanced'] // [v2 error, v3 error]
   const hasErrors = (errorString: string) => error?.message.includes(errorString)
 
@@ -66,16 +66,25 @@ export function isUnbalancedAddErrorMessage(error: Error | null): boolean {
 
 export function isInvariantRatioSimulationErrorMessage(errorMessage?: string): boolean {
   return (
-    !!errorMessage?.includes('InvariantRatioAboveMax') ||
-    !!errorMessage?.includes('InvariantRatioBelowMin')
+    isInvariantRatioAboveMaxSimulationErrorMessage(errorMessage) ||
+    isInvariantRatioAboveMinSimulationErrorMessage(errorMessage)
   )
 }
 
+export function isInvariantRatioAboveMaxSimulationErrorMessage(errorMessage?: string): boolean {
+  return !!errorMessage?.includes('InvariantRatioAboveMax')
+}
+export function isInvariantRatioAboveMinSimulationErrorMessage(errorMessage?: string): boolean {
+  return !!errorMessage?.includes('InvariantRatioBelowMin')
+}
+
 export function isInvariantRatioPIErrorMessage(errorMessage?: string): boolean {
+  if (!errorMessage) return false
   if (
-    errorMessage?.includes(
+    errorMessage.includes(
       'addLiquidityUnbalanced operation will fail at SC level with user defined input.'
-    )
+    ) ||
+    errorMessage.includes('Arithmetic operation resulted in underflow or overflow.')
   ) {
     return true
   }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4b2469eec..092c388b4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -326,8 +326,8 @@ importers:
         specifier: ^3.11.8
         version: 3.11.8(@types/react@18.2.34)(graphql-ws@5.16.0(graphql@16.9.0))(graphql@16.9.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@balancer/sdk':
-        specifier: 0.33.1
-        version: 0.33.1(bufferutil@4.0.8)(typescript@5.4.5)(utf-8-validate@5.0.10)(zod@3.23.8)
+        specifier: 0.33.2
+        version: 0.33.2(bufferutil@4.0.8)(typescript@5.4.5)(utf-8-validate@5.0.10)(zod@3.23.8)
       '@chakra-ui/anatomy':
         specifier: ^2.2.2
         version: 2.2.2
@@ -1709,8 +1709,8 @@ packages:
     resolution: {integrity: sha512-JWtuCu8VQsMladxVz/P4HzHUGCAwpuqacmowgXFs5XjxIgKuNjnLokQzuVjlTvIzODaDmpjT3oxcC48vyk9EWg==}
     engines: {node: '>=6.9.0'}
 
-  '@balancer/sdk@0.33.1':
-    resolution: {integrity: sha512-JwS6wva9g2Hf8RsV3MoJIwHcctFnS77MUlrp/pC/7GfUeKwu++veWGJbVxjO0xo0PYcALSnvHGqp3YmZlPtP3g==}
+  '@balancer/sdk@0.33.2':
+    resolution: {integrity: sha512-NaM/EFFPGYiTrLDK7WoKuEWb9ntfGTyTbfsZMyE63q4ui0C5gOGNVoPlZjsHJ9S719Dk13HRW4GwV/Vn17ysJQ==}
     engines: {node: '>=18.x'}
 
   '@bcoe/v8-coverage@0.2.3':
@@ -11719,7 +11719,7 @@ snapshots:
       '@babel/helper-validator-identifier': 7.25.7
       to-fast-properties: 2.0.0
 
-  '@balancer/sdk@0.33.1(bufferutil@4.0.8)(typescript@5.4.5)(utf-8-validate@5.0.10)(zod@3.23.8)':
+  '@balancer/sdk@0.33.2(bufferutil@4.0.8)(typescript@5.4.5)(utf-8-validate@5.0.10)(zod@3.23.8)':
     dependencies:
       decimal.js-light: 2.5.1
       lodash.clonedeep: 4.5.0