@microsoft/omnichannel-chat-widget 0.1.0-main.c461296 → 0.1.0-main.ceb1702

package/lib/esm/components/livechatwidget/common/startChat.js

@@ -1,5 +1,5 @@
-import { ChatSDKError, Constants } from "../../../common/Constants";
-import { LogLevel, TelemetryEvent } from "../../../common/telemetry/TelemetryConstants";
+import { ChatSDKError } from "../../../common/Constants";
+import { BroadcastEvent, LogLevel, TelemetryEvent } from "../../../common/telemetry/TelemetryConstants";
 import { ConversationState } from "../../../contexts/common/ConversationState";
 import { DataStoreManager } from "../../../common/contextDataStore/DataStoreManager";
 import { LiveChatWidgetActionType } from "../../../contexts/common/LiveChatWidgetActionType";
@@ -9,33 +9,53 @@ import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
 import { TelemetryTimers } from "../../../common/telemetry/TelemetryManager";
 import { createAdapter } from "./createAdapter";
 import { createOnNewAdapterActivityHandler } from "../../../plugins/newMessageEventHandler";
-import { createTimer } from "../../../common/utils";
-import { getReconnectIdForAuthenticatedChat } from "./reconnectChatHelper";
+import { createTimer, getWidgetCacheId } from "../../../common/utils";
+import { getReconnectIdForAuthenticatedChat, handleRedirectUnauthenticatedReconnectChat } from "./reconnectChatHelper";
 import { setPostChatContextAndLoadSurvey } from "./setPostChatContextAndLoadSurvey";
-import { updateSessionDataForTelemetry } from "./updateSessionDataForTelemetry"; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+import { updateSessionDataForTelemetry } from "./updateSessionDataForTelemetry";
+import { BroadcastService } from "@microsoft/omnichannel-chat-components"; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+let optionalParams = {}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
 const prepareStartChat = async (props, chatSDK, state, dispatch, setAdapter) => {
+  var _props$reconnectChatP;
+
   if (await canConnectToExistingChat(props, chatSDK, state, dispatch, setAdapter)) {
     return;
-  } // Getting PreChat Survey Context
+  } // Redirecting if unauthenticated reconnect chat expired
+
 
