From cb39966f0c11b7c37c6e274f01d81c2cce0ebf0e Mon Sep 17 00:00:00 2001
From: Maduranga Siriwardena <maduranga.siriwardena@gmail.com>
Date: Tue, 17 Oct 2023 14:11:16 +0530
Subject: [PATCH] Fix review comments

---
 .../email-management/utils/email-customization-utils.ts        | 2 +-
 .../components/preview/email-template-screen-skeleton.tsx      | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/apps/console/src/extensions/components/email-management/utils/email-customization-utils.ts b/apps/console/src/extensions/components/email-management/utils/email-customization-utils.ts
index 09210fddcf4..070bd0f4925 100644
--- a/apps/console/src/extensions/components/email-management/utils/email-customization-utils.ts
+++ b/apps/console/src/extensions/components/email-management/utils/email-customization-utils.ts
@@ -116,7 +116,7 @@ export class EmailCustomizationUtils {
             .replace(/{{organization.font}}/g, currentTheme.typography.font.fontFamily)
             .replace(/{{organization.font.color}}/g, currentTheme.colors.text.primary)
             .replace(/{{organization.button.font.color}}/g, currentTheme.buttons.primary.base.font.color)
-            .replace(/{{organization-name}}/g, displayName ? displayName : organizationName)
+            .replace(/{{organization-name}}/g, displayName ?? organizationName)
             .replace(/{{organization.logo.img}}/g, currentTheme.images.logo.imgURL || defaultOrgLogo)
             .replace(/{{organization.logo.altText}}/g, currentTheme.images.logo.altText)
             .replace(/{{organization.copyright.text}}/g,
diff --git a/apps/console/src/features/branding/components/preview/email-template-screen-skeleton.tsx b/apps/console/src/features/branding/components/preview/email-template-screen-skeleton.tsx
index 256ec793be3..16781645f21 100644
--- a/apps/console/src/features/branding/components/preview/email-template-screen-skeleton.tsx
+++ b/apps/console/src/features/branding/components/preview/email-template-screen-skeleton.tsx
@@ -142,8 +142,7 @@ export const EmailTemplateScreenSkeleton: FunctionComponent<EmailTemplateScreenS
                             }
                         }
                     },
-                    "organization-name": brandingPreference.organizationDetails.displayName
-                        ? brandingPreference.organizationDetails.displayName : tenantDomain,
+                    "organization-name": brandingPreference.organizationDetails.displayName ?? tenantDomain,
                     "user-name": userDisplayName
                 })
             ) }