From 0b9857d44f8b77dde39f8bd1ee740ec36ff27720 Mon Sep 17 00:00:00 2001
From: Dipyaman Biswas <dipyaman@appsmith.com>
Date: Sun, 15 Oct 2023 02:11:29 +0530
Subject: [PATCH] feat: remove cloudHosting conditional check, change version
 name (#28086)

---
 app/client/src/ce/constants/messages.ts               | 11 +++--------
 app/client/src/ce/sagas/SuperUserSagas.tsx            |  3 +--
 .../pages/Editor/FirstTimeUserOnboarding/HelpMenu.tsx |  3 +--
 app/client/src/pages/Editor/HelpButton.tsx            |  1 -
 app/client/src/pages/Home/LeftPaneBottomSection.tsx   |  3 +--
 app/client/src/pages/common/MobileSidebar.tsx         |  3 +--
 6 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/app/client/src/ce/constants/messages.ts b/app/client/src/ce/constants/messages.ts
index 76ae05963d..48544eac1d 100644
--- a/app/client/src/ce/constants/messages.ts
+++ b/app/client/src/ce/constants/messages.ts
@@ -8,15 +8,10 @@ export function createMessage(
 }
 
 /*
-  For self hosted, it displays the string "Appsmith Community v1.10.0" or "Appsmith Business v1.10.0".
-  For cloud hosting, it displays "Appsmith v1.10.0".
-  This is because Appsmith Cloud doesn't support business features yet.
+  For self hosted CE, it displays the string "Appsmith Community v1.10.0".
  */
-export const APPSMITH_DISPLAY_VERSION = (
-  edition: string,
-  version: string,
-  cloudHosting: boolean,
-) => `Appsmith ${!cloudHosting ? edition : ""} ${version}`;
+export const APPSMITH_DISPLAY_VERSION = (edition: string, version: string) =>
+  `Appsmith ${edition} ${version}`;
 export const INTERCOM_CONSENT_MESSAGE = () =>
   `Can we have your email for better support?`;
 export const YES = () => `Yes`;
diff --git a/app/client/src/ce/sagas/SuperUserSagas.tsx b/app/client/src/ce/sagas/SuperUserSagas.tsx
index 9df0ffadce..0ef6294012 100644
--- a/app/client/src/ce/sagas/SuperUserSagas.tsx
+++ b/app/client/src/ce/sagas/SuperUserSagas.tsx
@@ -38,7 +38,7 @@ export function* FetchAdminSettingsSaga() {
   const isValidResponse: boolean = yield validateResponse(response);
 
   if (isValidResponse) {
-    const { appVersion, cloudHosting } = getAppsmithConfigs();
+    const { appVersion } = getAppsmithConfigs();
     const settings = {
       //@ts-expect-error: response is of type unknown
       ...response.data,
@@ -46,7 +46,6 @@ export function* FetchAdminSettingsSaga() {
         APPSMITH_DISPLAY_VERSION,
         appVersion.edition,
         appVersion.id,
-        cloudHosting,
       ),
     };
 
diff --git a/app/client/src/pages/Editor/FirstTimeUserOnboarding/HelpMenu.tsx b/app/client/src/pages/Editor/FirstTimeUserOnboarding/HelpMenu.tsx
index f53b4d372e..42c9b327fe 100644
--- a/app/client/src/pages/Editor/FirstTimeUserOnboarding/HelpMenu.tsx
+++ b/app/client/src/pages/Editor/FirstTimeUserOnboarding/HelpMenu.tsx
@@ -78,7 +78,7 @@ function HelpMenu(props: {
           >
             Help & Resources
           </Text>
-          <div className="flex gap-2 flex-wrap mt-2">
+          <div className="flex flex-wrap gap-2 mt-2">
             <Button
               data-testid="editor-welcome-tour"
               kind="secondary"
@@ -126,7 +126,6 @@ function HelpMenu(props: {
               APPSMITH_DISPLAY_VERSION,
               appVersion.edition,
               appVersion.id,
-              cloudHosting,
             )}
           </StyledText>
           <StyledText color="var(--ads-v2-color-fg-muted)" kind={"action-s"}>
diff --git a/app/client/src/pages/Editor/HelpButton.tsx b/app/client/src/pages/Editor/HelpButton.tsx
index 975f552faa..5f4b2ba6a6 100644
--- a/app/client/src/pages/Editor/HelpButton.tsx
+++ b/app/client/src/pages/Editor/HelpButton.tsx
@@ -299,7 +299,6 @@ function HelpButton() {
                       APPSMITH_DISPLAY_VERSION,
                       appVersion.edition,
                       appVersion.id,
-                      cloudHosting,
                     )}
                   </span>
                   <span>
diff --git a/app/client/src/pages/Home/LeftPaneBottomSection.tsx b/app/client/src/pages/Home/LeftPaneBottomSection.tsx
index 69b595ac46..ce702d72ff 100644
--- a/app/client/src/pages/Home/LeftPaneBottomSection.tsx
+++ b/app/client/src/pages/Home/LeftPaneBottomSection.tsx
@@ -62,7 +62,7 @@ function LeftPaneBottomSection() {
   const dispatch = useDispatch();
   const onboardingWorkspaces = useSelector(getOnboardingWorkspaces);
   const isFetchingApplications = useSelector(getIsFetchingApplications);
-  const { appVersion, cloudHosting } = getAppsmithConfigs();
+  const { appVersion } = getAppsmithConfigs();
   const howMuchTimeBefore = howMuchTimeBeforeText(appVersion.releaseDate);
   const user = useSelector(getCurrentUser);
   const tenantPermissions = useSelector(getTenantPermissions);
@@ -141,7 +141,6 @@ function LeftPaneBottomSection() {
               APPSMITH_DISPLAY_VERSION,
               appVersion.edition,
               appVersion.id,
-              cloudHosting,
             )}
           </span>
           {howMuchTimeBefore !== "" && (
diff --git a/app/client/src/pages/common/MobileSidebar.tsx b/app/client/src/pages/common/MobileSidebar.tsx
index 1a4a2a98c2..bd25d1bd37 100644
--- a/app/client/src/pages/common/MobileSidebar.tsx
+++ b/app/client/src/pages/common/MobileSidebar.tsx
@@ -86,7 +86,7 @@ const LeftPaneVersionData = styled.div`
 export default function MobileSideBar(props: MobileSideBarProps) {
   const user = useSelector(getCurrentUser);
   const tenantPermissions = useSelector(getTenantPermissions);
-  const { appVersion, cloudHosting } = getAppsmithConfigs();
+  const { appVersion } = getAppsmithConfigs();
   const howMuchTimeBefore = howMuchTimeBeforeText(appVersion.releaseDate);
   const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
 
@@ -156,7 +156,6 @@ export default function MobileSideBar(props: MobileSideBarProps) {
             APPSMITH_DISPLAY_VERSION,
             appVersion.edition,
             appVersion.id,
-            cloudHosting,
           )}
         </span>
         {howMuchTimeBefore !== "" && (