+  if ((_props$reconnectChatP = props.reconnectChatPaneProps) !== null && _props$reconnectChatP !== void 0 && _props$reconnectChatP.reconnectId) {
+    var _props$reconnectChatP2, _props$reconnectChatP3;
+
+    await handleRedirectUnauthenticatedReconnectChat(chatSDK, dispatch, setAdapter, initStartChat, (_props$reconnectChatP2 = props.reconnectChatPaneProps) === null || _props$reconnectChatP2 === void 0 ? void 0 : _props$reconnectChatP2.reconnectId, (_props$reconnectChatP3 = props.reconnectChatPaneProps) === null || _props$reconnectChatP3 === void 0 ? void 0 : _props$reconnectChatP3.redirectInSameWindow);
+  } else {
+    // Getting reconnectId for authenticated chat
+    const reconnectId = await getReconnectIdForAuthenticatedChat(props, chatSDK);
 
+    if (reconnectId) {
+      dispatch({
+        type: LiveChatWidgetActionType.SET_RECONNECT_ID,
+        payload: reconnectId
+      });
+      dispatch({
+        type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+        payload: ConversationState.ReconnectChat
+      });
+    } else {
+      setCustomContextParams(props, state);
+      setupChatState(chatSDK, dispatch, setAdapter, state.appStates.conversationState === ConversationState.ProactiveChat, state.appStates.proactiveChatStates.proactiveChatEnablePrechat);
+    }
+  }
+};
+
+const setupChatState = async (chatSDK, dispatch, setAdapter, isProactiveChat, proactiveChatEnablePrechatState) => {
+  // Getting PreChat Survey Context
   const parseToJson = false;
   const preChatSurveyResponse = await chatSDK.getPreChatSurvey(parseToJson);
-  const showPrechat = state.appStates.conversationState === ConversationState.ProactiveChat ? preChatSurveyResponse && state.appStates.proactiveChatStates.proactiveChatEnablePrechat : preChatSurveyResponse; // Getting reconnectId for authenticated chat
+  const showPrechat = isProactiveChat ? preChatSurveyResponse && proactiveChatEnablePrechatState : preChatSurveyResponse;
 
-  const reconnectId = await getReconnectIdForAuthenticatedChat(props, chatSDK);
-
-  if (reconnectId) {
-    dispatch({
-      type: LiveChatWidgetActionType.SET_RECONNECT_ID,
-      payload: reconnectId
-    });
-    dispatch({
-      type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-      payload: ConversationState.ReconnectChat
-    });
-  } else if (showPrechat) {
+  if (showPrechat) {
     dispatch({
       type: LiveChatWidgetActionType.SET_PRE_CHAT_SURVEY_RESPONSE,
       payload: preChatSurveyResponse
@@ -58,12 +78,29 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, params, persistedSta
   try {
     var _newAdapter$activity$, _TelemetryTimers$Widg;
 
+    let isStartChatSuccessful = false;
+
+    if (persistedState || params !== null && params !== void 0 && params.liveChatContext) {
+      var _persistedState$domai, _persistedState$domai2, _persistedState$domai3, _persistedState$domai4, _persistedState$domai5;
+
+      // Broadcasting limited cached chat details
+      BroadcastService.postMessage({
+        eventName: BroadcastEvent.ChatRetrievedFromCache,
+        payload: {
+          chatId: persistedState === null || persistedState === void 0 ? void 0 : (_persistedState$domai = persistedState.domainStates) === null || _persistedState$domai === void 0 ? void 0 : (_persistedState$domai2 = _persistedState$domai.liveChatContext) === null || _persistedState$domai2 === void 0 ? void 0 : (_persistedState$domai3 = _persistedState$domai2.chatToken) === null || _persistedState$domai3 === void 0 ? void 0 : _persistedState$domai3.chatId,
+          requestId: persistedState === null || persistedState === void 0 ? void 0 : (_persistedState$domai4 = persistedState.domainStates) === null || _persistedState$domai4 === void 0 ? void 0 : (_persistedState$domai5 = _persistedState$domai4.liveChatContext) === null || _persistedState$domai5 === void 0 ? void 0 : _persistedState$domai5.requestId
+        }
+      });
+    }
+
     try {
       TelemetryTimers.WidgetLoadTimer = createTimer();
       TelemetryHelper.logSDKEvent(LogLevel.INFO, {
         Event: TelemetryEvent.StartChatSDKCall
       });
-      await chatSDK.startChat(params);
+      optionalParams = Object.assign({}, params, optionalParams);
+      await chatSDK.startChat(optionalParams);
+      isStartChatSuccessful = true;
     } catch (error) {
       TelemetryHelper.logSDKEvent(LogLevel.ERROR, {
         Event: TelemetryEvent.StartChatMethodException,
@@ -71,6 +108,7 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, params, persistedSta
           exception: `Failed to setup startChat: ${error}`
         }
       });
+      isStartChatSuccessful = false;
     }
 
     const newAdapter = await createAdapter(chatSDK);
@@ -98,10 +136,12 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, params, persistedSta
       await setPostChatContextAndLoadSurvey(chatSDK, dispatch);
       await updateSessionDataForTelemetry(chatSDK, dispatch); // Set app state to Active
 
-      dispatch({
-        type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-        payload: ConversationState.Active
-      });
+      if (isStartChatSuccessful) {
+        dispatch({
+          type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+          payload: ConversationState.Active
+        });
+      }
     } else {
       dispatch({
         type: LiveChatWidgetActionType.SET_WIDGET_STATE,
@@ -139,20 +179,21 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, params, persistedSta
 
 
 const canConnectToExistingChat = async (props, chatSDK, state, dispatch, setAdapter) => {
-  var _DataStoreManager$cli, _persistedState$domai;
+  var _chatSDK$omnichannelC, _chatSDK$omnichannelC2, _DataStoreManager$cli, _persistedState$domai6;
 
-  const widgetStateFromCache = (_DataStoreManager$cli = DataStoreManager.clientDataStore) === null || _DataStoreManager$cli === void 0 ? void 0 : _DataStoreManager$cli.getData(Constants.widgetStateDataKey, "localStorage");
+  const widgetStateEventName = getWidgetCacheId((chatSDK === null || chatSDK === void 0 ? void 0 : (_chatSDK$omnichannelC = chatSDK.omnichannelConfig) === null || _chatSDK$omnichannelC === void 0 ? void 0 : _chatSDK$omnichannelC.orgId) ?? "", (chatSDK === null || chatSDK === void 0 ? void 0 : (_chatSDK$omnichannelC2 = chatSDK.omnichannelConfig) === null || _chatSDK$omnichannelC2 === void 0 ? void 0 : _chatSDK$omnichannelC2.widgetId) ?? "");
+  const widgetStateFromCache = (_DataStoreManager$cli = DataStoreManager.clientDataStore) === null || _DataStoreManager$cli === void 0 ? void 0 : _DataStoreManager$cli.getData(widgetStateEventName, "localStorage");
   const persistedState = widgetStateFromCache ? JSON.parse(widgetStateFromCache) : undefined;
 
-  if (persistedState !== null && persistedState !== void 0 && (_persistedState$domai = persistedState.domainStates) !== null && _persistedState$domai !== void 0 && _persistedState$domai.liveChatContext) {
-    var _persistedState$domai2;
+  if (persistedState !== null && persistedState !== void 0 && (_persistedState$domai6 = persistedState.domainStates) !== null && _persistedState$domai6 !== void 0 && _persistedState$domai6.liveChatContext) {
+    var _persistedState$domai7;
 
     dispatch({
       type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
       payload: ConversationState.Loading
     });
     const optionalParams = {
-      liveChatContext: persistedState === null || persistedState === void 0 ? void 0 : (_persistedState$domai2 = persistedState.domainStates) === null || _persistedState$domai2 === void 0 ? void 0 : _persistedState$domai2.liveChatContext
+      liveChatContext: persistedState === null || persistedState === void 0 ? void 0 : (_persistedState$domai7 = persistedState.domainStates) === null || _persistedState$domai7 === void 0 ? void 0 : _persistedState$domai7.liveChatContext
     };
     await initStartChat(chatSDK, dispatch, setAdapter, optionalParams, persistedState);
     return true;
@@ -161,4 +202,15 @@ const canConnectToExistingChat = async (props, chatSDK, state, dispatch, setAdap
   }
 };
 
-export { prepareStartChat, initStartChat };
+const setCustomContextParams = (props, state) => {
+  var _props$chatConfig, _state$domainStates;
+
+  // Add custom context if any only for unauthenticated chat
+  if (!((_props$chatConfig = props.chatConfig) !== null && _props$chatConfig !== void 0 && _props$chatConfig.LiveChatConfigAuthSettings) && (_state$domainStates = state.domainStates) !== null && _state$domainStates !== void 0 && _state$domainStates.customContext) {
+    optionalParams = Object.assign({}, optionalParams, {
+      customContext: state.domainStates.customContext
+    });
+  }
+};
+
+export { prepareStartChat, initStartChat, setupChatState };

package/lib/esm/components/livechatwidget/livechatwidgetstateful/LiveChatWidgetStateful.js

@@ -4,9 +4,9 @@ import { BroadcastEvent, LogLevel, TelemetryEvent } from "../../../common/teleme
 import { BroadcastService, decodeComponentString } from "@microsoft/omnichannel-chat-components";
 import { Stack } from "@fluentui/react";
 import React, { useEffect, useRef, useState } from "react";
-import { createTimer, getLocaleDirection } from "../../../common/utils";
-import { getReconnectIdForAuthenticatedChat, handleUnauthenticatedReconnectChat } from "../common/reconnectChatHelper";
-import { initStartChat, prepareStartChat } from "../common/startChat";
+import { createTimer, getLocaleDirection, getWidgetCacheId, getWidgetEndChatEventName } from "../../../common/utils";
+import { getReconnectIdForAuthenticatedChat, handleUnauthenticatedReconnectChat, startUnauthenticatedReconnectChat } from "../common/reconnectChatHelper";
+import { initStartChat, prepareStartChat, setupChatState } from "../common/startChat";
 import { shouldShowCallingContainer, shouldShowChatButton, shouldShowConfirmationPane, shouldShowEmailTranscriptPane, shouldShowHeader, shouldShowLoadingPane, shouldShowOutOfOfficeHoursPane, shouldShowPostChatLoadingPane, shouldShowPostChatSurveyPane, shouldShowPreChatSurveyPane, shouldShowProactiveChatPane, shouldShowReconnectChatPane, shouldShowWebChatContainer } from "../../../controller/componentController";
 import CallingContainerStateful from "../../callingcontainerstateful/CallingContainerStateful";
 import ChatButtonStateful from "../../chatbuttonstateful/ChatButtonStateful";
@@ -32,7 +32,7 @@ import { createFooter } from "../common/createFooter";
 import { createInternetConnectionChangeHandler } from "../common/createInternetConnectionChangeHandler";
 import { defaultWebChatContainerStatefulProps } from "../../webchatcontainerstateful/common/defaultProps/defaultWebChatContainerStatefulProps";
 import { disposeTelemetryLoggers } from "../common/disposeTelemetryLoggers";
-import { endChat } from "../common/endChat";
+import { endChat, prepareEndChat } from "../common/endChat";
 import { getGeneralStylesForButton } from "../common/getGeneralStylesForButton";
 import { initCallingSdk } from "../common/initCallingSdk";
 import { initConfirmationPropsComposer } from "../common/initConfirmationPropsComposer";
@@ -44,7 +44,7 @@ import useChatAdapterStore from "../../../hooks/useChatAdapterStore";
 import useChatContextStore from "../../../hooks/useChatContextStore";
 import useChatSDKStore from "../../../hooks/useChatSDKStore";
 export const LiveChatWidgetStateful = props => {
-  var _props$webChatContain, _props$styleProps, _props$controlProps, _props$webChatContain3, _props$webChatContain4, _props$styleProps2, _props$controlProps5, _props$componentOverr, _props$controlProps6, _props$componentOverr2, _props$controlProps7, _props$componentOverr3, _props$controlProps8, _props$componentOverr4, _props$controlProps9, _props$componentOverr5, _props$controlProps10, _props$componentOverr6, _props$controlProps11, _props$controlProps12, _props$controlProps13, _props$componentOverr7, _props$controlProps14, _props$componentOverr8, _props$controlProps15, _props$componentOverr9, _props$componentOverr10, _props$componentOverr11;
+  var _props$webChatContain, _props$styleProps, _props$controlProps, _props$webChatContain3, _props$webChatContain4, _props$styleProps2, _props$controlProps5, _props$controlProps6, _props$componentOverr, _props$controlProps7, _props$componentOverr2, _props$controlProps8, _props$componentOverr3, _props$controlProps9, _props$componentOverr4, _props$controlProps10, _props$componentOverr5, _props$controlProps11, _props$componentOverr6, _props$controlProps12, _props$componentOverr7, _props$controlProps13, _props$controlProps14, _props$componentOverr8, _props$controlProps15, _props$componentOverr9, _props$controlProps16, _props$componentOverr10, _props$componentOverr11, _props$componentOverr12;
 
   const [state, dispatch] = useChatContextStore(); // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
@@ -53,12 +53,14 @@ export const LiveChatWidgetStateful = props => {
     ...((_props$webChatContain = props.webChatContainerProps) === null || _props$webChatContain === void 0 ? void 0 : _props$webChatContain.webChatStyles)
   }); // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
-  const chatSDK = useChatSDKStore();
+  const chatSDK = useChatSDKStore(); // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
   const [voiceVideoCallingSDK, setVoiceVideoCallingSDK] = useState(undefined);
   const {
     Composer
   } = Components;
-  const canStartProactiveChat = useRef(true); // Process general styles
+  const canStartProactiveChat = useRef(true);
+  const canEndChat = useRef(true); // Process general styles
 
   const generalStyles = {
     root: Object.assign({}, getGeneralStylesForButton(state), (_props$styleProps = props.styleProps) === null || _props$styleProps === void 0 ? void 0 : _props$styleProps.generalStyles)
@@ -66,6 +68,33 @@ export const LiveChatWidgetStateful = props => {
   TelemetryTimers.LcwLoadToChatButtonTimer = createTimer();
   const widgetElementId = ((_props$controlProps = props.controlProps) === null || _props$controlProps === void 0 ? void 0 : _props$controlProps.id) || "oc-lcw";
   const currentMessageCountRef = useRef(0);
+  let widgetStateEventName = "";
+
+  const initiateEndChatOnBrowserUnload = () => {
+    var _DataStoreManager$cli;
+
+    const persistedState = getStateFromCache(); // End chat if the chat is still active and browser closed
+
+    if (persistedState.appStates.conversationState === ConversationState.Active) {
+      //Browser close scenario/no room for PCS/so just end chat and notify agent immidiately
+      endChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, false, false, false);
+    } // Clean local storage
+
+
+    (_DataStoreManager$cli = DataStoreManager.clientDataStore) === null || _DataStoreManager$cli === void 0 ? void 0 : _DataStoreManager$cli.removeData(widgetStateEventName, "localStorage");
+  }; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+
+  const getStateFromCache = () => {
+    var _chatSDK$omnichannelC, _chatSDK$omnichannelC2, _DataStoreManager$cli2;
+
+    // Getting updated state from cache
+    const widgetStateEventName = getWidgetCacheId((chatSDK === null || chatSDK === void 0 ? void 0 : (_chatSDK$omnichannelC = chatSDK.omnichannelConfig) === null || _chatSDK$omnichannelC === void 0 ? void 0 : _chatSDK$omnichannelC.orgId) ?? "", (chatSDK === null || chatSDK === void 0 ? void 0 : (_chatSDK$omnichannelC2 = chatSDK.omnichannelConfig) === null || _chatSDK$omnichannelC2 === void 0 ? void 0 : _chatSDK$omnichannelC2.widgetId) ?? "");
+    const widgetStateFromCache = (_DataStoreManager$cli2 = DataStoreManager.clientDataStore) === null || _DataStoreManager$cli2 === void 0 ? void 0 : _DataStoreManager$cli2.getData(widgetStateEventName, "localStorage");
+    const persistedState = widgetStateFromCache ? JSON.parse(widgetStateFromCache) : undefined;
+    return persistedState;
+  };
+
   useEffect(() => {
     var _props$controlProps2, _props$controlProps3, _props$reconnectChatP, _props$controlProps4, _props$chatConfig, _props$chatConfig$Cha, _state$domainStates;
 
@@ -80,6 +109,10 @@ export const LiveChatWidgetStateful = props => {
       type: LiveChatWidgetActionType.SET_SKIP_CHAT_BUTTON_RENDERING,
       payload: ((_props$controlProps2 = props.controlProps) === null || _props$controlProps2 === void 0 ? void 0 : _props$controlProps2.skipChatButtonRendering) || false
     });
+    dispatch({
+      type: LiveChatWidgetActionType.SET_E2VV_ENABLED,
+      payload: false
+    });
     initCallingSdk(chatSDK, setVoiceVideoCallingSDK).then(sdkCreated => {
       sdkCreated && dispatch({
         type: LiveChatWidgetActionType.SET_E2VV_ENABLED,
@@ -90,7 +123,7 @@ export const LiveChatWidgetStateful = props => {
     if (!((_props$controlProps3 = props.controlProps) !== null && _props$controlProps3 !== void 0 && _props$controlProps3.skipChatButtonRendering) && (_props$reconnectChatP = props.reconnectChatPaneProps) !== null && _props$reconnectChatP !== void 0 && _props$reconnectChatP.reconnectId) {
       var _props$reconnectChatP2;
 
-      handleUnauthenticatedReconnectChat(dispatch, (_props$reconnectChatP2 = props.reconnectChatPaneProps) === null || _props$reconnectChatP2 === void 0 ? void 0 : _props$reconnectChatP2.reconnectId, initStartChat);
+      startUnauthenticatedReconnectChat(chatSDK, dispatch, setAdapter, (_props$reconnectChatP2 = props.reconnectChatPaneProps) === null || _props$reconnectChatP2 === void 0 ? void 0 : _props$reconnectChatP2.reconnectId, initStartChat);
     } // Initialize global dir
 
 
@@ -100,25 +133,28 @@ export const LiveChatWidgetStateful = props => {
       payload: globalDir
     });
 
-    if ((_state$domainStates = state.domainStates) !== null && _state$domainStates !== void 0 && _state$domainStates.chatToken) {
+    if ((_state$domainStates = state.domainStates) !== null && _state$domainStates !== void 0 && _state$domainStates.liveChatContext) {
       var _state$domainStates2;
 
       const optionalParams = {
-        liveChatContext: {
-          chatToken: (_state$domainStates2 = state.domainStates) === null || _state$domainStates2 === void 0 ? void 0 : _state$domainStates2.chatToken
-        }
+        liveChatContext: (_state$domainStates2 = state.domainStates) === null || _state$domainStates2 === void 0 ? void 0 : _state$domainStates2.liveChatContext
       };
       initStartChat(chatSDK, dispatch, setAdapter, optionalParams);
     }
-  }, []);
+  }, []); // useEffect for when skip chat button rendering
+
   useEffect(() => {
     if (state.appStates.skipChatButtonRendering) {
       var _props$reconnectChatP3;
 
+      BroadcastService.postMessage({
+        eventName: BroadcastEvent.ChatInitiated
+      });
+
       if ((_props$reconnectChatP3 = props.reconnectChatPaneProps) !== null && _props$reconnectChatP3 !== void 0 && _props$reconnectChatP3.reconnectId && !state.appStates.reconnectId) {
-        var _props$reconnectChatP4;
+        var _props$reconnectChatP4, _props$reconnectChatP5;
 
-        handleUnauthenticatedReconnectChat(dispatch, (_props$reconnectChatP4 = props.reconnectChatPaneProps) === null || _props$reconnectChatP4 === void 0 ? void 0 : _props$reconnectChatP4.reconnectId, initStartChat);
+        handleUnauthenticatedReconnectChat(chatSDK, dispatch, setAdapter, (_props$reconnectChatP4 = props.reconnectChatPaneProps) === null || _props$reconnectChatP4 === void 0 ? void 0 : _props$reconnectChatP4.reconnectId, initStartChat, (_props$reconnectChatP5 = props.reconnectChatPaneProps) === null || _props$reconnectChatP5 === void 0 ? void 0 : _props$reconnectChatP5.redirectInSameWindow);
       } else {
         getReconnectIdForAuthenticatedChat(props, chatSDK).then(authReconnectId => {
           if (authReconnectId && !state.appStates.reconnectId) {
@@ -131,18 +167,32 @@ export const LiveChatWidgetStateful = props => {
               payload: ConversationState.ReconnectChat
             });
           } else {
-            dispatch({
-              type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-              payload: ConversationState.Loading
-            });
-            initStartChat(chatSDK, dispatch, setAdapter);
+            const chatStartedSkippingChatButtonRendering = {
+              eventName: BroadcastEvent.StartChatSkippingChatButtonRendering
+            };
+            BroadcastService.postMessage(chatStartedSkippingChatButtonRendering);
+            setupChatState(chatSDK, dispatch, setAdapter);
           }
         });
       }
     }
-  }, [state.appStates.skipChatButtonRendering]);
+  }, [state.appStates.skipChatButtonRendering]); // useEffect for when skip chat button rendering
+
   useEffect(() => {
-    BroadcastService.getMessageByEventName("StartProactiveChat").subscribe(msg => {
+    var _chatSDK$omnichannelC3, _chatSDK$omnichannelC4;
+
+    // Add the custom context on receiving the SetCustomContext event
+    BroadcastService.getMessageByEventName(BroadcastEvent.SetCustomContext).subscribe(msg => {
+      TelemetryHelper.logActionEvent(LogLevel.INFO, {
+        Event: TelemetryEvent.CustomContextReceived,
+        Description: "CustomContext received."
+      });
+      dispatch({
+        type: LiveChatWidgetActionType.SET_CUSTOM_CONTEXT,
+        payload: msg === null || msg === void 0 ? void 0 : msg.payload
+      });
+    });
+    BroadcastService.getMessageByEventName(BroadcastEvent.StartProactiveChat).subscribe(msg => {
       TelemetryHelper.logActionEvent(LogLevel.INFO, {
         Event: TelemetryEvent.StartProactiveChatEventReceived,
         Description: "Start proactive chat event received."
@@ -158,17 +208,100 @@ export const LiveChatWidgetStateful = props => {
           Description: "Start proactive chat method called, when chat was already triggered."
         });
       }
+    }); // Start chat from SDK Event
+
+    BroadcastService.getMessageByEventName(BroadcastEvent.StartChat).subscribe(() => {
+      TelemetryHelper.logActionEvent(LogLevel.INFO, {
+        Event: TelemetryEvent.StartChatEventRecevied,
+        Description: "Start chat event received."
+      });
+      const persistedState = getStateFromCache();
+
+      if (persistedState && (persistedState.appStates.conversationState === ConversationState.Closed || persistedState.appStates.conversationState === ConversationState.InActive || persistedState.appStates.conversationState === ConversationState.Postchat)) {
+        // Embedded mode
+        BroadcastService.postMessage({
+          eventName: BroadcastEvent.ChatInitiated
+        });
+        prepareStartChat(props, chatSDK, state, dispatch, setAdapter);
+      } else if (!persistedState) {
+        // Popout chat
+        BroadcastService.postMessage({
+          eventName: BroadcastEvent.ChatInitiated
+        });
+        prepareStartChat(props, chatSDK, state, dispatch, setAdapter);
+      } else {
+        var _persistedState$domai, _persistedState$domai2, _persistedState$domai3, _persistedState$domai4;
+
+        // Minimize to Maximize
+        dispatch({
+          type: LiveChatWidgetActionType.SET_MINIMIZED,
+          payload: false
+        });
+        BroadcastService.postMessage({
+          eventName: BroadcastEvent.MaximizeChat,
+          payload: {
+            height: persistedState === null || persistedState === void 0 ? void 0 : (_persistedState$domai = persistedState.domainStates) === null || _persistedState$domai === void 0 ? void 0 : (_persistedState$domai2 = _persistedState$domai.widgetSize) === null || _persistedState$domai2 === void 0 ? void 0 : _persistedState$domai2.height,
+            width: persistedState === null || persistedState === void 0 ? void 0 : (_persistedState$domai3 = persistedState.domainStates) === null || _persistedState$domai3 === void 0 ? void 0 : (_persistedState$domai4 = _persistedState$domai3.widgetSize) === null || _persistedState$domai4 === void 0 ? void 0 : _persistedState$domai4.width
+          }
+        });
+      }
+    }); // End chat
+
+    BroadcastService.getMessageByEventName(BroadcastEvent.InitiateEndChat).subscribe(async () => {
+      if (canEndChat.current) {
+        prepareEndChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, state);
+      } else {
+        const skipEndChatSDK = true;
+        const skipCloseChat = false;
+        endChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, skipEndChatSDK, skipCloseChat);
+      }
+
+      BroadcastService.postMessage({
+        eventName: BroadcastEvent.CloseChat
+      });
     });
+    BroadcastService.getMessageByEventName(BroadcastEvent.InitiateEndChatOnBrowserUnload).subscribe(() => {
+      initiateEndChatOnBrowserUnload();
+    }); // reset proactive chat params
+
+    BroadcastService.getMessageByEventName(BroadcastEvent.ResetProactiveChatParams).subscribe(async () => {
+      dispatch({
+        type: LiveChatWidgetActionType.SET_PROACTIVE_CHAT_PARAMS,
+        payload: {
+          proactiveChatBodyTitle: "",
+          proactiveChatEnablePrechat: false,
+          proactiveChatInNewWindow: false
+        }
+      });
+    }); // Listen to end chat event from other tabs
+
+    const endChatEventName = getWidgetEndChatEventName(chatSDK === null || chatSDK === void 0 ? void 0 : (_chatSDK$omnichannelC3 = chatSDK.omnichannelConfig) === null || _chatSDK$omnichannelC3 === void 0 ? void 0 : _chatSDK$omnichannelC3.orgId, chatSDK === null || chatSDK === void 0 ? void 0 : (_chatSDK$omnichannelC4 = chatSDK.omnichannelConfig) === null || _chatSDK$omnichannelC4 === void 0 ? void 0 : _chatSDK$omnichannelC4.widgetId);
+    BroadcastService.getMessageByEventName(endChatEventName).subscribe(async () => {
+      endChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, false, false, false);
+    }); // Close popout window
+
     window.addEventListener("beforeunload", () => {
+      TelemetryHelper.logLoadingEvent(LogLevel.INFO, {
+        Event: TelemetryEvent.WindowClosed,
+        Description: "Closed window."
+      });
       disposeTelemetryLoggers();
     });
 
     if (state.appStates.conversationEndedByAgent) {
       endChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter);
-    }
+    } //Listen to WidgetSize
+
+
+    BroadcastService.getMessageByEventName("WidgetSize").subscribe(msg => {
+      dispatch({
+        type: LiveChatWidgetActionType.SET_WIDGET_SIZE,
+        payload: msg === null || msg === void 0 ? void 0 : msg.payload
+      });
+    });
   }, []);
   useEffect(() => {
-    canStartProactiveChat.current = state.appStates.conversationState === ConversationState.Closed;
+    canEndChat.current = state.appStates.conversationState === ConversationState.Active;
 
     if (state.appStates.conversationState === ConversationState.Active) {
       chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.onNewMessage(() => {
@@ -188,7 +321,10 @@ export const LiveChatWidgetStateful = props => {
         });
       });
     }
-  }, [state.appStates.conversationState]); // Reset the UnreadMessageCount when minimized is toggled and broadcast it.
+  }, [state.appStates.conversationState]);
+  useEffect(() => {
+    canStartProactiveChat.current = state.appStates.conversationState === ConversationState.Closed && !state.appStates.proactiveChatStates.proactiveChatInNewWindow;
+  }, [state.appStates.conversationState, state.appStates.proactiveChatStates.proactiveChatInNewWindow]); // Reset the UnreadMessageCount when minimized is toggled and broadcast it.
 
   useEffect(() => {
     currentMessageCountRef.current = -1;
@@ -220,29 +356,35 @@ export const LiveChatWidgetStateful = props => {
     setWebChatStyles({ ...webChatStyles,
       ...((_props$webChatContain2 = props.webChatContainerProps) === null || _props$webChatContain2 === void 0 ? void 0 : _props$webChatContain2.webChatStyles)
     });
-  }, [(_props$webChatContain3 = props.webChatContainerProps) === null || _props$webChatContain3 === void 0 ? void 0 : _props$webChatContain3.webChatStyles]);
+  }, [(_props$webChatContain3 = props.webChatContainerProps) === null || _props$webChatContain3 === void 0 ? void 0 : _props$webChatContain3.webChatStyles]); // Publish chat widget state
+
+  useEffect(() => {
+    var _props$chatSDK, _props$chatSDK$omnich, _props$chatSDK2, _props$chatSDK2$omnic;
+
+    widgetStateEventName = getWidgetCacheId(props === null || props === void 0 ? void 0 : (_props$chatSDK = props.chatSDK) === null || _props$chatSDK === void 0 ? void 0 : (_props$chatSDK$omnich = _props$chatSDK.omnichannelConfig) === null || _props$chatSDK$omnich === void 0 ? void 0 : _props$chatSDK$omnich.orgId, props === null || props === void 0 ? void 0 : (_props$chatSDK2 = props.chatSDK) === null || _props$chatSDK2 === void 0 ? void 0 : (_props$chatSDK2$omnic = _props$chatSDK2.omnichannelConfig) === null || _props$chatSDK2$omnic === void 0 ? void 0 : _props$chatSDK2$omnic.widgetId);
+    const chatWidgetStateChangeEvent = {
+      eventName: widgetStateEventName,
+      payload: { ...state
+      }
+    };
+    BroadcastService.postMessage(chatWidgetStateChangeEvent);
+  }, [state]);
   const webChatProps = initWebChatComposer(props, chatSDK, state, dispatch, setWebChatStyles);
 
   const setPostChatContextRelay = () => setPostChatContextAndLoadSurvey(chatSDK, dispatch); // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
 
-  const endChatRelay = (adapter, skipEndChatSDK, skipCloseChat) => endChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, skipEndChatSDK, skipCloseChat);
+  const endChatRelay = (adapter, skipEndChatSDK, skipCloseChat) => endChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, skipEndChatSDK, skipCloseChat); // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+
+  const prepareEndChatRelay = (adapter, state) => prepareEndChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, state);
 
   const prepareStartChatRelay = () => prepareStartChat(props, chatSDK, state, dispatch, setAdapter); // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
 
   const initStartChatRelay = (optionalParams, persistedState) => initStartChat(chatSDK, dispatch, setAdapter, optionalParams, persistedState);
 
