@microsoft/omnichannel-chat-widget 0.1.0-main.89c6531 → 0.1.0-main.eb80fb1

package/lib/cjs/components/livechatwidget/common/endChat.js

@@ -7,6 +7,8 @@ exports.endChat = void 0;
 
 var _TelemetryConstants = require("../../../common/telemetry/TelemetryConstants");
 
+var _omnichannelChatComponents = require("@microsoft/omnichannel-chat-components");
+
 var _ConversationState = require("../../../contexts/common/ConversationState");
 
 var _LiveChatWidgetActionType = require("../../../contexts/common/LiveChatWidgetActionType");
@@ -21,14 +23,12 @@ var _WebChatStoreLoader = require("../../webchatcontainerstateful/webchatcontrol
 
 var _defaultWebChatContainerStatefulProps = require("../../webchatcontainerstateful/common/defaultProps/defaultWebChatContainerStatefulProps");
 
-var _omnichannelChatComponents = require("@microsoft/omnichannel-chat-components");
-
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const endChat = async (props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter) => {
   try {
     var _props$webChatContain;
 
-    _TelemetryHelper.TelemetryHelper.logConfigDataEvent(_TelemetryConstants.LogLevel.INFO, {
+    _TelemetryHelper.TelemetryHelper.logSDKEvent(_TelemetryConstants.LogLevel.INFO, {
       Event: _TelemetryConstants.TelemetryEvent.EndChatSDKCall
     });
 
@@ -43,6 +43,10 @@ const endChat = async (props, chatSDK, setAdapter, setWebChatStyles, dispatch, a
       type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
       payload: _ConversationState.ConversationState.Closed
     });
+    dispatch({
+      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_ENDED_BY_AGENT,
+      payload: false
+    });
     dispatch({
       type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_RECONNECT_ID,
       payload: undefined
@@ -55,6 +59,10 @@ const endChat = async (props, chatSDK, setAdapter, setWebChatStyles, dispatch, a
       type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CHAT_TOKEN,
       payload: undefined
     });
+    dispatch({
+      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_LIVE_CHAT_CONTEXT,
+      payload: undefined
+    });
 
     _omnichannelChatComponents.BroadcastService.postMessage({
       eventName: "EndChat"

package/lib/cjs/components/livechatwidget/common/initCallingSdk.js

@@ -17,6 +17,11 @@ const initCallingSdk = async (chatSDK, setVoiceVideoCallingSDK) => {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       const callingSDK = await chatSDK.getVoiceVideoCalling();
       setVoiceVideoCallingSDK(callingSDK);
+
+      _TelemetryHelper.TelemetryHelper.logCallingEvent(_TelemetryConstants.LogLevel.ERROR, {
+        Event: _TelemetryConstants.TelemetryEvent.CallingSDKLoadSuccess
+      });
+
       return true;
     }
 

package/lib/cjs/components/livechatwidget/common/initWebChatComposer.js

@@ -7,8 +7,6 @@ exports.initWebChatComposer = void 0;
 
 var _botframeworkWebchat = require("botframework-webchat");
 
-var _ConversationState = require("../../../contexts/common/ConversationState");
-
 var _LiveChatWidgetActionType = require("../../../contexts/common/LiveChatWidgetActionType");
 
 var _PostChatSurveyMode = require("../../postchatsurveypanestateful/enums/PostChatSurveyMode");
@@ -55,7 +53,7 @@ var _preProcessingMiddleware = _interopRequireDefault(require("../../webchatcont
 
 var _sanitizationMiddleware = _interopRequireDefault(require("../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/sanitizationMiddleware"));
 
-var _setPostChatContextAndLoadSurvey = require("./setPostChatContextAndLoadSurvey");
+var _omnichannelChatComponents = require("@microsoft/omnichannel-chat-components");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -89,15 +87,16 @@ const initWebChatComposer = (props, chatSDK, state, dispatch, setWebChatStyles)
       }
 
       if (isPostChatEnabled === "true" && postChatSurveyMode === _PostChatSurveyMode.PostChatSurveyMode.Embed) {
+        const loadPostChatEvent = {
+          eventName: "LoadPostChatSurvey"
+        };
+
+        _omnichannelChatComponents.BroadcastService.postMessage(loadPostChatEvent);
+      } else {
         dispatch({
-          type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_SHOULD_SHOW_POST_CHAT,
+          type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_ENDED_BY_AGENT,
           payload: true
         });
-        dispatch({
-          type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-          payload: _ConversationState.ConversationState.Loading
-        });
-        await (0, _setPostChatContextAndLoadSurvey.setPostChatContextAndLoadSurvey)(chatSDK, dispatch, true);
       }
 
       dispatch({

package/lib/cjs/components/livechatwidget/common/registerTelemetryLoggers.js

@@ -17,9 +17,21 @@ var _defaultTelemetryInternalData = require("../../../common/telemetry/defaultCo
 
 var _defaultTelemetryConfiguration = require("../../../common/telemetry/defaultConfigs/defaultTelemetryConfiguration");
 
+var _package = require("@microsoft/omnichannel-chat-components/package.json");
+
+var _package2 = require("@microsoft/omnichannel-chat-sdk/package.json");
+
 const registerTelemetryLoggers = (props, dispatch) => {
   var _props$liveChatContex, _props$liveChatContex2;
 
+  let widgetPackageInfo;
+
+  try {
+    widgetPackageInfo = require("@microsoft/omnichannel-chat-widget/package.json");
+  } catch (error) {
+    widgetPackageInfo = "0.0.0-0";
+  }
+
   const telemetryConfig = { ..._defaultTelemetryConfiguration.defaultTelemetryConfiguration,
     ...props.telemetryConfig
   };
@@ -29,6 +41,8 @@ const registerTelemetryLoggers = (props, dispatch) => {
 
     _TelemetryManager.TelemetryManager.InternalTelemetryData = (_props$liveChatContex3 = props.liveChatContextFromCache) === null || _props$liveChatContex3 === void 0 ? void 0 : (_props$liveChatContex4 = _props$liveChatContex3.domainStates) === null || _props$liveChatContex4 === void 0 ? void 0 : _props$liveChatContex4.telemetryInternalData;
   } else {
+    var _props$chatSDK, _props$chatSDK$omnich, _props$chatSDK2, _props$chatSDK2$omnic, _props$chatSDK3, _props$chatSDK3$omnic;
+
     let telemetryData = { ..._defaultTelemetryInternalData.defaultInternalTelemetryData,
       telemetryConfig: Object.assign({}, _defaultTelemetryConfiguration.defaultTelemetryConfiguration, telemetryConfig),
       ariaConfig: Object.assign({}, _defaultAriaConfig.defaultAriaConfig, telemetryConfig === null || telemetryConfig === void 0 ? void 0 : telemetryConfig.ariaConfigurations)
@@ -39,9 +53,12 @@ const registerTelemetryLoggers = (props, dispatch) => {
     }
 
     telemetryData = _TelemetryHelper.TelemetryHelper.addWidgetDataToTelemetry(telemetryConfig, telemetryData);
-    telemetryData.OCChatSDKVersion = telemetryConfig === null || telemetryConfig === void 0 ? void 0 : telemetryConfig.OCChatSDKVersion;
-    telemetryData.chatComponentVersion = telemetryConfig === null || telemetryConfig === void 0 ? void 0 : telemetryConfig.chatComponentVersion;
-    telemetryData.chatWidgetVersion = telemetryConfig === null || telemetryConfig === void 0 ? void 0 : telemetryConfig.chatWidgetVersion;
+    telemetryData.OCChatSDKVersion = _package2.version;
+    telemetryData.chatComponentVersion = _package.version;
+    telemetryData.chatWidgetVersion = widgetPackageInfo;
+    telemetryData.orgId = (_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;
+    telemetryData.widgetId = (_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;
+    telemetryData.orgUrl = (_props$chatSDK3 = props.chatSDK) === null || _props$chatSDK3 === void 0 ? void 0 : (_props$chatSDK3$omnic = _props$chatSDK3.omnichannelConfig) === null || _props$chatSDK3$omnic === void 0 ? void 0 : _props$chatSDK3$omnic.orgUrl;
     dispatch({
       type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_TELEMETRY_DATA,
       payload: telemetryData

package/lib/cjs/components/livechatwidget/common/setPostChatContextAndLoadSurvey.js

@@ -13,21 +13,25 @@ var _TelemetryHelper = require("../../../common/telemetry/TelemetryHelper");
 
 var _ConversationState = require("../../../contexts/common/ConversationState");
 
+var _omnichannelChatComponents = require("@microsoft/omnichannel-chat-components");
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const setPostChatContextAndLoadSurvey = async (chatSDK, dispatch, loadSurvey) => {
+const setPostChatContextAndLoadSurvey = async (chatSDK, dispatch, persistedChat) => {
   try {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const context = await chatSDK.getPostChatSurveyContext();
-
-    _TelemetryHelper.TelemetryHelper.logSDKEvent(_TelemetryConstants.LogLevel.INFO, {
-      Event: _TelemetryConstants.TelemetryEvent.PostChatContextCallSucceed,
-      Description: "Postchat context call succeed."
-    });
-
-    dispatch({
-      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_POST_CHAT_CONTEXT,
-      payload: context
-    });
+    if (!persistedChat) {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const context = await chatSDK.getPostChatSurveyContext();
+
+      _TelemetryHelper.TelemetryHelper.logSDKEvent(_TelemetryConstants.LogLevel.INFO, {
+        Event: _TelemetryConstants.TelemetryEvent.PostChatContextCallSucceed,
+        Description: "Postchat context call succeed."
+      });
+
+      dispatch({
+        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_POST_CHAT_CONTEXT,
+        payload: context
+      });
+    }
   } catch (ex) {
     _TelemetryHelper.TelemetryHelper.logSDKEvent(_TelemetryConstants.LogLevel.ERROR, {
       Event: _TelemetryConstants.TelemetryEvent.PostChatContextCallFailed,
@@ -36,20 +40,17 @@ const setPostChatContextAndLoadSurvey = async (chatSDK, dispatch, loadSurvey) =>
       }
     });
   }
-  /* -true:   setPostChatContextAndLoadSurvey is called after passing all checks from ConfirmationPane and endChatMiddleware in usual scenario.
-     -false:  Below if condition is needed for multi-tab scenarios. So when agent ends a chat and customer has opened chat in multiple tabs,  
-              all tabs should show post chat survey as per existing functionality. But when an agent end a conversation, Omnichannel SDK 
-              getPostChatSurveyContext returns as invalid conversation. To avoid that, caching the survey url is needed after chat starts and 
-              in this case loadSurvey is false 
-  */
 
-
-  if (loadSurvey) {
+  _omnichannelChatComponents.BroadcastService.getMessageByEventName("LoadPostChatSurvey").subscribe(msg => {
+    dispatch({
+      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+      payload: _ConversationState.ConversationState.Loading
+    });
     dispatch({
       type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
       payload: _ConversationState.ConversationState.Postchat
     });
-  }
+  });
 };
 
 exports.setPostChatContextAndLoadSurvey = setPostChatContextAndLoadSurvey;

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

@@ -5,12 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.prepareStartChat = exports.initStartChat = void 0;
 
-var _TelemetryConstants = require("../../../common/telemetry/TelemetryConstants");
-
 var _Constants = require("../../../common/Constants");
 
+var _TelemetryConstants = require("../../../common/telemetry/TelemetryConstants");
+
 var _ConversationState = require("../../../contexts/common/ConversationState");
 
+var _DataStoreManager = require("../../../common/contextDataStore/DataStoreManager");
+
 var _LiveChatWidgetActionType = require("../../../contexts/common/LiveChatWidgetActionType");
 
 var _NotificationHandler = require("../../webchatcontainerstateful/webchatcontroller/notification/NotificationHandler");
@@ -27,13 +29,17 @@ var _utils = require("../../../common/utils");
 
 var _reconnectChatHelper = require("./reconnectChatHelper");
 
-var _updateSessionDataForTelemetry = require("./updateSessionDataForTelemetry");
-
 var _setPostChatContextAndLoadSurvey = require("./setPostChatContextAndLoadSurvey");
 
+var _updateSessionDataForTelemetry = require("./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.ConversationState.ProactiveChat ? preChatSurveyResponse && state.appStates.proactiveChatStates.proactiveChatEnablePrechat : preChatSurveyResponse; // Getting reconnectId for authenticated chat
@@ -70,19 +76,20 @@ const prepareStartChat = async (props, chatSDK, state, dispatch, setAdapter) =>
 
 exports.prepareStartChat = prepareStartChat;
 
-const initStartChat = async (chatSDK, dispatch, setAdapter, params) => {
+const initStartChat = async (chatSDK, dispatch, setAdapter, params, persistedState) => {
   try {
     var _TelemetryTimers$Widg;
 
     try {
-      _TelemetryHelper.TelemetryHelper.logConfigDataEvent(_TelemetryConstants.LogLevel.INFO, {
+      _TelemetryManager.TelemetryTimers.WidgetLoadTimer = (0, _utils.createTimer)();
+
+      _TelemetryHelper.TelemetryHelper.logSDKEvent(_TelemetryConstants.LogLevel.INFO, {
         Event: _TelemetryConstants.TelemetryEvent.StartChatSDKCall
       });
 
       await chatSDK.startChat(params);
-      _TelemetryManager.TelemetryTimers.WidgetLoadTimer = (0, _utils.createTimer)();
     } catch (error) {
-      _TelemetryHelper.TelemetryHelper.logLoadingEvent(_TelemetryConstants.LogLevel.ERROR, {
+      _TelemetryHelper.TelemetryHelper.logSDKEvent(_TelemetryConstants.LogLevel.ERROR, {
         Event: _TelemetryConstants.TelemetryEvent.StartChatMethodException,
         ExceptionDetails: {
           exception: `Failed to setup startChat: ${error}`
@@ -91,24 +98,39 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, params) => {
     }
 
     const newAdapter = await (0, _createAdapter.createAdapter)(chatSDK);
-    setAdapter(newAdapter); // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    setAdapter(newAdapter);
 
-    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.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.LiveChatWidgetActionType.SET_CHAT_TOKEN,
-        payload: chatToken
+        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_LIVE_CHAT_CONTEXT,
+        payload: liveChatContext
       });
-    }
-
-    await (0, _setPostChatContextAndLoadSurvey.setPostChatContextAndLoadSurvey)(chatSDK, dispatch, false);
-    await (0, _updateSessionDataForTelemetry.updateSessionDataForTelemetry)(chatSDK, dispatch); // Set app state to Active
+      await (0, _setPostChatContextAndLoadSurvey.setPostChatContextAndLoadSurvey)(chatSDK, dispatch);
+      await (0, _updateSessionDataForTelemetry.updateSessionDataForTelemetry)(chatSDK, dispatch); // Set app state to Active
 
-    dispatch({
-      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-      payload: _ConversationState.ConversationState.Active
-    });
+      dispatch({
+        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+        payload: _ConversationState.ConversationState.Active
+      });
+    } else {
+      dispatch({
+        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_WIDGET_STATE,
+        payload: persistedState
+      });
+      await (0, _setPostChatContextAndLoadSurvey.setPostChatContextAndLoadSurvey)(chatSDK, dispatch, true);
+    }
 
     _TelemetryHelper.TelemetryHelper.logLoadingEvent(_TelemetryConstants.LogLevel.INFO, {
       Event: _TelemetryConstants.TelemetryEvent.WidgetLoadComplete,
@@ -117,9 +139,9 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, params) => {
     });
   } catch (ex) {
     _TelemetryHelper.TelemetryHelper.logLoadingEvent(_TelemetryConstants.LogLevel.ERROR, {
-      Event: _TelemetryConstants.TelemetryEvent.StartChatFailed,
+      Event: _TelemetryConstants.TelemetryEvent.WidgetLoadFailed,
       ExceptionDetails: {
-        Exception: `Start Chat Failed: ${ex}`
+        Exception: `Widget load Failed: ${ex}`
       }
     });
 
@@ -137,6 +159,30 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, params) => {
       });
     }
   }
-};
+}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+
+exports.initStartChat = initStartChat;
 
-exports.initStartChat = initStartChat;
+const canConnectToExistingChat = async (props, chatSDK, state, dispatch, setAdapter) => {
+  var _DataStoreManager$cli, _persistedState$domai;
+
+  const widgetStateFromCache = (_DataStoreManager$cli = _DataStoreManager.DataStoreManager.clientDataStore) === null || _DataStoreManager$cli === void 0 ? void 0 : _DataStoreManager$cli.getData(_Constants.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.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+      payload: _ConversationState.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;
+  }
+};

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

@@ -16,12 +16,12 @@ var _TelemetryHelper = require("../../../common/telemetry/TelemetryHelper");
 var _TelemetryManager = require("../../../common/telemetry/TelemetryManager");
 
 // Defines startProactiveChat callback
-const startProactiveChat = (dispatch, bodyTitle, showPrechat, inNewWindow) => {
+const startProactiveChat = (dispatch, notificationConfig, enablePreChat, inNewWindow) => {
   dispatch({
     type: _LiveChatWidgetActionType.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/cjs/components/livechatwidget/livechatwidgetstateful/LiveChatWidgetStateful.js

@@ -85,6 +85,10 @@ var _TelemetryConstants = require("../../../common/telemetry/TelemetryConstants"
 
 var _disposeTelemetryLoggers = require("../common/disposeTelemetryLoggers");
 
+var _DataStoreManager = require("../../../common/contextDataStore/DataStoreManager");
+
+var _TelemetryHelper = require("../../../common/telemetry/TelemetryHelper");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -121,6 +125,7 @@ const LiveChatWidgetStateful = props => {
 
     (0, _registerTelemetryLoggers.registerTelemetryLoggers)(props, dispatch);
     (0, _createInternetConnectionChangeHandler.createInternetConnectionChangeHandler)();
+    _DataStoreManager.DataStoreManager.clientDataStore = props.contextDataStore ?? undefined;
     dispatch({
       type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_WIDGET_ELEMENT_ID,
       payload: widgetElementId
@@ -192,21 +197,33 @@ const LiveChatWidgetStateful = props => {
   }, [state.appStates.skipChatButtonRendering]);
   (0, _react2.useEffect)(() => {
     _omnichannelChatComponents.BroadcastService.getMessageByEventName("StartProactiveChat").subscribe(msg => {
+      _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.INFO, {
+        Event: _TelemetryConstants.TelemetryEvent.StartProactiveChatEventReceived,
+        Description: "Start proactive chat event received."
+      });
+
       if (canStartProactiveChat.current) {
         var _msg$payload, _msg$payload2, _msg$payload3;
 
-        (0, _startProactiveChat.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);
+        (0, _startProactiveChat.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.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.INFO, {
+          Event: _TelemetryConstants.TelemetryEvent.ChatAlreadyTriggered,
+          Description: "Start proactive chat method called, when chat was already triggered."
+        });
       }
     });
 
     window.addEventListener("beforeunload", event => {
       (0, _disposeTelemetryLoggers.disposeTelemetryLoggers)();
     });
+
+    if (state.appStates.conversationEndedByAgent) {
+      (0, _endChat.endChat)(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter);
+    }
   }, []);
   (0, _react2.useEffect)(() => {
-    if (state.appStates.conversationState !== _ConversationState.ConversationState.Closed) {
-      canStartProactiveChat.current = false;
-    }
+    canStartProactiveChat.current = state.appStates.conversationState === _ConversationState.ConversationState.Closed;
 
     if (state.appStates.conversationState === _ConversationState.ConversationState.Active) {
       chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.onNewMessage(() => {
@@ -217,7 +234,7 @@ const LiveChatWidgetStateful = props => {
     } // Track the message count
 
 
-    if (state.appStates.conversationState == _ConversationState.ConversationState.Active) {
+    if (state.appStates.conversationState === _ConversationState.ConversationState.Active) {
       chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.onNewMessage(() => {
         currentMessageCountRef.current++;
         dispatch({
@@ -263,25 +280,26 @@ const LiveChatWidgetStateful = props => {
   }, [(_props$webChatContain3 = props.webChatContainerProps) === null || _props$webChatContain3 === void 0 ? void 0 : _props$webChatContain3.webChatStyles]);
   const webChatProps = (0, _initWebChatComposer.initWebChatComposer)(props, chatSDK, state, dispatch, setWebChatStyles);
 
-  const setPostChatContextRelay = () => (0, _setPostChatContextAndLoadSurvey.setPostChatContextAndLoadSurvey)(chatSDK, dispatch, true);
+  const setPostChatContextRelay = () => (0, _setPostChatContextAndLoadSurvey.setPostChatContextAndLoadSurvey)(chatSDK, dispatch);
 
   const endChatRelay = () => (0, _endChat.endChat)(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter);
 
   const prepareStartChatRelay = () => (0, _startChat.prepareStartChat)(props, chatSDK, state, dispatch, setAdapter); // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
 
-  const initStartChatRelay = optionalParams => (0, _startChat.initStartChat)(chatSDK, dispatch, setAdapter, optionalParams);
+  const initStartChatRelay = (optionalParams, persistedState) => (0, _startChat.initStartChat)(chatSDK, dispatch, setAdapter, optionalParams, persistedState);
 
   const confirmationPaneProps = (0, _initConfirmationPropsComposer.initConfirmationPropsComposer)(props); // publish chat widget state
 
-  const chatWidgetStateChangeEvent = {
-    eventName: _TelemetryConstants.TelemetryEvent.ChatWidgetStateChanged,
-    payload: { ...state
-    }
-  };
-
-  _omnichannelChatComponents.BroadcastService.postMessage(chatWidgetStateChangeEvent);
+  (0, _react2.useEffect)(() => {
+    const chatWidgetStateChangeEvent = {
+      eventName: _TelemetryConstants.TelemetryEvent.ChatWidgetStateChanged,
+      payload: { ...state
+      }
+    };
 
+    _omnichannelChatComponents.BroadcastService.postMessage(chatWidgetStateChangeEvent);
+  }, [state]);
   return /*#__PURE__*/_react2.default.createElement(Composer, _extends({}, webChatProps, {
     styleOptions: webChatStyles,
     directLine: ((_props$webChatContain4 = props.webChatContainerProps) === null || _props$webChatContain4 === void 0 ? void 0 : _props$webChatContain4.directLine) ?? adapter ?? _defaultWebChatContainerStatefulProps.defaultWebChatContainerStatefulProps.directLine

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

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

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

@@ -5,10 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.OutOfOfficeHoursPaneStateful = void 0;
 
+var _TelemetryConstants = require("../../common/telemetry/TelemetryConstants");
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _omnichannelChatComponents = require("@microsoft/omnichannel-chat-components");
 
+var _TelemetryHelper = require("../../common/telemetry/TelemetryHelper");
+
 var _defaultgeneralOOOHPaneStyleProps = require("./common/defaultStyleProps/defaultgeneralOOOHPaneStyleProps");
 
 var _utils = require("../../common/utils");
@@ -41,6 +45,10 @@ const OutOfOfficeHoursPaneStateful = props => {
     if (firstElement && firstElement[0]) {
       firstElement[0].focus();
     }
+
+    _TelemetryHelper.TelemetryHelper.logLoadingEvent(_TelemetryConstants.LogLevel.INFO, {
+      Event: _TelemetryConstants.TelemetryEvent.OutOfOfficePaneLoaded
+    });
   }, []);
   return /*#__PURE__*/_react.default.createElement(_omnichannelChatComponents.OutOfOfficeHoursPane, {
     componentOverrides: props.componentOverrides,

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

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.PreChatSurveyPaneStateful = void 0;
 
+var _Constants = require("../../common/Constants");
+
 var _TelemetryConstants = require("../../common/telemetry/TelemetryConstants");
 
 var _react = _interopRequireWildcard(require("react"));
@@ -13,12 +15,12 @@ var _utils = require("../../common/utils");
 
 var _ConversationState = require("../../contexts/common/ConversationState");
 
+var _DataStoreManager = require("../../common/contextDataStore/DataStoreManager");
+
 var _LiveChatWidgetActionType = require("../../contexts/common/LiveChatWidgetActionType");
 
 var _omnichannelChatComponents = require("@microsoft/omnichannel-chat-components");
 
-var _Constants = require("../../common/Constants");
-
 var _TelemetryHelper = require("../../common/telemetry/TelemetryHelper");
 
 var _defaultGeneralPreChatSurveyPaneStyleProps = require("./common/defaultStyles/defaultGeneralPreChatSurveyPaneStyleProps");
@@ -63,7 +65,7 @@ const PreChatSurveyPaneStateful = props => {
     try {
       return (0, _utils.parseAdaptiveCardPayload)(payload, requiredFieldMissingMessage);
     } catch (ex) {
-      _TelemetryHelper.TelemetryHelper.logLoadingEvent(_TelemetryConstants.LogLevel.ERROR, {
+      _TelemetryHelper.TelemetryHelper.logConfigDataEvent(_TelemetryConstants.LogLevel.ERROR, {
         Event: _TelemetryConstants.TelemetryEvent.ParseAdaptiveCardFailed,
         Description: "Adaptive Card JSON Parse Failed.",
         ExceptionDetails: {
@@ -91,14 +93,29 @@ const PreChatSurveyPaneStateful = props => {
       });
 
       try {
-        const prechatResponseValues = (0, _utils.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.DataStoreManager.clientDataStore) === null || _DataStoreManager$cli === void 0 ? void 0 : _DataStoreManager$cli.getData(_Constants.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 = (0, _utils.extractPreChatSurveyResponseValues)(state.domainStates.preChatSurveyResponse, values);
+          optionalParams = {
+            initContext: {
+              preChatResponse: prechatResponseValues
+            }
+          };
+          setPreChatResponseEmail(values);
+          await initStartChat(optionalParams);
+        }
       } catch (ex) {
         _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.ERROR, {
           Event: _TelemetryConstants.TelemetryEvent.PreChatSurveyStartChatMethodFailed,

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

@@ -51,7 +51,7 @@ const ProactiveChatPaneStateful = props => {
         payload: _ConversationState.ConversationState.Closed
       });
 
-      _TelemetryHelper.TelemetryHelper.logLoadingEvent(_TelemetryConstants.LogLevel.INFO, {
+      _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.INFO, {
         Event: _TelemetryConstants.TelemetryEvent.ProactiveChatRejected,
         ElapsedTimeInMilliseconds: _TelemetryManager.TelemetryTimers.LcwLoadToChatButtonTimer.milliSecondsElapsed,
         Description: "Proactive chat invitation timed out."
@@ -75,14 +75,14 @@ const ProactiveChatPaneStateful = props => {
       if (state.appStates.proactiveChatStates.proactiveChatInNewWindow) {
         // TODO: BroadcastService: replace with the sdk broadcast service, when in place
         const startPopoutChatEvent = {
-          eventName: "StartPopoutChat"
+          eventName: _TelemetryConstants.TelemetryEvent.ProactiveChatStartPopoutChat
         };
 
         _omnichannelChatComponents.BroadcastService.postMessage(startPopoutChatEvent);
 
         dispatch({
-          type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_SKIP_CHAT_BUTTON_RENDERING,
-          payload: true
+          type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+          payload: _ConversationState.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({
@@ -94,6 +94,12 @@ const ProactiveChatPaneStateful = props => {
           payload: _ConversationState.ConversationState.OutOfOffice
         });
       } else {
+        const proactiveChatStarted = {
+          eventName: _TelemetryConstants.TelemetryEvent.ProactiveChatStartChat
+        };
+
+        _omnichannelChatComponents.BroadcastService.postMessage(proactiveChatStarted);
+
         await startChat();
       }
     },

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

@@ -0,0 +1 @@
+"use strict";