From 41febf226d46aeb6c980caef275c5bbd5f013976 Mon Sep 17 00:00:00 2001
From: Sushmitha Sekar <sushmithasekar28@gmail.com>
Date: Fri, 5 Jul 2024 09:24:18 +0200
Subject: [PATCH 1/2] Fix tests related to colors

---
 cypress/e2e/message-colors.cy.ts      | 2 +-
 src/webchat-ui/utils/sourceMapping.ts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cypress/e2e/message-colors.cy.ts b/cypress/e2e/message-colors.cy.ts
index 2efb56a3..45adda49 100644
--- a/cypress/e2e/message-colors.cy.ts
+++ b/cypress/e2e/message-colors.cy.ts
@@ -96,7 +96,7 @@ describe('Message Color Variants', () => {
             cy.receiveMessageFixture('buttons');
 
             cy.get('.webchat-buttons-template-root .chat-bubble').should('have.css', 'background', 'rgb(232, 235, 255) none repeat scroll 0% 0% / auto padding-box border-box');
-            cy.get('.webchat-buttons-template-root').should('have.css', 'color', 'rgb(255, 255, 255)');
+            cy.get('.webchat-buttons-template-root .chat-bubble').should('have.css', 'color', 'rgba(26, 26, 26, 0.95)');
         });
 
         it('renders a "quick reply"', () => {
diff --git a/src/webchat-ui/utils/sourceMapping.ts b/src/webchat-ui/utils/sourceMapping.ts
index 91d3f865..2d9e5ab3 100644
--- a/src/webchat-ui/utils/sourceMapping.ts
+++ b/src/webchat-ui/utils/sourceMapping.ts
@@ -2,9 +2,9 @@ import { IWebchatSettings, TSourceColor } from "../../common/interfaces/webchat-
 
 export function getSourceBackgroundColor(mappedValue: TSourceColor, colors: IWebchatSettings["colors"]): string | null {
     if (mappedValue === "bot") {
-        return colors.botMessageColor;
+        return colors.botMessageColor || "#FFFFFF";
     } else if (mappedValue === "user") {
-        return colors.userMessageColor;
+        return colors.userMessageColor || "#E8EBFF";
     } else {
         return null;
     }

From 3aacfe8787eca4ea6a2d3a0560894aa0910f9865 Mon Sep 17 00:00:00 2001
From: Sushmitha Sekar <sushmithasekar28@gmail.com>
Date: Fri, 5 Jul 2024 16:08:06 +0200
Subject: [PATCH 2/2] Fix local storage test

---
 cypress/e2e/disableLocalStorage.cy.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/cypress/e2e/disableLocalStorage.cy.ts b/cypress/e2e/disableLocalStorage.cy.ts
index 83eba0f4..a6ff5fb9 100644
--- a/cypress/e2e/disableLocalStorage.cy.ts
+++ b/cypress/e2e/disableLocalStorage.cy.ts
@@ -2,13 +2,13 @@ import { SinonSpy } from "cypress/types/sinon";
 
 describe("disableLocalStorage", () => {
     it("does not try to read from localStorage when disableLocalStorage flag is set", () => {
-        cy.visitWebchat();
-
         cy.window().then(window => {
             cy.spy(window.localStorage, "getItem").as("lsGetItemSpy");
             cy.spy(window.localStorage, "setItem").as("lsSetItemSpy");
         })
 
+        cy.visitWebchat();
+
         cy.initWebchat({
             settings: {
                 embeddingConfiguration: {
@@ -36,14 +36,14 @@ describe("disableLocalStorage", () => {
     });
 
     it("does not try to read either from localStorage or sessionStorage when disableLocalStorage and useSessionStorage flags are set", () => {
-        cy.visitWebchat();
-
         cy.window().then(window => {
             cy.spy(window.localStorage, "getItem").as("lsGetItemSpy");
             cy.spy(window.localStorage, "setItem").as("lsSetItemSpy");
             cy.spy(window.sessionStorage, "getItem").as("ssGetItemSpy");
             cy.spy(window.sessionStorage, "setItem").as("ssSetItemSpy");
-        })
+        });
+
+        cy.visitWebchat();
 
         cy.initWebchat({
             settings: {