Merge branch 'main' into kyberai-searchissing-logo

KyberNetwork · Sep 26, 2023 · 2e81dbf · 2e81dbf
2 parents 5d510bb + 5bfbea5
commit 2e81dbf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/src/pages/Farm/ElasticFarmCombination.tsx b/src/pages/Farm/ElasticFarmCombination.tsx
@@ -102,11 +102,7 @@ export const ElasticFarmCombination: FC = () => {
 
       {type === FARM_TAB.ENDED && tab !== VERSION.CLASSIC && (
         <Text fontStyle="italic" fontSize={12} marginBottom="1rem" color={theme.subText}>
-          <Trans>
-            Your rewards may be automatically harvested a few days after the farm ends. Please check the{' '}
-            <StyledInternalLink to={`${APP_PATHS.FARMS}/${networkInfo.route}?type=vesting`}>Vesting</StyledInternalLink>{' '}
-            tab to see your rewards
-          </Trans>
+          <Trans>Your rewards may be automatically harvested a few days after the farm ends.</Trans>
         </Text>
       )}
 
@@ -117,11 +113,11 @@ export const ElasticFarmCombination: FC = () => {
             <Text as="span" color={theme.warning}>
               multiple phases
             </Text>
-            . Once the current phase ends, you can harvest your rewards from the farm in the{' '}
+            If you haven’t harvested your rewards for ended farms, you still can access them via the{' '}
             <StyledInternalLink to={`${APP_PATHS.FARMS}/${networkInfo.route}?type=${FARM_TAB.ENDED}`}>
               Ended
             </StyledInternalLink>{' '}
-            tab. To continue earning rewards in the new phase, you must restake your NFT position into the active farm
+            tab. To continue earning rewards in the new phase, you must retake your NFT position into the active farm
           </Trans>
         </Text>
       )}

diff --git a/src/pages/Farm/ElasticFarmv2/components/NewRangesNotiModal.tsx b/src/pages/Farm/ElasticFarmv2/components/NewRangesNotiModal.tsx
@@ -81,8 +81,8 @@ export default function NewRangesNotiModal({ updatedFarms }: { updatedFarms: Ela
           {hasIdleRange && hasNewRange ? (
             <Trans>
               One or more of the Elastic static farm ranges you were participating in have become idle and have new
-              farming ranges. You are still earning farming rewards from this idle farm range. However, to continue
-              earning more rewards, please stake your liquidity into the other ranges instead
+              farming ranges. You are still earning farming rewards from this idle farm range. However, to keep earning
+              fees, please stake your liquidity that is in-range position
             </Trans>
           ) : hasNewRange ? (
             <Trans>
@@ -92,8 +92,8 @@ export default function NewRangesNotiModal({ updatedFarms }: { updatedFarms: Ela
           ) : (
             <Trans>
               One or more of the Elastic static farm ranges you were participating in have become idle. You are still
-              earning farming rewards from this idle farm range. However, to continue earning more rewards, please stake
-              your liquidity into the other active ranges instead
+              earning farming rewards from this idle farm range. However, to keep earning fees, please stake your
+              liquidity that is in-range position{' '}
             </Trans>
           )}
         </Text>