@microsoft/omnichannel-chat-widget 0.1.0-main.e170704 → 0.1.0-main.fb426ed

package/lib/cjs/common/telemetry/TelemetryManager.js

@@ -15,6 +15,8 @@ var _consoleLogger = require("./loggers/consoleLogger");
 
 var _defaultAriaConfig = require("./defaultConfigs/defaultAriaConfig");
 
+var _TelemetryHelper = require("./TelemetryHelper");
+
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 class TelemetryTimers {}
@@ -92,7 +94,11 @@ const RegisterLoggers = () => {
 
       const logLevel = telemetryEvent.logLevel ?? _TelemetryConstants.LogLevel.INFO;
       const scenarioType = ((_payload = telemetryEvent.payload) === null || _payload === void 0 ? void 0 : _payload.scenarioType) ?? _TelemetryConstants.ScenarioType.UNDEFINED;
-      logger.log(logLevel, parseInput(telemetryEvent === null || telemetryEvent === void 0 ? void 0 : telemetryEvent.payload, scenarioType));
+      const telemetryInput = parseInput(telemetryEvent === null || telemetryEvent === void 0 ? void 0 : telemetryEvent.payload, scenarioType);
+      telemetryInput.telemetryInfo = {
+        telemetryInfo: _TelemetryHelper.TelemetryHelper.buildTelemetryEvent(logLevel, telemetryInput)
+      };
+      logger.log(logLevel, telemetryInput);
     });
   };
 

package/lib/cjs/common/telemetry/loggers/ariaTelemetryLogger.js

