From 26fbb1862e059f645a357d06fe3dbcd6adac7ca7 Mon Sep 17 00:00:00 2001
From: victor <chrollolucilfer1402@gmail.com>
Date: Sun, 16 Feb 2025 11:50:05 +0530
Subject: [PATCH 1/2] fix: update message in mode selection drop down (#4626)

---
 .../app/builder/features/topbar/builder-mode.tsx   | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/apps/builder/app/builder/features/topbar/builder-mode.tsx b/apps/builder/app/builder/features/topbar/builder-mode.tsx
index f4fbfb27a24f..631384ef2794 100644
--- a/apps/builder/app/builder/features/topbar/builder-mode.tsx
+++ b/apps/builder/app/builder/features/topbar/builder-mode.tsx
@@ -69,6 +69,18 @@ export const BuilderModeDropDown = () => {
     setActiveMode(undefined);
   };
 
+  const getDefaultMessage = () => {
+    if (
+      isContentModeAllowed &&
+      isFeatureEnabled("contentEditableMode") &&
+      isDesignModeAllowed
+    ) {
+      return "Select Design or Content mode";
+    }
+
+    return !isDesignModeAllowed ? "Select Content mode" : "Select Design mode";
+  };
+
   return (
     <Flex align="center">
       <Tooltip
@@ -145,7 +157,7 @@ export const BuilderModeDropDown = () => {
             <Box css={{ width: theme.spacing[25] }}>
               {activeMode
                 ? menuItems[activeMode].description
-                : "Select Design or Content mode"}
+                : getDefaultMessage()}
             </Box>
           </div>
         </DropdownMenuContent>

From ec9a5f458970ab99186a887479354f2ccd527d96 Mon Sep 17 00:00:00 2001
From: Oleg Isonen <oleg008@gmail.com>
Date: Sun, 16 Feb 2025 11:16:11 +0100
Subject: [PATCH 2/2] Update
 apps/builder/app/builder/features/topbar/builder-mode.tsx

---
 apps/builder/app/builder/features/topbar/builder-mode.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/builder/app/builder/features/topbar/builder-mode.tsx b/apps/builder/app/builder/features/topbar/builder-mode.tsx
index 631384ef2794..6982cda267bd 100644
--- a/apps/builder/app/builder/features/topbar/builder-mode.tsx
+++ b/apps/builder/app/builder/features/topbar/builder-mode.tsx
@@ -78,7 +78,7 @@ export const BuilderModeDropDown = () => {
       return "Select Design or Content mode";
     }
 
-    return !isDesignModeAllowed ? "Select Content mode" : "Select Design mode";
+    return isDesignModeAllowed ? "Select Design mode" : "Select Content mode";
   };
 
   return (