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

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

@@ -1,19 +1,25 @@
+import { ChatSDKError, Constants } from "../../../common/Constants";
 import { LogLevel, TelemetryEvent } from "../../../common/telemetry/TelemetryConstants";
-import { ChatSDKError } from "../../../common/Constants";
 import { ConversationState } from "../../../contexts/common/ConversationState";
+import { DataStoreManager } from "../../../common/contextDataStore/DataStoreManager";
 import { LiveChatWidgetActionType } from "../../../contexts/common/LiveChatWidgetActionType";
 import { NotificationHandler } from "../../webchatcontainerstateful/webchatcontroller/notification/NotificationHandler";
 import { NotificationScenarios } from "../../webchatcontainerstateful/webchatcontroller/enums/NotificationScenarios";
 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 { updateSessionDataForTelemetry } from "./updateSessionDataForTelemetry";
-import { setPostChatContextAndLoadSurvey } from "./setPostChatContextAndLoadSurvey"; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+import { setPostChatContextAndLoadSurvey } from "./setPostChatContextAndLoadSurvey";
+import { updateSessionDataForTelemetry } from "./updateSessionDataForTelemetry"; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
 const prepareStartChat = async (props, chatSDK, state, dispatch, setAdapter) => {
-  // Getting PreChat Survey Context
+  if (await canConnectToExistingChat(props, chatSDK, state, dispatch, setAdapter)) {
+    return;
+  } // 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
@@ -48,18 +54,18 @@ const prepareStartChat = async (props, chatSDK, state, dispatch, setAdapter) =>
 }; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
 
