Merge pull request #41148 from appsmithorg/chore/editor-logo-cherry-pick

fix: Updating the logo in the app editor to use favicon instead (#41147)

Author: btsgh

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

@@ -1698,13 +1698,13 @@ export const ADMIN_BRANDING_LOGO_FORMAT_ERROR = () =>
 export const ADMIN_BRANDING_LOGO_REQUIREMENT = () =>
   `.SVG, .PNG, or .JPG only • Max 2MB`;
 export const ADMIN_BRANDING_FAVICON_DIMENSION_ERROR = () =>
-  `Uploaded file must have a max size of 32X32 pixels`;
+  `Uploaded file must have a max size of 48X48 pixels`;
 export const ADMIN_BRANDING_FAVICON_SIZE_ERROR = () =>
   `Uploaded file must be less than 2MB`;
 export const ADMIN_BRANDING_FAVICON_FORMAT_ERROR = () =>
   `Uploaded file must be in .ICO, .PNG, and .JPG formats`;
 export const ADMIN_BRANDING_FAVICON_REQUIREMENT = () =>
-  `.ICO, .PNG, or .JPG only • Max 32X32`;
+  `.ICO, .PNG, or .JPG only • Max 48X48`;
 export const PROFILE_DISPLAY_PICTURE_REQUIREMENT = () =>
   `.ICO, .PNG, or .JPG only • Max 32X32`;
 export const ADMIN_BRANDING_COLOR_TOOLTIP_PRIMARY = () =>

app/client/src/pages/Editor/AppsmithLink.tsx

@@ -22,7 +22,6 @@ export const StyledLink = styled((props) => {
     min-width: 24px;
     width: 24px;
     height: 24px;
-    object-fit: contain;
   }
 `;
 
@@ -49,8 +48,10 @@ export const AppsmithLink = () => {
           alt="Appsmith logo"
           className="t--appsmith-logo"
           src={
-            organizationConfig.brandLogoUrl
-              ? organizationConfig.brandLogoUrl
+            organizationConfig.brandFaviconUrl &&
+            organizationConfig.brandFaviconUrl !==
+              "https://assets.appsmith.com/appsmith-favicon-orange.ico"
+              ? organizationConfig.brandFaviconUrl
               : AppsmithLogo
           }
         />

app/client/src/utils/BrandingUtils.ts

@@ -13,8 +13,8 @@ import { ASSETS_CDN_URL } from "constants/ThirdPartyConstants";
 import { getAssetUrl } from "ee/utils/airgapHelpers";
 import { LightModeTheme } from "@appsmith/wds-theming";
 
-const FAVICON_MAX_WIDTH = 32;
-const FAVICON_MAX_HEIGHT = 32;
+const FAVICON_MAX_WIDTH = 48;
+const FAVICON_MAX_HEIGHT = 48;
 const DEFAULT_BRANDING_PRIMARY_COLOR = "#E15615";
 
 export const APPSMITH_BRAND_PRIMARY_COLOR =