-  const confirmationPaneProps = initConfirmationPropsComposer(props); // publish chat widget state
-
-  useEffect(() => {
-    const chatWidgetStateChangeEvent = {
-      eventName: BroadcastEvent.ChatWidgetStateChanged,
-      payload: { ...state
-      }
-    };
-    BroadcastService.postMessage(chatWidgetStateChangeEvent);
-  }, [state]);
+  const confirmationPaneProps = initConfirmationPropsComposer(props);
   return /*#__PURE__*/React.createElement(Composer, _extends({}, webChatProps, {
     styleOptions: webChatStyles,
     directLine: ((_props$webChatContain4 = props.webChatContainerProps) === null || _props$webChatContain4 === void 0 ? void 0 : _props$webChatContain4.directLine) ?? adapter ?? defaultWebChatContainerStatefulProps.directLine
@@ -250,28 +392,28 @@ export const LiveChatWidgetStateful = props => {
     id: widgetElementId,
     styles: generalStyles,
     className: (_props$styleProps2 = props.styleProps) === null || _props$styleProps2 === void 0 ? void 0 : _props$styleProps2.className
-  }, !((_props$controlProps5 = props.controlProps) !== null && _props$controlProps5 !== void 0 && _props$controlProps5.hideChatButton) && shouldShowChatButton(state) && (decodeComponentString((_props$componentOverr = props.componentOverrides) === null || _props$componentOverr === void 0 ? void 0 : _props$componentOverr.chatButton) || /*#__PURE__*/React.createElement(ChatButtonStateful, {
+  }, !((_props$controlProps5 = props.controlProps) !== null && _props$controlProps5 !== void 0 && _props$controlProps5.hideChatButton) && !((_props$controlProps6 = props.controlProps) !== null && _props$controlProps6 !== void 0 && _props$controlProps6.skipChatButtonRendering) && shouldShowChatButton(state) && (decodeComponentString((_props$componentOverr = props.componentOverrides) === null || _props$componentOverr === void 0 ? void 0 : _props$componentOverr.chatButton) || /*#__PURE__*/React.createElement(ChatButtonStateful, {
     buttonProps: props.chatButtonProps,
     outOfOfficeButtonProps: props.outOfOfficeChatButtonProps,
     startChat: prepareStartChatRelay
-  })), !((_props$controlProps6 = props.controlProps) !== null && _props$controlProps6 !== void 0 && _props$controlProps6.hideProactiveChatPane) && shouldShowProactiveChatPane(state) && (decodeComponentString((_props$componentOverr2 = props.componentOverrides) === null || _props$componentOverr2 === void 0 ? void 0 : _props$componentOverr2.proactiveChatPane) || /*#__PURE__*/React.createElement(ProactiveChatPaneStateful, {
+  })), !((_props$controlProps7 = props.controlProps) !== null && _props$controlProps7 !== void 0 && _props$controlProps7.hideProactiveChatPane) && shouldShowProactiveChatPane(state) && (decodeComponentString((_props$componentOverr2 = props.componentOverrides) === null || _props$componentOverr2 === void 0 ? void 0 : _props$componentOverr2.proactiveChatPane) || /*#__PURE__*/React.createElement(ProactiveChatPaneStateful, {
     proactiveChatProps: props.proactiveChatPaneProps,
     startChat: prepareStartChatRelay
-  })), !((_props$controlProps7 = props.controlProps) !== null && _props$controlProps7 !== void 0 && _props$controlProps7.hideHeader) && shouldShowHeader(state) && (decodeComponentString((_props$componentOverr3 = props.componentOverrides) === null || _props$componentOverr3 === void 0 ? void 0 : _props$componentOverr3.header) || /*#__PURE__*/React.createElement(HeaderStateful, {
+  })), !((_props$controlProps8 = props.controlProps) !== null && _props$controlProps8 !== void 0 && _props$controlProps8.hideHeader) && shouldShowHeader(state) && (decodeComponentString((_props$componentOverr3 = props.componentOverrides) === null || _props$componentOverr3 === void 0 ? void 0 : _props$componentOverr3.header) || /*#__PURE__*/React.createElement(HeaderStateful, {
     headerProps: props.headerProps,
     outOfOfficeHeaderProps: props.outOfOfficeHeaderProps,
     endChat: endChatRelay
-  })), !((_props$controlProps8 = props.controlProps) !== null && _props$controlProps8 !== void 0 && _props$controlProps8.hideLoadingPane) && shouldShowLoadingPane(state) && (decodeComponentString((_props$componentOverr4 = props.componentOverrides) === null || _props$componentOverr4 === void 0 ? void 0 : _props$componentOverr4.loadingPane) || /*#__PURE__*/React.createElement(LoadingPaneStateful, props.loadingPaneProps)), !((_props$controlProps9 = props.controlProps) !== null && _props$controlProps9 !== void 0 && _props$controlProps9.hideOutOfOfficeHoursPane) && shouldShowOutOfOfficeHoursPane(state) && (decodeComponentString((_props$componentOverr5 = props.componentOverrides) === null || _props$componentOverr5 === void 0 ? void 0 : _props$componentOverr5.outOfOfficeHoursPane) || /*#__PURE__*/React.createElement(OutOfOfficeHoursPaneStateful, props.outOfOfficeHoursPaneProps)), !((_props$controlProps10 = props.controlProps) !== null && _props$controlProps10 !== void 0 && _props$controlProps10.hideReconnectChatPane) && shouldShowReconnectChatPane(state) && (decodeComponentString((_props$componentOverr6 = props.componentOverrides) === null || _props$componentOverr6 === void 0 ? void 0 : _props$componentOverr6.reconnectChatPane) || /*#__PURE__*/React.createElement(ReconnectChatPaneStateful, {
+  })), !((_props$controlProps9 = props.controlProps) !== null && _props$controlProps9 !== void 0 && _props$controlProps9.hideLoadingPane) && shouldShowLoadingPane(state) && (decodeComponentString((_props$componentOverr4 = props.componentOverrides) === null || _props$componentOverr4 === void 0 ? void 0 : _props$componentOverr4.loadingPane) || /*#__PURE__*/React.createElement(LoadingPaneStateful, props.loadingPaneProps)), !((_props$controlProps10 = props.controlProps) !== null && _props$controlProps10 !== void 0 && _props$controlProps10.hideOutOfOfficeHoursPane) && shouldShowOutOfOfficeHoursPane(state) && (decodeComponentString((_props$componentOverr5 = props.componentOverrides) === null || _props$componentOverr5 === void 0 ? void 0 : _props$componentOverr5.outOfOfficeHoursPane) || /*#__PURE__*/React.createElement(OutOfOfficeHoursPaneStateful, props.outOfOfficeHoursPaneProps)), !((_props$controlProps11 = props.controlProps) !== null && _props$controlProps11 !== void 0 && _props$controlProps11.hideReconnectChatPane) && shouldShowReconnectChatPane(state) && (decodeComponentString((_props$componentOverr6 = props.componentOverrides) === null || _props$componentOverr6 === void 0 ? void 0 : _props$componentOverr6.reconnectChatPane) || /*#__PURE__*/React.createElement(ReconnectChatPaneStateful, {
     reconnectChatProps: props.reconnectChatPaneProps,
     initStartChat: initStartChatRelay
-  })), !((_props$controlProps11 = props.controlProps) !== null && _props$controlProps11 !== void 0 && _props$controlProps11.hidePreChatSurveyPane) && shouldShowPreChatSurveyPane(state) && /*#__PURE__*/React.createElement(PreChatSurveyPaneStateful, {
+  })), !((_props$controlProps12 = props.controlProps) !== null && _props$controlProps12 !== void 0 && _props$controlProps12.hidePreChatSurveyPane) && shouldShowPreChatSurveyPane(state) && (decodeComponentString((_props$componentOverr7 = props.componentOverrides) === null || _props$componentOverr7 === void 0 ? void 0 : _props$componentOverr7.preChatSurveyPane) || /*#__PURE__*/React.createElement(PreChatSurveyPaneStateful, {
     surveyProps: props.preChatSurveyPaneProps,
     initStartChat: initStartChatRelay
-  }), !((_props$controlProps12 = props.controlProps) !== null && _props$controlProps12 !== void 0 && _props$controlProps12.hideCallingContainer) && shouldShowCallingContainer(state) && /*#__PURE__*/React.createElement(CallingContainerStateful, _extends({
+  })), !((_props$controlProps13 = props.controlProps) !== null && _props$controlProps13 !== void 0 && _props$controlProps13.hideCallingContainer) && shouldShowCallingContainer(state) && /*#__PURE__*/React.createElement(CallingContainerStateful, _extends({
     voiceVideoCallingSdk: voiceVideoCallingSDK
-  }, props.callingContainerProps)), !((_props$controlProps13 = props.controlProps) !== null && _props$controlProps13 !== void 0 && _props$controlProps13.hideWebChatContainer) && shouldShowWebChatContainer(state) && (decodeComponentString((_props$componentOverr7 = props.componentOverrides) === null || _props$componentOverr7 === void 0 ? void 0 : _props$componentOverr7.webChatContainer) || /*#__PURE__*/React.createElement(WebChatContainerStateful, props.webChatContainerProps)), !((_props$controlProps14 = props.controlProps) !== null && _props$controlProps14 !== void 0 && _props$controlProps14.hideConfirmationPane) && shouldShowConfirmationPane(state) && (decodeComponentString((_props$componentOverr8 = props.componentOverrides) === null || _props$componentOverr8 === void 0 ? void 0 : _props$componentOverr8.confirmationPane) || /*#__PURE__*/React.createElement(ConfirmationPaneStateful, _extends({}, confirmationPaneProps, {
+  }, props.callingContainerProps)), !((_props$controlProps14 = props.controlProps) !== null && _props$controlProps14 !== void 0 && _props$controlProps14.hideWebChatContainer) && shouldShowWebChatContainer(state) && (decodeComponentString((_props$componentOverr8 = props.componentOverrides) === null || _props$componentOverr8 === void 0 ? void 0 : _props$componentOverr8.webChatContainer) || /*#__PURE__*/React.createElement(WebChatContainerStateful, props.webChatContainerProps)), !((_props$controlProps15 = props.controlProps) !== null && _props$controlProps15 !== void 0 && _props$controlProps15.hideConfirmationPane) && shouldShowConfirmationPane(state) && (decodeComponentString((_props$componentOverr9 = props.componentOverrides) === null || _props$componentOverr9 === void 0 ? void 0 : _props$componentOverr9.confirmationPane) || /*#__PURE__*/React.createElement(ConfirmationPaneStateful, _extends({}, confirmationPaneProps, {
     setPostChatContext: setPostChatContextRelay,
-    endChat: endChatRelay
-  }))), !((_props$controlProps15 = props.controlProps) !== null && _props$controlProps15 !== void 0 && _props$controlProps15.hidePostChatLoadingPane) && shouldShowPostChatLoadingPane(state) && (decodeComponentString((_props$componentOverr9 = props.componentOverrides) === null || _props$componentOverr9 === void 0 ? void 0 : _props$componentOverr9.postChatLoadingPane) || /*#__PURE__*/React.createElement(PostChatLoadingPaneStateful, props.postChatLoadingPaneProps)), shouldShowPostChatSurveyPane(state) && (decodeComponentString((_props$componentOverr10 = props.componentOverrides) === null || _props$componentOverr10 === void 0 ? void 0 : _props$componentOverr10.postChatSurveyPane) || /*#__PURE__*/React.createElement(PostChatSurveyPaneStateful, _extends({}, props.postChatSurveyPaneProps, props.chatSDK))), createFooter(props, state), shouldShowEmailTranscriptPane(state) && (decodeComponentString((_props$componentOverr11 = props.componentOverrides) === null || _props$componentOverr11 === void 0 ? void 0 : _props$componentOverr11.emailTranscriptPane) || /*#__PURE__*/React.createElement(EmailTranscriptPaneStateful, props.emailTranscriptPane))));
+    prepareEndChat: prepareEndChatRelay
+  }))), !((_props$controlProps16 = props.controlProps) !== null && _props$controlProps16 !== void 0 && _props$controlProps16.hidePostChatLoadingPane) && shouldShowPostChatLoadingPane(state) && (decodeComponentString((_props$componentOverr10 = props.componentOverrides) === null || _props$componentOverr10 === void 0 ? void 0 : _props$componentOverr10.postChatLoadingPane) || /*#__PURE__*/React.createElement(PostChatLoadingPaneStateful, props.postChatLoadingPaneProps)), shouldShowPostChatSurveyPane(state) && (decodeComponentString((_props$componentOverr11 = props.componentOverrides) === null || _props$componentOverr11 === void 0 ? void 0 : _props$componentOverr11.postChatSurveyPane) || /*#__PURE__*/React.createElement(PostChatSurveyPaneStateful, _extends({}, props.postChatSurveyPaneProps, props.chatSDK))), createFooter(props, state), shouldShowEmailTranscriptPane(state) && (decodeComponentString((_props$componentOverr12 = props.componentOverrides) === null || _props$componentOverr12 === void 0 ? void 0 : _props$componentOverr12.emailTranscriptPane) || /*#__PURE__*/React.createElement(EmailTranscriptPaneStateful, props.emailTranscriptPane))));
 };
 export default LiveChatWidgetStateful;