@@ -15,8 +15,6 @@ var _Enums = require("@microsoft/omnichannel-chat-sdk/lib/external/aria/common/E
 
 var _Constants = require("../../Constants");
 
-var _TelemetryHelper = require("../TelemetryHelper");
-
 var _TelemetryManager = require("../TelemetryManager");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -67,18 +65,19 @@ const ariaTelemetryLogger = (ariaTelemetryKey, disabledCookieUsage, collectiorUr
     log: (logLevel, telemetryInput) => {
       try {
         let property;
+        const telemetryInfo = telemetryInput === null || telemetryInput === void 0 ? void 0 : telemetryInput.telemetryInfo;
         const eventProperties = new _AWTEventProperties.default();
-
-        const event = _TelemetryHelper.TelemetryHelper.buildTelemetryEvent(logLevel, telemetryInput);
-
         eventProperties.setName(telemetryInput.scenarioType);
 
-        for (const key of Object.keys(event)) {
-          property = typeof event[key] === "object" ? JSON.stringify(event[key]) : event[key];
-          eventProperties.setProperty(key, property);
+        if (telemetryInfo) {
+          for (const key of Object.keys(telemetryInfo)) {
+            property = typeof telemetryInfo[key] === "object" ? JSON.stringify(telemetryInfo[key]) : telemetryInfo[key];
+            eventProperties.setProperty(key, property);
+          }
+
+          eventProperties.setPropertyWithPii(ariaTelemetryApplicationName, _Constants.Constants.LiveChatWidget, _Enums.AWTPiiKind.GenericData);
         }
 
-        eventProperties.setPropertyWithPii(ariaTelemetryApplicationName, _Constants.Constants.LiveChatWidget, _Enums.AWTPiiKind.GenericData);
         logger() ? logger().logEvent(eventProperties) : console.log("Unable to initialize aria logger");
       } catch (error) {
         console.error("Error in logging telemetry to Aria logger:" + error);

package/lib/cjs/common/telemetry/loggers/consoleLogger.js

@@ -13,27 +13,28 @@ const consoleLogger = () => {
   const consoleLogger = {
     log: (logLevel, telemetryInput) => {
       const payload = telemetryInput !== null && telemetryInput !== void 0 && telemetryInput.payload && Object.keys(telemetryInput === null || telemetryInput === void 0 ? void 0 : telemetryInput.payload).length > 0 ? telemetryInput === null || telemetryInput === void 0 ? void 0 : telemetryInput.payload : "";
+      const telemetryInfo = telemetryInput !== null && telemetryInput !== void 0 && telemetryInput.telemetryInfo && Object.keys(telemetryInput === null || telemetryInput === void 0 ? void 0 : telemetryInput.telemetryInfo).length > 0 ? telemetryInput === null || telemetryInput === void 0 ? void 0 : telemetryInput.telemetryInfo : "";
 
       try {
         switch (logLevel) {
           case _TelemetryConstants.LogLevel.INFO:
-            console.info(_Constants.Constants.LiveChatWidget, payload);
+            console.info(_Constants.Constants.LiveChatWidget, payload, telemetryInfo);
             break;
 
           case _TelemetryConstants.LogLevel.DEBUG:
-            console.debug(_Constants.Constants.LiveChatWidget, payload);
+            console.debug(_Constants.Constants.LiveChatWidget, payload, telemetryInfo);
             break;
 
           case _TelemetryConstants.LogLevel.WARN:
-            console.warn(_Constants.Constants.LiveChatWidget, payload);
+            console.warn(_Constants.Constants.LiveChatWidget, payload, telemetryInfo);
             break;
 
           case _TelemetryConstants.LogLevel.ERROR:
-            console.error(_Constants.Constants.LiveChatWidget, payload);
+            console.error(_Constants.Constants.LiveChatWidget, payload, telemetryInfo);
             break;
 
           default:
-            console.debug(_Constants.Constants.LiveChatWidget, payload);
+            console.debug(_Constants.Constants.LiveChatWidget, payload, telemetryInfo);
             break;
         }
       } catch (ex) {

package/lib/cjs/common/utils.js

@@ -333,6 +333,7 @@ const createTimer = () => {
 
   };
 }; // Returns the domain of the org
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 
 
 exports.createTimer = createTimer;

package/lib/cjs/components/callingcontainerstateful/CallingContainerStateful.js

@@ -206,6 +206,20 @@ const CallingContainerStateful = props => {
         });
       }
     });
+    window.addEventListener("beforeunload", () => {
+      if (state.uiStates.isIncomingCall) {
+        voiceVideoCallingSdk === null || voiceVideoCallingSdk === void 0 ? void 0 : voiceVideoCallingSdk.rejectCall();
+      } else {
+        voiceVideoCallingSdk === null || voiceVideoCallingSdk === void 0 ? void 0 : voiceVideoCallingSdk.stopCall();
+      }
+
+      voiceVideoCallingSdk === null || voiceVideoCallingSdk === void 0 ? void 0 : voiceVideoCallingSdk.close();
+      dispatch({
+        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_E2VV_ENABLED,
+        payload: false
+      });
+      resetCallingStates(true);
+    });
   }, []);
   const controlProps = {
     id: "oc-lcw-callingcontainer",

package/lib/cjs/components/footerstateful/downloadtranscriptstateful/DownloadTranscriptStateful.js

@@ -138,7 +138,7 @@ const beautifyChatTranscripts = (chatTranscripts, renderMarkDown, attachmentMess
 
       if (value.attachments && value.attachments.length > 0 && value.attachments[0].name) {
         fileAttachmentName = value.attachments[0].name;
-        value.content = attachmentMessage ?? "The following attachment was uploaded during the conversation:" + fileAttachmentName;
+        value.content = attachmentMessage ? attachmentMessage + " " + fileAttachmentName : "The following attachment was uploaded during the conversation: " + fileAttachmentName;
       }
     }
 

package/lib/cjs/components/livechatwidget/common/defaultProps/dummyDefaultProps.js

@@ -274,18 +274,6 @@ const dummyDefaultProps = {
           width: "50px",
           fontSize: "18px"
         },
-        currentCallTimerStyleProps: {
-          borderRadius: "2px",
-          margin: "1px",
-          color: "#FFFFFF",
-          paddingTop: "18px",
-          fontSize: 12,
-          fontFamily: "Segoe UI, Arial, sans-serif",
-          backgroundColor: "darkgrey",
-          height: "45px",
-          width: "50px",
-          textAlign: "center"
-        },
         videoTileStyleProps: {
           width: "100%",
           marginLeft: "auto",

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

@@ -63,7 +63,16 @@ const endChat = async (props, chatSDK, setAdapter, setWebChatStyles, dispatch, a
         Event: _TelemetryConstants.TelemetryEvent.EndChatSDKCall
       });
 
-      await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.endChat());
+      await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.endChat()); // Need to clear these states immediately when chat ended from OC.
+
+      dispatch({
+        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CHAT_TOKEN,
+        payload: undefined
+      });
+      dispatch({
+        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_LIVE_CHAT_CONTEXT,
+        payload: undefined
+      });
     } catch (ex) {
       _TelemetryHelper.TelemetryHelper.logSDKEvent(_TelemetryConstants.LogLevel.ERROR, {
         Event: _TelemetryConstants.TelemetryEvent.EndChatSDKCallFailed,
@@ -100,14 +109,6 @@ const endChat = async (props, chatSDK, setAdapter, setWebChatStyles, dispatch, a
         type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_AUDIO_NOTIFICATION,
         payload: null
       });
-      dispatch({
-        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CHAT_TOKEN,
-        payload: undefined
-      });
-      dispatch({
-        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_LIVE_CHAT_CONTEXT,
-        payload: undefined
-      });
 
       _omnichannelChatComponents.BroadcastService.postMessage({
         eventName: _TelemetryConstants.BroadcastEvent.EndChat

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

@@ -123,6 +123,10 @@ const initWebChatComposer = (props, chatSDK, state, dispatch, setWebChatStyles)
         type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CHAT_TOKEN,
         payload: undefined
       });
+      dispatch({
+        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_LIVE_CHAT_CONTEXT,
+        payload: undefined
+      });
     };
 
     webChatStore = (0, _botframeworkWebchat.createStore)({}, //initial state

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

@@ -35,7 +35,8 @@ var _setPostChatContextAndLoadSurvey = require("./setPostChatContextAndLoadSurve
 
 var _updateSessionDataForTelemetry = require("./updateSessionDataForTelemetry");
 
-// 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;
 
@@ -74,11 +75,13 @@ const prepareStartChat = async (props, chatSDK, state, dispatch, setAdapter) =>
         type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
         payload: _ConversationState.ConversationState.Prechat
       });
+      setCustomContextParams(props, state);
     } else {
       dispatch({
         type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
         payload: _ConversationState.ConversationState.Loading
       });
+      setCustomContextParams(props, state);
       await initStartChat(chatSDK, dispatch, setAdapter);
     }
   }