-const initStartChat = async (chatSDK, dispatch, setAdapter, params) => {
+const initStartChat = async (chatSDK, dispatch, setAdapter, params, persistedState) => {
   try {
-    var _TelemetryTimers$Widg;
+    var _newAdapter$activity$, _TelemetryTimers$Widg;
 
     try {
-      TelemetryHelper.logConfigDataEvent(LogLevel.INFO, {
+      TelemetryTimers.WidgetLoadTimer = createTimer();
+      TelemetryHelper.logSDKEvent(LogLevel.INFO, {
         Event: TelemetryEvent.StartChatSDKCall
       });
       await chatSDK.startChat(params);
-      TelemetryTimers.WidgetLoadTimer = createTimer();
     } catch (error) {
-      TelemetryHelper.logLoadingEvent(LogLevel.ERROR, {
+      TelemetryHelper.logSDKEvent(LogLevel.ERROR, {
         Event: TelemetryEvent.StartChatMethodException,
         ExceptionDetails: {
           exception: `Failed to setup startChat: ${error}`
@@ -68,24 +74,42 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, params) => {
     }
 
     const newAdapter = await createAdapter(chatSDK);
-    setAdapter(newAdapter); // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    setAdapter(newAdapter);
+    const chatToken = await chatSDK.getChatToken();
+    newAdapter === null || newAdapter === void 0 ? void 0 : (_newAdapter$activity$ = newAdapter.activity$) === null || _newAdapter$activity$ === void 0 ? void 0 : _newAdapter$activity$.subscribe(createOnNewAdapterActivityHandler(chatToken === null || chatToken === void 0 ? void 0 : chatToken.chatId, chatToken === null || chatToken === void 0 ? void 0 : chatToken.visitorId));
 
-    if (chatSDK !== null && chatSDK !== void 0 && chatSDK.getVoiceVideoCalling) {
+    if (!persistedState) {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      const chatToken = await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.getChatToken());
+      if (chatSDK !== null && chatSDK !== void 0 && chatSDK.getVoiceVideoCalling) {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const chatToken = await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.getChatToken());
+        dispatch({
+          type: LiveChatWidgetActionType.SET_CHAT_TOKEN,
+          payload: chatToken
+        });
+      } // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+
+      const liveChatContext = await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.getCurrentLiveChatContext());
       dispatch({
-        type: LiveChatWidgetActionType.SET_CHAT_TOKEN,
-        payload: chatToken
+        type: LiveChatWidgetActionType.SET_LIVE_CHAT_CONTEXT,
+        payload: liveChatContext
       });
-    }
+      await setPostChatContextAndLoadSurvey(chatSDK, dispatch);
+      await updateSessionDataForTelemetry(chatSDK, dispatch); // Set app state to Active
 
-    await setPostChatContextAndLoadSurvey(chatSDK, dispatch, false);
-    await updateSessionDataForTelemetry(chatSDK, dispatch); // Set app state to Active
+      dispatch({
+        type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+        payload: ConversationState.Active
+      });
+    } else {
+      dispatch({
+        type: LiveChatWidgetActionType.SET_WIDGET_STATE,
+        payload: persistedState
+      });
+      await setPostChatContextAndLoadSurvey(chatSDK, dispatch, true);
+    }
 
-    dispatch({
-      type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-      payload: ConversationState.Active
-    });
     TelemetryHelper.logLoadingEvent(LogLevel.INFO, {
       Event: TelemetryEvent.WidgetLoadComplete,
       Description: "Widget load complete",
@@ -93,9 +117,9 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, params) => {
     });
   } catch (ex) {
     TelemetryHelper.logLoadingEvent(LogLevel.ERROR, {
-      Event: TelemetryEvent.StartChatFailed,
+      Event: TelemetryEvent.WidgetLoadFailed,
       ExceptionDetails: {
-        Exception: `Start Chat Failed: ${ex}`
+        Exception: `Widget load Failed: ${ex}`
       }
     });
     NotificationHandler.notifyError(NotificationScenarios.Connection, "Start Chat Failed: " + ex); // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -111,6 +135,30 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, params) => {
       });
     }
   }
+}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+
+const canConnectToExistingChat = async (props, chatSDK, state, dispatch, setAdapter) => {
+  var _DataStoreManager$cli, _persistedState$domai;
+
+  const widgetStateFromCache = (_DataStoreManager$cli = DataStoreManager.clientDataStore) === null || _DataStoreManager$cli === void 0 ? void 0 : _DataStoreManager$cli.getData(Constants.widgetStateDataKey, "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;
+
+    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
+    };
+    await initStartChat(chatSDK, dispatch, setAdapter, optionalParams, persistedState);
+    return true;
+  } else {
+    return false;
+  }
 };
 
 export { prepareStartChat, initStartChat };

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

@@ -2,14 +2,14 @@ import { LogLevel, TelemetryEvent } from "../../../common/telemetry/TelemetryCon
 import { ConversationState } from "../../../contexts/common/ConversationState";
 import { LiveChatWidgetActionType } from "../../../contexts/common/LiveChatWidgetActionType";
 import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
-import { TelemetryTimers } from "../../../common/telemetry/TelemetryManager"; // Defines startProactiveChat callback
-
-export const startProactiveChat = (dispatch, bodyTitle, showPrechat, inNewWindow) => {
+import { TelemetryTimers } from "../../../common/telemetry/TelemetryManager";
+// Defines startProactiveChat callback
+export const startProactiveChat = (dispatch, notificationConfig, enablePreChat, inNewWindow) => {
   dispatch({
     type: LiveChatWidgetActionType.SET_PROACTIVE_CHAT_PARAMS,
     payload: {
-      proactiveChatBodyTitle: bodyTitle ?? "",
-      proactiveChatEnablePrechat: showPrechat ?? false,
+      proactiveChatBodyTitle: notificationConfig && notificationConfig.message ? notificationConfig.message : "",
+      proactiveChatEnablePrechat: enablePreChat ?? false,
       proactiveChatInNewWindow: inNewWindow ?? false
     }
   });

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

@@ -1,5 +1,6 @@
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
+import { BroadcastEvent, LogLevel, TelemetryEvent } from "../../../common/telemetry/TelemetryConstants";
 import { BroadcastService, decodeComponentString } from "@microsoft/omnichannel-chat-components";
 import { Stack } from "@fluentui/react";
 import React, { useEffect, useRef, useState } from "react";
@@ -12,6 +13,7 @@ import ChatButtonStateful from "../../chatbuttonstateful/ChatButtonStateful";
 import { Components } from "botframework-webchat";
 import ConfirmationPaneStateful from "../../confirmationpanestateful/ConfirmationPaneStateful";
 import { ConversationState } from "../../../contexts/common/ConversationState";
+import { DataStoreManager } from "../../../common/contextDataStore/DataStoreManager";
 import { ElementType } from "@microsoft/omnichannel-chat-components";
 import EmailTranscriptPaneStateful from "../../emailtranscriptpanestateful/EmailTranscriptPaneStateful";
 import HeaderStateful from "../../headerstateful/HeaderStateful";
@@ -23,11 +25,13 @@ import PostChatSurveyPaneStateful from "../../postchatsurveypanestateful/PostCha
 import PreChatSurveyPaneStateful from "../../prechatsurveypanestateful/PreChatSurveyPaneStateful";
 import ProactiveChatPaneStateful from "../../proactivechatpanestateful/ProactiveChatPaneStateful";
 import ReconnectChatPaneStateful from "../../reconnectchatpanestateful/ReconnectChatPaneStateful";
+import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
 import { TelemetryTimers } from "../../../common/telemetry/TelemetryManager";
 import WebChatContainerStateful from "../../webchatcontainerstateful/WebChatContainerStateful";
 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 { getGeneralStylesForButton } from "../common/getGeneralStylesForButton";
 import { initCallingSdk } from "../common/initCallingSdk";
@@ -67,6 +71,7 @@ export const LiveChatWidgetStateful = props => {
 
     registerTelemetryLoggers(props, dispatch);
     createInternetConnectionChangeHandler();
+    DataStoreManager.clientDataStore = props.contextDataStore ?? undefined;
     dispatch({
       type: LiveChatWidgetActionType.SET_WIDGET_ELEMENT_ID,
       payload: widgetElementId
@@ -138,28 +143,43 @@ export const LiveChatWidgetStateful = props => {
   }, [state.appStates.skipChatButtonRendering]);
   useEffect(() => {
     BroadcastService.getMessageByEventName("StartProactiveChat").subscribe(msg => {
+      TelemetryHelper.logActionEvent(LogLevel.INFO, {
+        Event: TelemetryEvent.StartProactiveChatEventReceived,
+        Description: "Start proactive chat event received."
+      });
+
       if (canStartProactiveChat.current) {
         var _msg$payload, _msg$payload2, _msg$payload3;
 
-        startProactiveChat(dispatch, msg === null || msg === void 0 ? void 0 : (_msg$payload = msg.payload) === null || _msg$payload === void 0 ? void 0 : _msg$payload.bodyTitle, msg === null || msg === void 0 ? void 0 : (_msg$payload2 = msg.payload) === null || _msg$payload2 === void 0 ? void 0 : _msg$payload2.showPrechat, msg === null || msg === void 0 ? void 0 : (_msg$payload3 = msg.payload) === null || _msg$payload3 === void 0 ? void 0 : _msg$payload3.inNewWindow);
+        startProactiveChat(dispatch, msg === null || msg === void 0 ? void 0 : (_msg$payload = msg.payload) === null || _msg$payload === void 0 ? void 0 : _msg$payload.notificationConfig, msg === null || msg === void 0 ? void 0 : (_msg$payload2 = msg.payload) === null || _msg$payload2 === void 0 ? void 0 : _msg$payload2.enablePreChat, msg === null || msg === void 0 ? void 0 : (_msg$payload3 = msg.payload) === null || _msg$payload3 === void 0 ? void 0 : _msg$payload3.inNewWindow);
+      } else {
+        TelemetryHelper.logActionEvent(LogLevel.INFO, {
+          Event: TelemetryEvent.ChatAlreadyTriggered,
+          Description: "Start proactive chat method called, when chat was already triggered."
+        });
       }
     });
+    window.addEventListener("beforeunload", () => {
+      disposeTelemetryLoggers();
+    });
+
+    if (state.appStates.conversationEndedByAgent) {
+      endChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter);
+    }
   }, []);
   useEffect(() => {
-    if (state.appStates.conversationState !== ConversationState.Closed) {
-      canStartProactiveChat.current = false;
-    }
+    canStartProactiveChat.current = state.appStates.conversationState === ConversationState.Closed;
 
     if (state.appStates.conversationState === ConversationState.Active) {
       chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.onNewMessage(() => {
         BroadcastService.postMessage({
-          eventName: "NewMessageNotification"
+          eventName: BroadcastEvent.NewMessageNotification
         });
       });
     } // Track the message count
 
 
-    if (state.appStates.conversationState == ConversationState.Active) {
+    if (state.appStates.conversationState === ConversationState.Active) {
       chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.onNewMessage(() => {
         currentMessageCountRef.current++;
         dispatch({
@@ -178,7 +198,7 @@ export const LiveChatWidgetStateful = props => {
     });
     const customEvent = {
       elementType: ElementType.Custom,
-      eventName: "UnreadMessageCount",
+      eventName: BroadcastEvent.UnreadMessageCount,
       payload: 0
     };
     BroadcastService.postMessage(customEvent);
@@ -188,7 +208,7 @@ export const LiveChatWidgetStateful = props => {
     if (state.appStates.isMinimized && state.appStates.unreadMessageCount > 0) {
       const customEvent = {
         elementType: ElementType.Custom,
-        eventName: "UnreadMessageCount",
+        eventName: BroadcastEvent.UnreadMessageCount,
         payload: `${state.appStates.unreadMessageCount}`
       };
       BroadcastService.postMessage(customEvent);
@@ -203,23 +223,26 @@ export const LiveChatWidgetStateful = props => {
   }, [(_props$webChatContain3 = props.webChatContainerProps) === null || _props$webChatContain3 === void 0 ? void 0 : _props$webChatContain3.webChatStyles]);
   const webChatProps = initWebChatComposer(props, chatSDK, state, dispatch, setWebChatStyles);
 
-  const setPostChatContextRelay = () => setPostChatContextAndLoadSurvey(chatSDK, dispatch, true);
+  const setPostChatContextRelay = () => setPostChatContextAndLoadSurvey(chatSDK, dispatch); // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
 
-  const endChatRelay = () => endChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter);
+  const endChatRelay = (adapter, skipEndChatSDK, skipCloseChat) => endChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, skipEndChatSDK, skipCloseChat);
 
   const prepareStartChatRelay = () => prepareStartChat(props, chatSDK, state, dispatch, setAdapter); // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
 
-  const initStartChatRelay = optionalParams => initStartChat(chatSDK, dispatch, setAdapter, optionalParams);
+  const initStartChatRelay = (optionalParams, persistedState) => initStartChat(chatSDK, dispatch, setAdapter, optionalParams, persistedState);
 
   const confirmationPaneProps = initConfirmationPropsComposer(props); // publish chat widget state
 
-  const chatWidgetStateChangeEvent = {
-    eventName: "ChatWidgetStateChanged",
-    payload: { ...state
-    }
-  };
-  BroadcastService.postMessage(chatWidgetStateChangeEvent);
+  useEffect(() => {
+    const chatWidgetStateChangeEvent = {
+      eventName: BroadcastEvent.ChatWidgetStateChanged,
+      payload: { ...state
+      }
+    };
+    BroadcastService.postMessage(chatWidgetStateChangeEvent);
+  }, [state]);
   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

package/lib/esm/components/loadingpanestateful/LoadingPaneStateful.js

@@ -26,7 +26,7 @@ export const LoadingPaneStateful = props => {
       firstElement[0].focus();
     }
 
-    TelemetryHelper.logActionEvent(LogLevel.INFO, {
+    TelemetryHelper.logLoadingEvent(LogLevel.INFO, {
       Event: TelemetryEvent.LoadingPaneLoaded,
       Description: "Loading pane loaded."
     });

package/lib/esm/components/ooohpanestateful/OOOHPaneStateful.js

@@ -1,5 +1,7 @@
+import { LogLevel, TelemetryEvent } from "../../common/telemetry/TelemetryConstants";
 import React, { useEffect } from "react";
 import { OutOfOfficeHoursPane } from "@microsoft/omnichannel-chat-components";
+import { TelemetryHelper } from "../../common/telemetry/TelemetryHelper";
 import { defaultGeneralStyleProps } from "./common/defaultStyleProps/defaultgeneralOOOHPaneStyleProps";
 import { findAllFocusableElement } from "../../common/utils";
 import useChatContextStore from "../../hooks/useChatContextStore";
@@ -23,6 +25,10 @@ export const OutOfOfficeHoursPaneStateful = props => {
     if (firstElement && firstElement[0]) {
       firstElement[0].focus();
     }
+
+    TelemetryHelper.logLoadingEvent(LogLevel.INFO, {
+      Event: TelemetryEvent.OutOfOfficePaneLoaded
+    });
   }, []);
   return /*#__PURE__*/React.createElement(OutOfOfficeHoursPane, {
     componentOverrides: props.componentOverrides,

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

@@ -1,10 +1,11 @@
+import { Constants, 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 { ConversationState } from "../../contexts/common/ConversationState";
+import { DataStoreManager } from "../../common/contextDataStore/DataStoreManager";
 import { LiveChatWidgetActionType } from "../../contexts/common/LiveChatWidgetActionType";
 import { PreChatSurveyPane } from "@microsoft/omnichannel-chat-components";
-import { HtmlAttributeNames, Regex } from "../../common/Constants";
 import { TelemetryHelper } from "../../common/telemetry/TelemetryHelper";
 import { defaultGeneralPreChatSurveyPaneStyleProps } from "./common/defaultStyles/defaultGeneralPreChatSurveyPaneStyleProps";
 import { defaultPreChatSurveyLocalizedTexts } from "./common/defaultProps/defaultPreChatSurveyLocalizedTexts";
@@ -39,7 +40,7 @@ export const PreChatSurveyPaneStateful = props => {
     try {
       return parseAdaptiveCardPayload(payload, requiredFieldMissingMessage);
     } catch (ex) {
-      TelemetryHelper.logLoadingEvent(LogLevel.ERROR, {
+      TelemetryHelper.logConfigDataEvent(LogLevel.ERROR, {
         Event: TelemetryEvent.ParseAdaptiveCardFailed,
         Description: "Adaptive Card JSON Parse Failed.",
         ExceptionDetails: {
@@ -66,14 +67,29 @@ export const PreChatSurveyPaneStateful = props => {
       });
 
       try {
-        const prechatResponseValues = extractPreChatSurveyResponseValues(state.domainStates.preChatSurveyResponse, values);
-        const optionalParams = {
-          initContext: {
-            preChatResponse: prechatResponseValues
-          }
-        };
-        setPreChatResponseEmail(values);
-        await initStartChat(optionalParams);
+        var _DataStoreManager$cli, _persistedState$domai;
+
+        const widgetStateFromCache = (_DataStoreManager$cli = DataStoreManager.clientDataStore) === null || _DataStoreManager$cli === void 0 ? void 0 : _DataStoreManager$cli.getData(Constants.widgetStateDataKey, "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) {
+          var _persistedState$domai2;
+
+          optionalParams = {
+            liveChatContext: persistedState === null || persistedState === void 0 ? void 0 : (_persistedState$domai2 = persistedState.domainStates) === null || _persistedState$domai2 === void 0 ? void 0 : _persistedState$domai2.liveChatContext
+          };
+          await initStartChat(optionalParams, persistedState);
+        } else {
+          const prechatResponseValues = extractPreChatSurveyResponseValues(state.domainStates.preChatSurveyResponse, values);
+          optionalParams = {
+            initContext: {
+              preChatResponse: prechatResponseValues
+            }
+          };
+          setPreChatResponseEmail(values);
+          await initStartChat(optionalParams);
+        }
       } catch (ex) {
         TelemetryHelper.logActionEvent(LogLevel.ERROR, {
           Event: TelemetryEvent.PreChatSurveyStartChatMethodFailed,

package/lib/esm/components/proactivechatpanestateful/ProactiveChatPaneStateful.js

@@ -1,4 +1,4 @@
-import { LogLevel, TelemetryEvent } from "../../common/telemetry/TelemetryConstants";
+import { BroadcastEvent, LogLevel, TelemetryEvent } from "../../common/telemetry/TelemetryConstants";
 import React, { useEffect, useState } from "react";
 import { createTimer, setFocusOnElement } from "../../common/utils";
 import { BroadcastService } from "@microsoft/omnichannel-chat-components";
@@ -28,7 +28,7 @@ export const ProactiveChatPaneStateful = props => {
         type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
         payload: ConversationState.Closed
       });
-      TelemetryHelper.logLoadingEvent(LogLevel.INFO, {
+      TelemetryHelper.logActionEvent(LogLevel.INFO, {
         Event: TelemetryEvent.ProactiveChatRejected,
         ElapsedTimeInMilliseconds: TelemetryTimers.LcwLoadToChatButtonTimer.milliSecondsElapsed,
         Description: "Proactive chat invitation timed out."
@@ -51,12 +51,12 @@ export const ProactiveChatPaneStateful = props => {
       if (state.appStates.proactiveChatStates.proactiveChatInNewWindow) {
         // TODO: BroadcastService: replace with the sdk broadcast service, when in place
         const startPopoutChatEvent = {
-          eventName: "StartPopoutChat"
+          eventName: BroadcastEvent.ProactiveChatStartPopoutChat
         };
         BroadcastService.postMessage(startPopoutChatEvent);
         dispatch({
-          type: LiveChatWidgetActionType.SET_SKIP_CHAT_BUTTON_RENDERING,
-          payload: true
+          type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+          payload: ConversationState.Closed
         });
       } else if (((_state$domainStates$l = state.domainStates.liveChatConfig) === null || _state$domainStates$l === void 0 ? void 0 : (_state$domainStates$l2 = _state$domainStates$l.LiveWSAndLiveChatEngJoin) === null || _state$domainStates$l2 === void 0 ? void 0 : _state$domainStates$l2.OutOfOperatingHours) === "True") {
         dispatch({
@@ -68,6 +68,10 @@ export const ProactiveChatPaneStateful = props => {
           payload: ConversationState.OutOfOffice
         });
       } else {
+        const proactiveChatStarted = {
+          eventName: BroadcastEvent.ProactiveChatStartChat
+        };
+        BroadcastService.postMessage(proactiveChatStarted);
         await startChat();
       }
     },

package/lib/esm/components/proactivechatpanestateful/interfaces/IProactiveChatNotificationConfig.js

@@ -0,0 +1 @@
+export {};

package/lib/esm/components/webchatcontainerstateful/common/mockchatsdk.js

@@ -14,6 +14,10 @@ export class MockChatSDK {
     return null;
   }
 
+  getChatToken() {
+    return null;
+  }
+
   createChatAdapter() {
     return new MockAdapter();
   } // eslint-disable-next-line @typescript-eslint/no-unused-vars

package/lib/esm/components/webchatcontainerstateful/common/utils/FileAttachmentIconManager.js

@@ -1,16 +1,6 @@
-import { BrowserVendor } from "../../webchatcontroller/enums/BrowserVendor";
+import { ArchiveIcon, AudioIcon, BlankIcon, ExcelIcon, ImageIcon, OneNoteIcon, PDFIcon, PowerpointIcon, VideoIcon, VisioIcon, WordIcon } from "../../../../assets/Icons";
 import { getBrowserName, isChromiumEdge } from "./BrowserInfo";
-import ArchiveIcon from "../../../../assets/icons/archiveIcon.svg";
-import AudioIcon from "../../../../assets/icons/audioIcon.svg";
-import BlankIcon from "../../../../assets/icons/blankIcon.svg";
-import VideoIcon from "../../../../assets/icons/videoIcon.svg";
-import ImageIcon from "../../../../assets/icons/imageIcon.svg";
-import WordIcon from "../../../../assets/icons/wordIcon.svg";
-import OneNoteIcon from "../../../../assets/icons/oneNoteIcon.svg";
-import PowerpointIcon from "../../../../assets/icons/powerpointIcon.svg";
-import VisioIcon from "../../../../assets/icons/visioIcon.svg";
-import PDFIcon from "../../../../assets/icons/pdfIcon.svg";
-import ExcelIcon from "../../../../assets/icons/excelIcon.svg";
+import { BrowserVendor } from "../../webchatcontroller/enums/BrowserVendor";
 import { Constants } from "../../../../common/Constants";
 const FileAttachmentIconMap = {
   "aac": AudioIcon,

package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/activityMiddleware.js

@@ -5,59 +5,19 @@
  * 1. Renders system messages differently, according to Microsoft LiveChatWidget styles
  * 2. Changes the font size of user messages
  * 3. Decodes certain html characters that came through from chat services
- * 4. Triggers end conversation sequence when the chat thread is deleted
  ******/
-import React from "react";
+import { LogLevel, TelemetryEvent } from "../../../../../common/telemetry/TelemetryConstants";
 import { Constants } from "../../../../../common/Constants";
 import { DirectLineActivityType } from "../../enums/DirectLineActivityType";
 import { DirectLineSenderRole } from "../../enums/DirectLineSenderRole";
 import { MessageTypes } from "../../enums/MessageType";
+import React from "react";
+import { TelemetryHelper } from "../../../../../common/telemetry/TelemetryHelper";
 import { defaultSystemMessageStyles } from "./defaultStyles/defaultSystemMessageStyles";
 import { defaultUserMessageStyles } from "./defaultStyles/defaultUserMessageStyles";
 import { escapeHtml } from "../../../../../common/utils";
-import { TelemetryHelper } from "../../../../../common/telemetry/TelemetryHelper";
-import { LogLevel, TelemetryEvent } from "../../../../../common/telemetry/TelemetryConstants";
 const loggedSystemMessages = new Array(); // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
-const handleThreadUpdate = channelData => {
-  var _channelData$properti, _channelData$properti2;
-
-  TelemetryHelper.logActionEvent(LogLevel.INFO, {
-    Event: TelemetryEvent.IC3ThreadUpdateEventReceived,
-    Description: "IC3 ThreadUpdateEvent Received"
-  });
-
-  const postConversationEndedAction = () => {
-    TelemetryHelper.logActionEvent(LogLevel.INFO, {
-      Event: TelemetryEvent.ConversationEndedThreadEventReceived,
-      Description: "Conversation is ended by agent side or by timeout."
-    });
-  }; // If the Thread is deleted, then display post conversation survey if enabled.
-
-
-  const isThreadDeleted = (channelData === null || channelData === void 0 ? void 0 : (_channelData$properti = channelData.properties) === null || _channelData$properti === void 0 ? void 0 : (_channelData$properti2 = _channelData$properti.isdeleted) === null || _channelData$properti2 === void 0 ? void 0 : _channelData$properti2.toLowerCase()) === Constants.true;
-
-  if (isThreadDeleted) {
-    postConversationEndedAction();
-    return;
-  } //check if customer is still in the thread
-
-
-  if (channelData.members && channelData.members.length > 0) {
-    for (let i = 0; i < channelData.members.length; i++) {
-      const id = channelData.members[i].id;
-      const tag = channelData.members[i].tag; // In case of ACS customer is not removed from thread and has "left" tag
-
-      if (id.startsWith(Constants.visitorIdPrefix) && tag !== Constants.left) {
-        return;
-      }
-    }
-  }
-
-  postConversationEndedAction();
-}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
-
 const handleSystemMessage = (next, args, card, systemMessageStyleProps) => {
   var _card$activity, _card$activity$channe, _card$activity$channe2, _card$activity2, _card$activity2$chann, _card$activity3, _card$activity3$chann, _card$activity3$chann2, _card$activity4, _card$activity4$chann, _card$activity5, _card$activity5$chann, _card$nextVisibleActi, _card$nextVisibleActi2, _card$activity6, _card$activity6$chann, _card$activity7, _card$nextVisibleActi3, _card$activity8;
 
@@ -108,7 +68,10 @@ export const createActivityMiddleware = (systemMessageStyleProps, userMessageSty
       var _card$activity$channe3;
 
       if (((_card$activity$channe3 = card.activity.channelData) === null || _card$activity$channe3 === void 0 ? void 0 : _card$activity$channe3.type) === MessageTypes.Thread) {
-        handleThreadUpdate(card.activity.channelData);
+        TelemetryHelper.logActionEvent(LogLevel.INFO, {
+          Event: TelemetryEvent.IC3ThreadUpdateEventReceived,
+          Description: "IC3 ThreadUpdateEvent Received"
+        });
       }
 
       return () => false;

package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/attachmentMiddleware.js

@@ -8,6 +8,7 @@
 import { Constants, MimeTypes, WebChatMiddlewareConstants } from "../../../../../common/Constants";
 import React from "react";
 import { getFileAttachmentIconData, isInlineMediaSupported } from "../../../common/utils/FileAttachmentIconManager";
+import { BroadcastEvent } from "../../../../../common/telemetry/TelemetryConstants";
 import { BroadcastService } from "@microsoft/omnichannel-chat-components";
 import { WebChatActionType } from "../../enums/WebChatActionType";
 import { defaultAttachmentAdaptiveCardStyles } from "./defaultStyles/defaultAtttachmentAdaptiveCardStyles";
@@ -187,7 +188,7 @@ const createAttachmentMiddleware = enableInlinePlaying => {
       } catch (e) {
         const errorData = "Unable to parse the adaptive card format";
         BroadcastService.postMessage({
-          eventName: "InvalidAdaptiveCardFormat",
+          eventName: BroadcastEvent.InvalidAdaptiveCardFormat,
           payload: {
             Message: errorData,
             ExceptionDetails: e

package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/conversationEndMiddleware.js

@@ -17,22 +17,22 @@ const createConversationEndMiddleware = conversationEndCallback => _ref => {
     var _action$payload;
 
     if ((action === null || action === void 0 ? void 0 : action.type) == WebChatActionType.DIRECT_LINE_INCOMING_ACTIVITY && (_action$payload = action.payload) !== null && _action$payload !== void 0 && _action$payload.activity) {
-      var _activity$from, _activity$from2, _activity$channelData5, _activity$channelData6;
+      var _activity$from, _activity$from2, _activity$channelData7, _activity$channelData8;
 
       const activity = action.payload.activity;
 
       if (((_activity$from = activity.from) === null || _activity$from === void 0 ? void 0 : _activity$from.role) === DirectLineSenderRole.Bot && activity.channelId === "ACS_CHANNEL") {
-        var _activity$channelData, _activity$channelData2, _activity$channelData3, _activity$channelData4;
+        var _activity$channelData, _activity$channelData2, _activity$channelData3, _activity$channelData4, _activity$channelData5, _activity$channelData6;
 
         // ACS
-        if ((_activity$channelData = activity.channelData) !== null && _activity$channelData !== void 0 && (_activity$channelData2 = _activity$channelData.tags) !== null && _activity$channelData2 !== void 0 && _activity$channelData2.includes(Constants.systemMessageTag) && (_activity$channelData3 = activity.channelData) !== null && _activity$channelData3 !== void 0 && (_activity$channelData4 = _activity$channelData3.tags) !== null && _activity$channelData4 !== void 0 && _activity$channelData4.includes(Constants.agentEndConversationMessageTag)) {
+        if ((_activity$channelData = activity.channelData) !== null && _activity$channelData !== void 0 && (_activity$channelData2 = _activity$channelData.tags) !== null && _activity$channelData2 !== void 0 && _activity$channelData2.includes(Constants.systemMessageTag) && ((_activity$channelData3 = activity.channelData) !== null && _activity$channelData3 !== void 0 && (_activity$channelData4 = _activity$channelData3.tags) !== null && _activity$channelData4 !== void 0 && _activity$channelData4.includes(Constants.agentEndConversationMessageTag) || (_activity$channelData5 = activity.channelData) !== null && _activity$channelData5 !== void 0 && (_activity$channelData6 = _activity$channelData5.tags) !== null && _activity$channelData6 !== void 0 && _activity$channelData6.includes(Constants.supervisorForceCloseMessageTag))) {
           conversationEndCallback();
         }
-      } else if (((_activity$from2 = activity.from) === null || _activity$from2 === void 0 ? void 0 : _activity$from2.role) === DirectLineSenderRole.Channel && ((_activity$channelData5 = activity.channelData) === null || _activity$channelData5 === void 0 ? void 0 : _activity$channelData5.type) === MessageTypes.Thread && (_activity$channelData6 = activity.channelData) !== null && _activity$channelData6 !== void 0 && _activity$channelData6.properties) {
-        var _activity$channelData7, _activity$channelData8, _activity$channelData9, _activity$channelData10;
+      } else if (((_activity$from2 = activity.from) === null || _activity$from2 === void 0 ? void 0 : _activity$from2.role) === DirectLineSenderRole.Channel && ((_activity$channelData7 = activity.channelData) === null || _activity$channelData7 === void 0 ? void 0 : _activity$channelData7.type) === MessageTypes.Thread && (_activity$channelData8 = activity.channelData) !== null && _activity$channelData8 !== void 0 && _activity$channelData8.properties) {
+        var _activity$channelData9, _activity$channelData10, _activity$channelData11, _activity$channelData12;
 
         // IC3
-        if (((_activity$channelData7 = activity.channelData) === null || _activity$channelData7 === void 0 ? void 0 : (_activity$channelData8 = _activity$channelData7.properties) === null || _activity$channelData8 === void 0 ? void 0 : _activity$channelData8.isdeleted) === Constants.truePascal || !((_activity$channelData9 = activity.channelData) !== null && _activity$channelData9 !== void 0 && (_activity$channelData10 = _activity$channelData9.properties) !== null && _activity$channelData10 !== void 0 && _activity$channelData10.containsExternalEntitiesListeningAll)) {
+        if (((_activity$channelData9 = activity.channelData) === null || _activity$channelData9 === void 0 ? void 0 : (_activity$channelData10 = _activity$channelData9.properties) === null || _activity$channelData10 === void 0 ? void 0 : _activity$channelData10.isdeleted) === Constants.truePascal || !((_activity$channelData11 = activity.channelData) !== null && _activity$channelData11 !== void 0 && (_activity$channelData12 = _activity$channelData11.properties) !== null && _activity$channelData12 !== void 0 && _activity$channelData12.containsExternalEntitiesListeningAll)) {
           conversationEndCallback();
         }
       }

package/lib/esm/contexts/common/ConversationState.js

@@ -7,6 +7,7 @@ export let ConversationState;
   ConversationState[ConversationState["OutOfOffice"] = 3] = "OutOfOffice";
   ConversationState[ConversationState["ProactiveChat"] = 4] = "ProactiveChat";
   ConversationState[ConversationState["Active"] = 5] = "Active";
-  ConversationState[ConversationState["Postchat"] = 6] = "Postchat";
-  ConversationState[ConversationState["Closed"] = 7] = "Closed";
+  ConversationState[ConversationState["InActive"] = 6] = "InActive";
+  ConversationState[ConversationState["Postchat"] = 7] = "Postchat";
+  ConversationState[ConversationState["Closed"] = 8] = "Closed";
 })(ConversationState || (ConversationState = {}));

package/lib/esm/contexts/common/LiveChatWidgetActionType.js

@@ -28,4 +28,8 @@ export let LiveChatWidgetActionType;
   LiveChatWidgetActionType[LiveChatWidgetActionType["SET_TELEMETRY_DATA"] = 24] = "SET_TELEMETRY_DATA";
   LiveChatWidgetActionType[LiveChatWidgetActionType["SET_RECONNECT_ID"] = 25] = "SET_RECONNECT_ID";
   LiveChatWidgetActionType[LiveChatWidgetActionType["SET_UNREAD_MESSAGE_COUNT"] = 26] = "SET_UNREAD_MESSAGE_COUNT";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_FOCUS_CHAT_BUTTON"] = 27] = "SET_FOCUS_CHAT_BUTTON";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_CONVERSATION_ENDED_BY_AGENT"] = 28] = "SET_CONVERSATION_ENDED_BY_AGENT";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_WIDGET_STATE"] = 29] = "SET_WIDGET_STATE";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_LIVE_CHAT_CONTEXT"] = 30] = "SET_LIVE_CHAT_CONTEXT";
 })(LiveChatWidgetActionType || (LiveChatWidgetActionType = {}));