package/lib/esm/components/postchatloadingpanestateful/PostChatLoadingPaneStateful.js

@@ -3,6 +3,8 @@ import { LoadingPane } from "@microsoft/omnichannel-chat-components";
 import { defaultGeneralPostChatLoadingPaneStyleProps } from "./common/defaultgeneralPostChatLoadingPaneStyleProps";
 import { findAllFocusableElement } from "../../common/utils";
 import useChatContextStore from "../../hooks/useChatContextStore";
+import { TelemetryHelper } from "../../common/telemetry/TelemetryHelper";
+import { LogLevel, TelemetryEvent } from "../../common/telemetry/TelemetryConstants";
 export const PostChatLoadingPaneStateful = props => {
   var _props$styleProps;
 
@@ -28,6 +30,10 @@ export const PostChatLoadingPaneStateful = props => {
     if (firstElement && firstElement[0]) {
       firstElement[0].focus();
     }
+
+    TelemetryHelper.logLoadingEvent(LogLevel.INFO, {
+      Event: TelemetryEvent.PostChatSurveyLoadingPaneLoaded
+    });
   }, []);
   return /*#__PURE__*/React.createElement(LoadingPane, {
     componentOverrides: props.componentOverrides,

package/lib/esm/components/prechatsurveypanestateful/PreChatSurveyPaneStateful.js

@@ -1,7 +1,7 @@
-import { Constants, HtmlAttributeNames, Regex } from "../../common/Constants";
+import { HtmlAttributeNames, Regex } from "../../common/Constants";
 import { LogLevel, TelemetryEvent } from "../../common/telemetry/TelemetryConstants";
 import React, { useEffect } from "react";
-import { extractPreChatSurveyResponseValues, findAllFocusableElement, parseAdaptiveCardPayload } from "../../common/utils";
+import { extractPreChatSurveyResponseValues, findAllFocusableElement, getWidgetCacheId, parseAdaptiveCardPayload } from "../../common/utils";
 import { ConversationState } from "../../contexts/common/ConversationState";
 import { DataStoreManager } from "../../common/contextDataStore/DataStoreManager";
 import { LiveChatWidgetActionType } from "../../contexts/common/LiveChatWidgetActionType";
@@ -67,13 +67,14 @@ export const PreChatSurveyPaneStateful = props => {
       });
 
       try {
-        var _DataStoreManager$cli, _persistedState$domai;
+        var _state$domainStates, _state$domainStates$t, _state$domainStates$t2, _DataStoreManager$cli, _persistedState$domai;
 
-        const widgetStateFromCache = (_DataStoreManager$cli = DataStoreManager.clientDataStore) === null || _DataStoreManager$cli === void 0 ? void 0 : _DataStoreManager$cli.getData(Constants.widgetStateDataKey, "localStorage");
+        const widgetStateCacheId = getWidgetCacheId(((_state$domainStates = state.domainStates) === null || _state$domainStates === void 0 ? void 0 : (_state$domainStates$t = _state$domainStates.telemetryInternalData) === null || _state$domainStates$t === void 0 ? void 0 : _state$domainStates$t.orgId) ?? "", ((_state$domainStates$t2 = state.domainStates.telemetryInternalData) === null || _state$domainStates$t2 === void 0 ? void 0 : _state$domainStates$t2.widgetId) ?? "");
+        const widgetStateFromCache = (_DataStoreManager$cli = DataStoreManager.clientDataStore) === null || _DataStoreManager$cli === void 0 ? void 0 : _DataStoreManager$cli.getData(widgetStateCacheId, "localStorage");
         const persistedState = widgetStateFromCache ? JSON.parse(widgetStateFromCache) : undefined;
         let optionalParams = {};
 
-        if (persistedState !== null && persistedState !== void 0 && (_persistedState$domai = persistedState.domainStates) !== null && _persistedState$domai !== void 0 && _persistedState$domai.liveChatContext) {
+        if (persistedState !== null && persistedState !== void 0 && (_persistedState$domai = persistedState.domainStates) !== null && _persistedState$domai !== void 0 && _persistedState$domai.liveChatContext && !state.appStates.skipChatButtonRendering) {
           var _persistedState$domai2;
 
           optionalParams = {
@@ -83,9 +84,7 @@ export const PreChatSurveyPaneStateful = props => {
         } else {
           const prechatResponseValues = extractPreChatSurveyResponseValues(state.domainStates.preChatSurveyResponse, values);
           optionalParams = {
-            initContext: {
-              preChatResponse: prechatResponseValues
-            }
+            preChatResponse: prechatResponseValues
           };
           setPreChatResponseEmail(values);
           await initStartChat(optionalParams);