Add additional argument to add_liquidity_stableswap_omnipool_and_join_farms

apps/main/src/components/DynamicFee/ExpandableDynamicFee.tsx

@@ -24,6 +24,7 @@ import {
 export type FeeBreakdown = {
   symbol: string
   value: string
+  id: string
 }
 
 type ExpandableDynamicFeeProps = {
@@ -32,7 +33,7 @@ type ExpandableDynamicFeeProps = {
   readonly rangeLow: number
   readonly rangeHigh: number
   readonly tooltip?: string
-  readonly range: number[]
+  readonly range: readonly number[]
   readonly feesBreakdown: FeeBreakdown[]
   readonly label: string
   readonly description?: string

apps/main/src/i18n/locales/en/liquidity.json

@@ -132,6 +132,8 @@
   "liquidity.remove.modal.multiple.button": "Continue to summary",
   "liquidity.joinFarms.modal.submit.btn_one": "Join {{count, number}} Farm",
   "liquidity.joinFarms.modal.submit.btn_other": "Join {{count, number}} Farms",
+  "liquidity.remove.stablepool.modal.position.option.omnipool": "Remove to shares",
+  "liquidity.remove.stablepool.modal.position.option.stablepool": "Remove full",
   "liquidity.remove.stablepool.modal.proportionally": "Remove proportionally",
   "liquidity.remove.stablepool.modal.price": "1 {{poolSymbol}} = {{value, currency}}",
   "liquidity.remove.stablepool.modal.toast.submitted": "Withdrawing {{ value, number }} {{symbol}} from Stablepool...",

apps/main/src/modules/liquidity/components/AddLiquidity/AddLiquidity.tsx

@@ -67,7 +67,7 @@ export const AddLiquidity: FC<AddLiquidityProps> = ({
         onBack={onBack}
       />
       <form onSubmit={handleSubmit(onSubmit)} autoComplete="off">
-        <ModalBody>
+        <ModalBody sx={{ pb: 0 }}>
           <AssetSelectFormField<TAddLiquidityFormValues>
             label={t("liquidity.add.modal.selectAsset")}
             assetFieldName="asset"
@@ -111,10 +111,8 @@ export const AddLiquidity: FC<AddLiquidityProps> = ({
               sx={{ my: "xxl" }}
             />
           )}
-
-          <ModalContentDivider />
         </ModalBody>
-        <ModalFooter sx={{ pt: 0 }}>
+        <ModalFooter>
           <Button
             type="submit"
             size="large"

apps/main/src/modules/liquidity/components/AddStablepoolLiquidity/AddStablepoolLiquidity.tsx

@@ -274,7 +274,7 @@ export const AddStablepoolLiquidityForm = ({
         }
       />
 
-      <ModalBody sx={{ pt: 0 }}>
+      <ModalBody sx={{ py: 0 }}>
         <Controller
           control={form.control}
           name="split"
@@ -391,10 +391,8 @@ export const AddStablepoolLiquidityForm = ({
             sx={{ my: "xxl" }}
           />
         ) : null}
-
-        <ModalContentDivider />
       </ModalBody>
-      <ModalFooter sx={{ pt: 0 }}>
+      <ModalFooter>
         <Button
           type="submit"
           size="large"

apps/main/src/modules/liquidity/components/AddStablepoolLiquidity/AddStablepoolLiquidity.utils.ts

@@ -18,13 +18,15 @@ import { TAssetWithBalance } from "@/components/AssetSelectModal/AssetSelectModa
 import {
   useAddToOmnipoolZod,
   useCheckJoinOmnipoolFarm,
+  useLiquidityOmnipoolShares,
 } from "@/modules/liquidity/components/AddLiquidity/AddLiqudity.utils"
 import {
   calculatePoolFee,
   TReserve,
   TStablepoolDetails,
   useAddableStablepoolTokens,
 } from "@/modules/liquidity/Liquidity.utils"
+import { AnyTransaction } from "@/modules/transactions/types"
 import { useAssets } from "@/providers/assetsProvider"
 import { useRpcProvider } from "@/providers/rpcProvider"
 import { useAccountBalances } from "@/states/account"
@@ -94,6 +96,7 @@ export const useStablepoolAddLiquidity = ({
   const addebleReserves = useAddableStablepoolTokens(stableswapId, reserves)
   const { account } = useAccount()
   const meta = getAssetWithFallback(stableswapId)
+  const getOmnipoolShares = useLiquidityOmnipoolShares(stableswapId)
   const { data: omnipoolIds } = useOmnipoolIds()
 
   const isAddableToOmnipool = omnipoolIds?.includes(pool.id.toString())
@@ -198,25 +201,34 @@ export const useStablepoolAddLiquidity = ({
         }),
       )
 
-      const tx =
-        option === "stablepool"
-          ? papi.tx.Stableswap.add_assets_liquidity({
-              pool_id: pool.id,
-              assets: assetsToProvideFormatted,
-              min_shares: BigInt(minStablepoolShares),
-            })
-          : papi.tx.OmnipoolLiquidityMining.add_liquidity_stableswap_omnipool_and_join_farms(
-              {
-                stable_pool_id: pool.id,
-                stable_asset_amounts: assetsToProvideFormatted,
-                farm_entries: isJoinFarms
-                  ? activeFarms.map((farm) => [
-                      farm.globalFarmId,
-                      farm.yieldFarmId,
-                    ])
-                  : undefined,
-              },
-            )
+      let tx: AnyTransaction
+
+      if (option === "stablepool") {
+        tx = papi.tx.Stableswap.add_assets_liquidity({
+          pool_id: pool.id,
+          assets: assetsToProvideFormatted,
+          min_shares: BigInt(minStablepoolShares),
+        })
+      } else {
+        const liquidityShares = getOmnipoolShares(stablepoolSharesHuman)
+
+        if (!liquidityShares) throw new Error("Liquidity shares are not found")
+
+        tx =
+          papi.tx.OmnipoolLiquidityMining.add_liquidity_stableswap_omnipool_and_join_farms(
+            {
+              stable_pool_id: pool.id,
+              stable_asset_amounts: assetsToProvideFormatted,
+              farm_entries: isJoinFarms
+                ? activeFarms.map((farm) => [
+                    farm.globalFarmId,
+                    farm.yieldFarmId,
+                  ])
+                : undefined,
+              min_shares_limit: BigInt(liquidityShares.minSharesToGet),
+            },
+          )
+      }
 
       const toastValue = assetsToProvide
         .map(({ asset, amount }) =>

apps/main/src/modules/liquidity/components/AddStablepoolLiquidity/AddStablepoolLiquiditySkeleton.tsx

@@ -9,6 +9,7 @@ import { Flex } from "@galacticcouncil/ui/components/Flex"
 import {
   ModalBody,
   ModalContentDivider,
+  ModalFooter,
   ModalHeader,
 } from "@galacticcouncil/ui/components/Modal"
 import { useTranslation } from "react-i18next"
@@ -50,7 +51,7 @@ export const AddStablepoolLiquiditySkeleton = (
           </Flex>
         }
       />
-      <ModalBody sx={{ pt: 0 }}>
+      <ModalBody sx={{ py: 0 }}>
         <Flex align="center" justify="space-between" my="m">
           <Text fs="p3">
             {t("liquidity.add.stablepool.modal.proportionally")}
@@ -99,13 +100,12 @@ export const AddStablepoolLiquiditySkeleton = (
             },
           ]}
         />
-
-        <ModalContentDivider />
-
+      </ModalBody>
+      <ModalFooter>
         <Button type="submit" size="large" width="100%" mt="xxl" disabled>
           {t("liquidity.add.modal.submit")}
         </Button>
-      </ModalBody>
+      </ModalFooter>
     </>
   )
 }

apps/main/src/modules/liquidity/components/PositionsTable/OmnipoolPositions.tsx

@@ -75,6 +75,7 @@ export const OmnipoolPositions = ({
               }}
               search={{
                 selectable: true,
+                stableswapId: pool.stablepoolData?.id.toString(),
               }}
             >
               <Minus />

apps/main/src/modules/liquidity/components/PositionsTable/PositionsTable.columns.tsx

@@ -307,7 +307,9 @@ export const useOmnipoolPositionsTableColumns = () => {
                               id: original.poolId,
                             }}
                             search={{
-                              positionId: isOmnipool ? original.positionId : "",
+                              positionId: isOmnipool
+                                ? original.positionId
+                                : undefined,
                               stableswapId: original.stableswapId,
                             }}
                             sx={{ textDecoration: "none" }}

apps/main/src/modules/liquidity/components/RemoveLiquidity/ReceiveAssets.tsx

@@ -21,9 +21,11 @@ export type TReceiveAsset = {
 
 export const ReceiveAssets = ({
   assets,
+  title,
   positions,
 }: {
   assets: TReceiveAsset[]
+  title?: string
   positions?: Array<XykDeposit | OmnipoolDepositFull>
 }) => {
   const { t } = useTranslation(["common", "liquidity"])
@@ -33,7 +35,7 @@ export const ReceiveAssets = ({
   return (
     <>
       <Text color={getToken("text.tint.secondary")} font="primary" fw={700}>
-        {t("minimumReceived")}
+        {title ?? t("minimumReceived")}
       </Text>
       <Flex
         direction="column"
@@ -50,7 +52,7 @@ export const ReceiveAssets = ({
             {index < assets.length - 1 && <Separator />}
           </React.Fragment>
         ))}
-        {!!positions?.length && (
+        {!!positions?.length && formattedRewards !== "0" && (
           <>
             <Separator />
             <Flex align="center" justify="space-between">