Merge branch 'develop' into back-seed-regenerate

shapeshift · Feb 19, 2025 · 8acdb4a · 8acdb4a
2 parents 6f7be7c + 2ba7679
commit 8acdb4a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/.env.base b/.env.base
@@ -28,7 +28,7 @@ REACT_APP_FEATURE_THORCHAINSWAP_LONGTAIL=true
 REACT_APP_FEATURE_THORCHAINSWAP_L1_TO_LONGTAIL=true
 REACT_APP_FEATURE_SHAPESHIFT_MOBILE_WALLET=false
 REACT_APP_FEATURE_THORCHAIN_LP=true
-REACT_APP_FEATURE_THORCHAIN_LP_DEPOSIT=false
+REACT_APP_FEATURE_THORCHAIN_LP_DEPOSIT=true
 REACT_APP_FEATURE_THORCHAIN_LP_WITHDRAW=true
 REACT_APP_FEATURE_ACCOUNT_MANAGEMENT=true
 REACT_APP_FEATURE_ACCOUNT_MANAGEMENT_LEDGER=true

diff --git a/src/pages/ThorChainLP/Pool/Pool.tsx b/src/pages/ThorChainLP/Pool/Pool.tsx
@@ -102,6 +102,7 @@ export const Pool = () => {
   const translate = useTranslate()
   const history = useHistory()
   const isThorchainPoolsInstable = useFeatureFlag('ThorchainPoolsInstabilityWarning')
+  const isThorchainLpDepositEnabled = useFeatureFlag('ThorchainLpDeposit')
 
   const assetId = useMemo(() => {
     return poolAssetIdToAssetId(params.poolAssetId ?? '')
@@ -150,7 +151,7 @@ export const Pool = () => {
 
   return (
     <Main headerComponent={headerComponent} isSubPage>
-      {isThorchainPoolsInstable ? (
+      {isThorchainPoolsInstable && isThorchainLpDepositEnabled ? (
         <Alert status='warning' variant='subtle' mb={4}>
           <AlertIcon />
           <AlertDescription>{translate('pools.instabilityWarning')}</AlertDescription>

diff --git a/src/pages/ThorChainLP/components/AddLiquidity/AddLiquidityInput.tsx b/src/pages/ThorChainLP/components/AddLiquidity/AddLiquidityInput.tsx
@@ -1609,7 +1609,7 @@ export const AddLiquidityInput: React.FC<AddLiquidityInputProps> = ({
         {incompleteAlert}
         {maybeOpportunityNotSupportedExplainer}
         {maybeAlert}
-        {isThorchainPoolsInstable ? (
+        {isThorchainPoolsInstable && isThorchainLpDepositEnabled ? (
           <Alert status='warning' variant='subtle' mx={-2} width='auto'>
             <AlertIcon />
             <AlertDescription>{translate('pools.instabilityWarning')}</AlertDescription>

diff --git a/src/pages/ThorChainLP/components/PoolsHeader.tsx b/src/pages/ThorChainLP/components/PoolsHeader.tsx
@@ -28,6 +28,7 @@ export const PoolsHeader = () => {
   const translate = useTranslate()
   const history = useHistory()
   const isThorchainPoolsInstable = useFeatureFlag('ThorchainPoolsInstabilityWarning')
+  const isThorchainLpDepositEnabled = useFeatureFlag('ThorchainLpDeposit')
   const plusIcon = useMemo(() => <FaPlus />, [])
   const NavItems: TabItem[] = useMemo(() => {
     return [
@@ -96,7 +97,7 @@ export const PoolsHeader = () => {
           </Container>
         </Display.Desktop>
         <Container maxWidth='container.4xl'>
-          {isThorchainPoolsInstable ? (
+          {isThorchainPoolsInstable && isThorchainLpDepositEnabled ? (
             <Alert status='warning' variant='subtle'>
               <AlertIcon />
               <AlertDescription>{translate('pools.instabilityWarning')}</AlertDescription>