From 01e2ba3fd9178ddd7b3f30a736dad02d83966f4a Mon Sep 17 00:00:00 2001
From: Nafees Nazik <84864519+G3root@users.noreply.github.com>
Date: Wed, 27 Sep 2023 19:28:52 +0530
Subject: [PATCH] fix: app crashing due to invalid hex (#11542)

---
 packages/lib/getBrandColours.tsx | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/lib/getBrandColours.tsx b/packages/lib/getBrandColours.tsx
index 485e51046a..92159c512b 100644
--- a/packages/lib/getBrandColours.tsx
+++ b/packages/lib/getBrandColours.tsx
@@ -31,6 +31,15 @@ export function isValidHexCode(hexColor: string): boolean {
   return isHexColor;
 }
 
+// credit : https://github.com/validatorjs/validator.js/blob/master/src/lib/isHexColor.js
+const getValidHEX = (hex: string, defaultHex: string): string => {
+  const hexColor = /^#?([0-9A-F]{3}|[0-9A-F]{4}|[0-9A-F]{6}|[0-9A-F]{8})$/i.test(hex.replace("##", "#"));
+  if (hexColor) {
+    return hex;
+  }
+  return defaultHex;
+};
+
 function hexToRgb(hex: string): Rgb {
   const sanitizedHex = hex.replace("##", "#");
   const colorParts = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(sanitizedHex);
@@ -174,8 +183,8 @@ const useGetBrandingColours = ({
 
   darkVal = normalizeHexCode(darkVal, true);
 
-  const lightColourMap = createColorMap(lightVal);
-  const darkColourMap = createColorMap(darkVal);
+  const lightColourMap = createColorMap(getValidHEX(lightVal, BRAND_COLOR));
+  const darkColourMap = createColorMap(getValidHEX(darkVal, DARK_BRAND_COLOR));
 
   const theme = {
     light: {