Merge pull request #41186 from appsmithorg/release

Daily Promotion - 21/08

Author: btsgh

app/client/src/ce/components/DSDataFilter/index.tsx

@@ -74,6 +74,7 @@ export function DSDataFilter({
   const rampLinkSelector = getRampLink({
     section: RampSection.DSEditor,
     feature: RampFeature.MultipleEnv,
+    isBusinessFeature: false,
   });
   const rampLink = useSelector(rampLinkSelector);
 

app/client/src/ce/components/SwitchEnvironment/index.tsx

@@ -4,7 +4,7 @@ import styled from "styled-components";
 import { Icon, Link, Option, Select, Text, Tooltip } from "@appsmith/ads";
 import { capitalizeFirstLetter } from "utils/helpers";
 import {
-  BUSINESS_EDITION_TEXT,
+  ENTERPRISE_EDITION_TEXT,
   SWITCH_ENV_DISABLED_TOOLTIP_TEXT,
   createMessage,
 } from "ee/constants/messages";
@@ -68,7 +68,7 @@ export const DisabledTooltipContent = (rampLink: string) => {
     >
       {createMessage(SWITCH_ENV_DISABLED_TOOLTIP_TEXT)}
       <TooltipLink kind="primary" target="_blank" to={rampLink}>
-        {createMessage(BUSINESS_EDITION_TEXT)}
+        {createMessage(ENTERPRISE_EDITION_TEXT)}
       </TooltipLink>
     </Text>
   );
@@ -83,6 +83,7 @@ export default function SwitchEnvironment({}: Props) {
   const rampLinkSelector = getRampLink({
     section: RampSection.BottomBarEnvSwitcher,
     feature: RampFeature.MultipleEnv,
+    isBusinessFeature: false,
   });
   const rampLink = useSelector(rampLinkSelector);
 

app/client/src/ce/constants/messages.ts

@@ -206,6 +206,7 @@ export const USERS_HAVE_ACCESS_TO_ONLY_THIS_APP = () =>
   "Users will only have access to this application";
 export const NO_USERS_INVITED = () => "You haven't invited any users yet";
 export const BUSINESS_EDITION_TEXT = () => "business plan";
+export const ENTERPRISE_EDITION_TEXT = () => "enterprise plan";
 export const PARTNER_PROGRAM_CALLOUT = (
   email: string,
 ) => `${email} is outside your organisation. If you’re building this app

app/client/src/sagas/autoHeightSagas/helpers.ts

@@ -204,10 +204,6 @@ export function* getMinHeightBasedOnChildren(
     }
   }
 
-  if (widgetId === MAIN_CONTAINER_WIDGET_ID) {
-    return minHeightInRows + GridDefaults.MAIN_CANVAS_EXTENSION_OFFSET;
-  }
-
   return minHeightInRows;
 }
 /**