@@ -98,7 +101,8 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, params, persistedSta
         Event: _TelemetryConstants.TelemetryEvent.StartChatSDKCall
       });
 
-      await chatSDK.startChat(params);
+      optionalParams = Object.assign({}, params, optionalParams);
+      await chatSDK.startChat(optionalParams);
     } catch (error) {
       _TelemetryHelper.TelemetryHelper.logSDKEvent(_TelemetryConstants.LogLevel.ERROR, {
         Event: _TelemetryConstants.TelemetryEvent.StartChatMethodException,
@@ -198,4 +202,15 @@ const canConnectToExistingChat = async (props, chatSDK, state, dispatch, setAdap
   } else {
     return false;
   }
+};
+
+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
+    });
+  }
 };

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

@@ -107,7 +107,8 @@ 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 = (0, _useChatSDKStore.default)();
+  const chatSDK = (0, _useChatSDKStore.default)(); // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
   const [voiceVideoCallingSDK, setVoiceVideoCallingSDK] = (0, _react2.useState)(undefined);
   const {
     Composer
@@ -135,6 +136,10 @@ const LiveChatWidgetStateful = props => {
       type: _LiveChatWidgetActionType.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.LiveChatWidgetActionType.SET_E2VV_ENABLED,
+      payload: false
+    });
     (0, _initCallingSdk.initCallingSdk)(chatSDK, setVoiceVideoCallingSDK).then(sdkCreated => {
       sdkCreated && dispatch({
         type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_E2VV_ENABLED,

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

@@ -109,9 +109,7 @@ const PreChatSurveyPaneStateful = props => {
         } else {
           const prechatResponseValues = (0, _utils.extractPreChatSurveyResponseValues)(state.domainStates.preChatSurveyResponse, values);
           optionalParams = {
-            initContext: {
-              preChatResponse: prechatResponseValues
-            }
+            preChatResponse: prechatResponseValues
           };
           setPreChatResponseEmail(values);
           await initStartChat(optionalParams);

package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/webchattelemetry/WebChatLogger.js

@@ -10,6 +10,7 @@ var _TelemetryConstants = require("../../../../common/telemetry/TelemetryConstan
 var _TelemetryHelper = require("../../../../common/telemetry/TelemetryHelper");
 
 function createWebChatTelemetry() {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const handleTelemetry = event => {
     const {
       level

package/lib/cjs/contexts/createReducer.js

@@ -72,6 +72,7 @@ const createReducer = () => {
       case _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CUSTOM_CONTEXT:
         return { ...state,
           domainStates: { ...state.domainStates,
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             customContext: action.payload
           }
         };

package/lib/cjs/plugins/newMessageEventHandler.js

@@ -13,8 +13,6 @@ var _Constants = require("../common/Constants");
 
 var _TelemetryHelper = require("../common/telemetry/TelemetryHelper");
 
-var _TelemetryManager = require("../common/telemetry/TelemetryManager");
-
 const createOnNewAdapterActivityHandler = (chatId, userId) => {
   const onNewAdapterActivityHandler = activity => {
     var _activity$channelData, _activity$channelData2, _activity$channelData3;
@@ -29,18 +27,16 @@ const createOnNewAdapterActivityHandler = (chatId, userId) => {
 
   const raiseMessageEvent = activity => {
     if ((activity === null || activity === void 0 ? void 0 : activity.type) === _Constants.Constants.message) {
-      var _TelemetryManager$Int, _activity$from;
+      var _text, _text2, _activity$channelData4, _activity$from;
 
       const payload = {
+        // To identify hidden contents vs empty content
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        text: activity === null || activity === void 0 ? void 0 : activity.text,
-        id: activity === null || activity === void 0 ? void 0 : activity.id,
+        text: (activity === null || activity === void 0 ? void 0 : (_text = activity.text) === null || _text === void 0 ? void 0 : _text.length) >= 1 ? `*contents hidden (${activity === null || activity === void 0 ? void 0 : (_text2 = activity.text) === null || _text2 === void 0 ? void 0 : _text2.length} chars)*` : "",
         type: activity === null || activity === void 0 ? void 0 : activity.type,
         timestamp: activity === null || activity === void 0 ? void 0 : activity.timestamp,
-        chatId: chatId,
         userId: userId,
-        conversationId: ((_TelemetryManager$Int = _TelemetryManager.TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int === void 0 ? void 0 : _TelemetryManager$Int.conversationId) ?? "",
-        channelData: activity === null || activity === void 0 ? void 0 : activity.channelData,
+        tags: activity === null || activity === void 0 ? void 0 : (_activity$channelData4 = activity.channelData) === null || _activity$channelData4 === void 0 ? void 0 : _activity$channelData4.tags,
         messageType: ""
       };
 
@@ -59,18 +55,18 @@ const createOnNewAdapterActivityHandler = (chatId, userId) => {
           Description: "New message sent"
         });
       } else {
-        var _activity$channelData4, _activity$channelData5;
+        var _activity$channelData5, _activity$channelData6;
 
-        if (activity !== null && activity !== void 0 && (_activity$channelData4 = activity.channelData) !== null && _activity$channelData4 !== void 0 && (_activity$channelData5 = _activity$channelData4.tags) !== null && _activity$channelData5 !== void 0 && _activity$channelData5.includes(_Constants.Constants.systemMessageTag)) {
+        if (activity !== null && activity !== void 0 && (_activity$channelData5 = activity.channelData) !== null && _activity$channelData5 !== void 0 && (_activity$channelData6 = _activity$channelData5.tags) !== null && _activity$channelData6 !== void 0 && _activity$channelData6.includes(_Constants.Constants.systemMessageTag)) {
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
           payload.messageType = _Constants.Constants.systemMessageTag;
         } else {
-          var _activity$channelData6, _activity$channelData7, _activity$channelData8;
+          var _activity$channelData7, _activity$channelData8, _activity$channelData9;
 
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
           const messageHasNoText = !(activity !== null && activity !== void 0 && activity.text); // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
-          const messageHasNoTags = !(activity !== null && activity !== void 0 && activity.channelData) || !(activity !== null && activity !== void 0 && (_activity$channelData6 = activity.channelData) !== null && _activity$channelData6 !== void 0 && _activity$channelData6.tags) || (activity === null || activity === void 0 ? void 0 : (_activity$channelData7 = activity.channelData) === null || _activity$channelData7 === void 0 ? void 0 : (_activity$channelData8 = _activity$channelData7.tags) === null || _activity$channelData8 === void 0 ? void 0 : _activity$channelData8.length) === 0; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          const messageHasNoTags = !(activity !== null && activity !== void 0 && activity.channelData) || !(activity !== null && activity !== void 0 && (_activity$channelData7 = activity.channelData) !== null && _activity$channelData7 !== void 0 && _activity$channelData7.tags) || (activity === null || activity === void 0 ? void 0 : (_activity$channelData8 = activity.channelData) === null || _activity$channelData8 === void 0 ? void 0 : (_activity$channelData9 = _activity$channelData8.tags) === null || _activity$channelData9 === void 0 ? void 0 : _activity$channelData9.length) === 0; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
           const messageHasNoAttachments = !(activity !== null && activity !== void 0 && activity.attachments) || (activity === null || activity === void 0 ? void 0 : activity.attachments.length) === 0;
 
@@ -90,7 +86,8 @@ const createOnNewAdapterActivityHandler = (chatId, userId) => {
 
         _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.INFO, {
           Event: _TelemetryConstants.TelemetryEvent.MessageReceived,
-          Description: "New message received"
+          Description: "New message received",
+          Data: payload
         });
       }
     }

package/lib/esm/common/telemetry/TelemetryManager.js

@@ -5,6 +5,7 @@ import { BroadcastService } from "@microsoft/omnichannel-chat-components";
 import { ariaTelemetryLogger } from "./loggers/ariaTelemetryLogger";
 import { consoleLogger } from "./loggers/consoleLogger";
 import { defaultAriaConfig } from "./defaultConfigs/defaultAriaConfig";
+import { TelemetryHelper } from "./TelemetryHelper";
 export class TelemetryTimers {}
 
 _defineProperty(TelemetryTimers, "LcwLoadToChatButtonTimer", void 0);
@@ -72,7 +73,11 @@ export const RegisterLoggers = () => {
 
       const logLevel = telemetryEvent.logLevel ?? LogLevel.INFO;
       const scenarioType = ((_payload = telemetryEvent.payload) === null || _payload === void 0 ? void 0 : _payload.scenarioType) ?? ScenarioType.UNDEFINED;
-      logger.log(logLevel, parseInput(telemetryEvent === null || telemetryEvent === void 0 ? void 0 : telemetryEvent.payload, scenarioType));
+      const telemetryInput = parseInput(telemetryEvent === null || telemetryEvent === void 0 ? void 0 : telemetryEvent.payload, scenarioType);
+      telemetryInput.telemetryInfo = {
+        telemetryInfo: TelemetryHelper.buildTelemetryEvent(logLevel, telemetryInput)
+      };
+      logger.log(logLevel, telemetryInput);
     });
   };
 

package/lib/esm/common/telemetry/loggers/ariaTelemetryLogger.js

@@ -3,7 +3,6 @@ import AWTEventProperties from "@microsoft/omnichannel-chat-sdk/lib/external/ari
 import AWTLogManager from "@microsoft/omnichannel-chat-sdk/lib/external/aria/webjs/AWTLogManager";
 import { AWTPiiKind } from "@microsoft/omnichannel-chat-sdk/lib/external/aria/common/Enums";
 import { Constants, AriaTelemetryConstants, EnvironmentVersion } from "../../Constants";
-import { TelemetryHelper } from "../TelemetryHelper";
 import { TelemetryManager } from "../TelemetryManager";
 export const ariaTelemetryLogger = (ariaTelemetryKey, disabledCookieUsage, collectiorUriForTelemetry, ariaTelemetryApplicationName) => {
   let _logger;
@@ -51,16 +50,19 @@ export const ariaTelemetryLogger = (ariaTelemetryKey, disabledCookieUsage, colle
     log: (logLevel, telemetryInput) => {
       try {
         let property;
+        const telemetryInfo = telemetryInput === null || telemetryInput === void 0 ? void 0 : telemetryInput.telemetryInfo;
         const eventProperties = new AWTEventProperties();
-        const event = TelemetryHelper.buildTelemetryEvent(logLevel, telemetryInput);
         eventProperties.setName(telemetryInput.scenarioType);
 
-        for (const key of Object.keys(event)) {
-          property = typeof event[key] === "object" ? JSON.stringify(event[key]) : event[key];
-          eventProperties.setProperty(key, property);
+        if (telemetryInfo) {
+          for (const key of Object.keys(telemetryInfo)) {
+            property = typeof telemetryInfo[key] === "object" ? JSON.stringify(telemetryInfo[key]) : telemetryInfo[key];
+            eventProperties.setProperty(key, property);
+          }
+
+          eventProperties.setPropertyWithPii(ariaTelemetryApplicationName, Constants.LiveChatWidget, AWTPiiKind.GenericData);
         }
 
-        eventProperties.setPropertyWithPii(ariaTelemetryApplicationName, Constants.LiveChatWidget, AWTPiiKind.GenericData);
         logger() ? logger().logEvent(eventProperties) : console.log("Unable to initialize aria logger");
       } catch (error) {
         console.error("Error in logging telemetry to Aria logger:" + error);

package/lib/esm/common/telemetry/loggers/consoleLogger.js

@@ -4,27 +4,28 @@ export const consoleLogger = () => {
   const consoleLogger = {
     log: (logLevel, telemetryInput) => {
       const payload = telemetryInput !== null && telemetryInput !== void 0 && telemetryInput.payload && Object.keys(telemetryInput === null || telemetryInput === void 0 ? void 0 : telemetryInput.payload).length > 0 ? telemetryInput === null || telemetryInput === void 0 ? void 0 : telemetryInput.payload : "";
+      const telemetryInfo = telemetryInput !== null && telemetryInput !== void 0 && telemetryInput.telemetryInfo && Object.keys(telemetryInput === null || telemetryInput === void 0 ? void 0 : telemetryInput.telemetryInfo).length > 0 ? telemetryInput === null || telemetryInput === void 0 ? void 0 : telemetryInput.telemetryInfo : "";
 
       try {
         switch (logLevel) {
           case LogLevel.INFO:
-            console.info(Constants.LiveChatWidget, payload);
+            console.info(Constants.LiveChatWidget, payload, telemetryInfo);
             break;
 
           case LogLevel.DEBUG:
-            console.debug(Constants.LiveChatWidget, payload);
+            console.debug(Constants.LiveChatWidget, payload, telemetryInfo);
             break;
 
           case LogLevel.WARN:
-            console.warn(Constants.LiveChatWidget, payload);
+            console.warn(Constants.LiveChatWidget, payload, telemetryInfo);
             break;
 
           case LogLevel.ERROR:
-            console.error(Constants.LiveChatWidget, payload);
+            console.error(Constants.LiveChatWidget, payload, telemetryInfo);
             break;
 
           default:
-            console.debug(Constants.LiveChatWidget, payload);
+            console.debug(Constants.LiveChatWidget, payload, telemetryInfo);
             break;
         }
       } catch (ex) {

package/lib/esm/common/utils.js

@@ -277,6 +277,7 @@ export const createTimer = () => {
 
   };
 }; // Returns the domain of the org
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 
 export const getDomain = hostValue => {
   for (let i = 0; i < AriaTelemetryConstants.lcwEUDomainNames.length; i++) {

package/lib/esm/components/callingcontainerstateful/CallingContainerStateful.js

@@ -177,6 +177,20 @@ export const CallingContainerStateful = props => {
         });
       }
     });
+    window.addEventListener("beforeunload", () => {
+      if (state.uiStates.isIncomingCall) {
+        voiceVideoCallingSdk === null || voiceVideoCallingSdk === void 0 ? void 0 : voiceVideoCallingSdk.rejectCall();
+      } else {
+        voiceVideoCallingSdk === null || voiceVideoCallingSdk === void 0 ? void 0 : voiceVideoCallingSdk.stopCall();
+      }
+
+      voiceVideoCallingSdk === null || voiceVideoCallingSdk === void 0 ? void 0 : voiceVideoCallingSdk.close();
+      dispatch({
+        type: LiveChatWidgetActionType.SET_E2VV_ENABLED,
+        payload: false
+      });
+      resetCallingStates(true);
+    });
   }, []);
   const controlProps = {
     id: "oc-lcw-callingcontainer",

package/lib/esm/components/footerstateful/downloadtranscriptstateful/DownloadTranscriptStateful.js

@@ -127,7 +127,7 @@ const beautifyChatTranscripts = (chatTranscripts, renderMarkDown, attachmentMess
 
       if (value.attachments && value.attachments.length > 0 && value.attachments[0].name) {
         fileAttachmentName = value.attachments[0].name;
-        value.content = attachmentMessage ?? "The following attachment was uploaded during the conversation:" + fileAttachmentName;
+        value.content = attachmentMessage ? attachmentMessage + " " + fileAttachmentName : "The following attachment was uploaded during the conversation: " + fileAttachmentName;
       }
     }
 

package/lib/esm/components/livechatwidget/common/defaultProps/dummyDefaultProps.js

@@ -253,18 +253,6 @@ export const dummyDefaultProps = {
           width: "50px",
           fontSize: "18px"
         },
-        currentCallTimerStyleProps: {
-          borderRadius: "2px",
-          margin: "1px",
-          color: "#FFFFFF",
-          paddingTop: "18px",
-          fontSize: 12,
-          fontFamily: "Segoe UI, Arial, sans-serif",
-          backgroundColor: "darkgrey",
-          height: "45px",
-          width: "50px",
-          textAlign: "center"
-        },
         videoTileStyleProps: {
           width: "100%",
           marginLeft: "auto",

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

@@ -44,7 +44,16 @@ const endChat = async (props, chatSDK, setAdapter, setWebChatStyles, dispatch, a
       TelemetryHelper.logSDKEvent(LogLevel.INFO, {
         Event: TelemetryEvent.EndChatSDKCall
       });
-      await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.endChat());
+      await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.endChat()); // Need to clear these states immediately when chat ended from OC.
+
+      dispatch({
+        type: LiveChatWidgetActionType.SET_CHAT_TOKEN,
+        payload: undefined
+      });
+      dispatch({
+        type: LiveChatWidgetActionType.SET_LIVE_CHAT_CONTEXT,
+        payload: undefined
+      });
     } catch (ex) {
       TelemetryHelper.logSDKEvent(LogLevel.ERROR, {
         Event: TelemetryEvent.EndChatSDKCallFailed,
@@ -81,14 +90,6 @@ const endChat = async (props, chatSDK, setAdapter, setWebChatStyles, dispatch, a
         type: LiveChatWidgetActionType.SET_AUDIO_NOTIFICATION,
         payload: null
       });
-      dispatch({
-        type: LiveChatWidgetActionType.SET_CHAT_TOKEN,
-        payload: undefined
-      });
-      dispatch({
-        type: LiveChatWidgetActionType.SET_LIVE_CHAT_CONTEXT,
-        payload: undefined
-      });
       BroadcastService.postMessage({
         eventName: BroadcastEvent.EndChat
       });

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

@@ -84,6 +84,10 @@ export const initWebChatComposer = (props, chatSDK, state, dispatch, setWebChatS
         type: LiveChatWidgetActionType.SET_CHAT_TOKEN,
         payload: undefined
       });
+      dispatch({
+        type: LiveChatWidgetActionType.SET_LIVE_CHAT_CONTEXT,
+        payload: undefined
+      });
     };
 
     webChatStore = createStore({}, //initial state

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

@@ -12,7 +12,8 @@ import { createOnNewAdapterActivityHandler } from "../../../plugins/newMessageEv
 import { createTimer } 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";
+let optionalParams = {}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
 const prepareStartChat = async (props, chatSDK, state, dispatch, setAdapter) => {
   var _props$reconnectChatP;
@@ -52,11 +53,13 @@ const prepareStartChat = async (props, chatSDK, state, dispatch, setAdapter) =>
         type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
         payload: ConversationState.Prechat
       });
+      setCustomContextParams(props, state);
     } else {
       dispatch({
         type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
         payload: ConversationState.Loading
       });
+      setCustomContextParams(props, state);
       await initStartChat(chatSDK, dispatch, setAdapter);
     }
   }
@@ -72,7 +75,8 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, params, persistedSta
       TelemetryHelper.logSDKEvent(LogLevel.INFO, {
         Event: TelemetryEvent.StartChatSDKCall
       });
-      await chatSDK.startChat(params);
+      optionalParams = Object.assign({}, params, optionalParams);
+      await chatSDK.startChat(optionalParams);
     } catch (error) {
       TelemetryHelper.logSDKEvent(LogLevel.ERROR, {
         Event: TelemetryEvent.StartChatMethodException,
@@ -170,4 +174,15 @@ const canConnectToExistingChat = async (props, chatSDK, state, dispatch, setAdap
   }
 };
 
+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 };

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

@@ -53,7 +53,8 @@ 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
@@ -81,6 +82,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,

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

@@ -83,9 +83,7 @@ export const PreChatSurveyPaneStateful = props => {
         } else {
           const prechatResponseValues = extractPreChatSurveyResponseValues(state.domainStates.preChatSurveyResponse, values);
           optionalParams = {
-            initContext: {
-              preChatResponse: prechatResponseValues
-            }
+            preChatResponse: prechatResponseValues
           };
           setPreChatResponseEmail(values);
           await initStartChat(optionalParams);

package/lib/esm/components/webchatcontainerstateful/webchatcontroller/webchattelemetry/WebChatLogger.js

@@ -1,6 +1,7 @@
 import { LogLevel } from "../../../../common/telemetry/TelemetryConstants";
 import { TelemetryHelper } from "../../../../common/telemetry/TelemetryHelper";
 export function createWebChatTelemetry() {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const handleTelemetry = event => {
     const {
       level

package/lib/esm/contexts/createReducer.js

@@ -64,6 +64,7 @@ export const createReducer = () => {
       case LiveChatWidgetActionType.SET_CUSTOM_CONTEXT:
         return { ...state,
           domainStates: { ...state.domainStates,
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             customContext: action.payload
           }
         };

package/lib/esm/plugins/newMessageEventHandler.js

@@ -2,7 +2,6 @@ import { BroadcastEvent, LogLevel, TelemetryEvent } from "../common/telemetry/Te
 import { BroadcastService } from "@microsoft/omnichannel-chat-components";
 import { Constants } from "../common/Constants";
 import { TelemetryHelper } from "../common/telemetry/TelemetryHelper";
-import { TelemetryManager } from "../common/telemetry/TelemetryManager";
 export const createOnNewAdapterActivityHandler = (chatId, userId) => {
   const onNewAdapterActivityHandler = activity => {
     var _activity$channelData, _activity$channelData2, _activity$channelData3;
@@ -17,18 +16,16 @@ export const createOnNewAdapterActivityHandler = (chatId, userId) => {
 
   const raiseMessageEvent = activity => {
     if ((activity === null || activity === void 0 ? void 0 : activity.type) === Constants.message) {
-      var _TelemetryManager$Int, _activity$from;
+      var _text, _text2, _activity$channelData4, _activity$from;
 
       const payload = {
+        // To identify hidden contents vs empty content
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        text: activity === null || activity === void 0 ? void 0 : activity.text,
-        id: activity === null || activity === void 0 ? void 0 : activity.id,
+        text: (activity === null || activity === void 0 ? void 0 : (_text = activity.text) === null || _text === void 0 ? void 0 : _text.length) >= 1 ? `*contents hidden (${activity === null || activity === void 0 ? void 0 : (_text2 = activity.text) === null || _text2 === void 0 ? void 0 : _text2.length} chars)*` : "",
         type: activity === null || activity === void 0 ? void 0 : activity.type,
         timestamp: activity === null || activity === void 0 ? void 0 : activity.timestamp,
-        chatId: chatId,
         userId: userId,
-        conversationId: ((_TelemetryManager$Int = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int === void 0 ? void 0 : _TelemetryManager$Int.conversationId) ?? "",
-        channelData: activity === null || activity === void 0 ? void 0 : activity.channelData,
+        tags: activity === null || activity === void 0 ? void 0 : (_activity$channelData4 = activity.channelData) === null || _activity$channelData4 === void 0 ? void 0 : _activity$channelData4.tags,
         messageType: ""
       };
 
@@ -45,18 +42,18 @@ export const createOnNewAdapterActivityHandler = (chatId, userId) => {
           Description: "New message sent"
         });
       } else {
-        var _activity$channelData4, _activity$channelData5;
+        var _activity$channelData5, _activity$channelData6;
 
-        if (activity !== null && activity !== void 0 && (_activity$channelData4 = activity.channelData) !== null && _activity$channelData4 !== void 0 && (_activity$channelData5 = _activity$channelData4.tags) !== null && _activity$channelData5 !== void 0 && _activity$channelData5.includes(Constants.systemMessageTag)) {
+        if (activity !== null && activity !== void 0 && (_activity$channelData5 = activity.channelData) !== null && _activity$channelData5 !== void 0 && (_activity$channelData6 = _activity$channelData5.tags) !== null && _activity$channelData6 !== void 0 && _activity$channelData6.includes(Constants.systemMessageTag)) {
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
           payload.messageType = Constants.systemMessageTag;
         } else {
-          var _activity$channelData6, _activity$channelData7, _activity$channelData8;
+          var _activity$channelData7, _activity$channelData8, _activity$channelData9;
 
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
           const messageHasNoText = !(activity !== null && activity !== void 0 && activity.text); // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
-          const messageHasNoTags = !(activity !== null && activity !== void 0 && activity.channelData) || !(activity !== null && activity !== void 0 && (_activity$channelData6 = activity.channelData) !== null && _activity$channelData6 !== void 0 && _activity$channelData6.tags) || (activity === null || activity === void 0 ? void 0 : (_activity$channelData7 = activity.channelData) === null || _activity$channelData7 === void 0 ? void 0 : (_activity$channelData8 = _activity$channelData7.tags) === null || _activity$channelData8 === void 0 ? void 0 : _activity$channelData8.length) === 0; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          const messageHasNoTags = !(activity !== null && activity !== void 0 && activity.channelData) || !(activity !== null && activity !== void 0 && (_activity$channelData7 = activity.channelData) !== null && _activity$channelData7 !== void 0 && _activity$channelData7.tags) || (activity === null || activity === void 0 ? void 0 : (_activity$channelData8 = activity.channelData) === null || _activity$channelData8 === void 0 ? void 0 : (_activity$channelData9 = _activity$channelData8.tags) === null || _activity$channelData9 === void 0 ? void 0 : _activity$channelData9.length) === 0; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
           const messageHasNoAttachments = !(activity !== null && activity !== void 0 && activity.attachments) || (activity === null || activity === void 0 ? void 0 : activity.attachments.length) === 0;
 
@@ -74,7 +71,8 @@ export const createOnNewAdapterActivityHandler = (chatId, userId) => {
         BroadcastService.postMessage(newMessageReceivedEvent);
         TelemetryHelper.logActionEvent(LogLevel.INFO, {
           Event: TelemetryEvent.MessageReceived,
-          Description: "New message received"
+          Description: "New message received",
+          Data: payload
         });
       }
     }

package/lib/types/common/telemetry/TelemetryConstants.d.ts

@@ -136,6 +136,7 @@ export declare enum TelemetryEvent {
 export interface TelemetryInput {
     scenarioType: ScenarioType;
     payload: TelemetryData;
+    telemetryInfo?: any;
 }
 export declare class TelemetryConstants {
     private static map;

package/lib/types/common/telemetry/TelemetryHelper.d.ts

@@ -11,6 +11,7 @@ export interface TelemetryEventWrapper {
     Description?: string;
     ExceptionDetails?: any;
     ElapsedTimeInMilliseconds?: number;
+    Data?: any;
 }
 export declare class TelemetryHelper {
     static callId: string;

package/lib/types/common/telemetry/definitions/Payload.d.ts

@@ -1,4 +1,7 @@
-export interface ConfigValidationTelemetryData {
+export interface BaseTelemetryData {
+    Data?: any;
+}
+export interface ConfigValidationTelemetryData extends BaseTelemetryData {
     Event?: string;
     RequestId?: string;
     LCWVersion?: string;
@@ -8,7 +11,7 @@ export interface ConfigValidationTelemetryData {
     ExceptionDetails?: object;
     Domain?: string;
 }
-export interface LoadTelemetryData {
+export interface LoadTelemetryData extends BaseTelemetryData {
     Event?: string;
     ResourcePath?: string;
     ElapsedTimeInMilliseconds?: number;
@@ -20,18 +23,18 @@ export interface LoadTelemetryData {
     OCChatWidgetVersion?: string;
     OCChatComponentsVersion?: string;
 }
-export interface MessageProcessingErrorData {
+export interface MessageProcessingErrorData extends BaseTelemetryData {
     Event: string;
     ExceptionDetails: object;
 }
-export interface OCChatSDKTelemetryData {
+export interface OCChatSDKTelemetryData extends BaseTelemetryData {
     RequestId: string;
     Event?: string;
     ElapsedTimeInMilliseconds?: number;
     TransactionId: string;
     ExceptionDetails?: object;
 }
-export interface IC3ClientTelemetryData {
+export interface IC3ClientTelemetryData extends BaseTelemetryData {
     SubscriptionId?: string;
     EndpointUrl?: string;
     EndpointId?: string;
@@ -42,7 +45,7 @@ export interface IC3ClientTelemetryData {
     ShouldBubbleToHost?: boolean;
     Description?: string;
 }
-export interface WebChatTelemetryData {
+export interface WebChatTelemetryData extends BaseTelemetryData {
     data?: any;
     dimensions?: any;
     duration?: number;
@@ -53,7 +56,7 @@ export interface WebChatTelemetryData {
     name?: string;
     type?: string;
 }
-export interface ACSAdapterTelemetryData {
+export interface ACSAdapterTelemetryData extends BaseTelemetryData {
     Description?: string;
     ACSUserId?: string;
     ChatThreadId?: string;
@@ -63,14 +66,14 @@ export interface ACSAdapterTelemetryData {
     ErrorCode?: string;
     ExceptionDetails?: any;
 }
-export interface ActionTelemetryData {
+export interface ActionTelemetryData extends BaseTelemetryData {
     Event?: string;
     ElapsedTimeInMilliseconds?: number;
     ActionType?: string;
     ExceptionDetails?: object;
     Description?: string;
 }
-export interface CallingTelemetryData {
+export interface CallingTelemetryData extends BaseTelemetryData {
     CallId?: string;
     Event?: string;
     ElapsedTimeInMilliseconds?: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/omnichannel-chat-widget",
-  "version": "0.1.0-main.e170704",
+  "version": "0.1.0-main.fb426ed",
   "description": "Microsoft Omnichannel Chat Widget",
   "main": "lib/cjs/index.js",
   "types": "lib/types/index.d.ts",
@@ -74,7 +74,7 @@
   },
   "dependencies": {
     "@fluentui/react": "^8.49.1",
-    "@microsoft/omnichannel-chat-components": "^0.1.0-main.099196c",
+    "@microsoft/omnichannel-chat-components": "^0.1.0-main.91dd060",
     "@microsoft/omnichannel-chat-sdk": "1.0.1-main.077d17c",
     "abort-controller-es5": "^2.0.1",
     "dompurify": "^2.3.4",