@microsoft/omnichannel-chat-widget 1.0.2-main.b2301a3 → 1.0.3-main.05297ce

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

@@ -60,6 +60,8 @@ exports.BroadcastEvent = BroadcastEvent;
   BroadcastEvent["BotAuthConfigRequest"] = "BotAuthConfigRequest";
   BroadcastEvent["BotAuthConfigResponse"] = "BotAuthConfigResponse";
   BroadcastEvent["HideChatVisibilityChangeEvent"] = "hideChatVisibilityChangeEvent";
+  BroadcastEvent["UpdateSessionDataForTelemetry"] = "UpdateSessionDataForTelemetry";
+  BroadcastEvent["UpdateConversationDataForTelemetry"] = "UpdateConversationDataForTelemetry";
 })(BroadcastEvent || (exports.BroadcastEvent = BroadcastEvent = {}));
 let TelemetryEvent;
 exports.TelemetryEvent = TelemetryEvent;

package/lib/cjs/common/utils.js

@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.setTabIndices = exports.setFocusOnSendBox = exports.setFocusOnElement = exports.preventFocusToMoveOutOfElement = exports.parseAdaptiveCardPayload = exports.newGuid = exports.isUndefinedOrEmpty = exports.isNullOrUndefined = exports.isNullOrEmptyString = exports.getWidgetEndChatEventName = exports.getWidgetCacheId = exports.getTimestampHourMinute = exports.getStateFromCache = exports.getLocaleDirection = exports.getIconText = exports.getDomain = exports.getConversationDetailsCall = exports.getBroadcastChannelName = exports.findParentFocusableElementsWithoutChildContainer = exports.findAllFocusableElement = exports.extractPreChatSurveyResponseValues = exports.escapeHtml = exports.debounceLeading = exports.createTimer = exports.changeLanguageCodeFormatForWebChat = exports.addDelayInMs = void 0;
 var _Constants = require("./Constants");
+var _TelemetryConstants = require("./telemetry/TelemetryConstants");
 var _DataStoreManager = require("./contextDataStore/DataStoreManager");
 var _KeyCodes = require("./KeyCodes");
-var _TelemetryConstants = require("./telemetry/TelemetryConstants");
 var _md5Typescript = require("md5-typescript");
 var _TelemetryHelper = require("./telemetry/TelemetryHelper");
 var _this = void 0;
@@ -171,7 +171,7 @@ exports.getTimestampHourMinute = getTimestampHourMinute;
 const parseAdaptiveCardPayload = (payload, requiredFieldMissingMessage) => {
   if (payload && payload !== "{}") {
     try {
-      const parsedPayload = JSON.parse(payload.replace(/*/g, "*"));
+      const parsedPayload = JSON.parse(payload.replace("*", "*"));
       const body = parsedPayload.body;
       if (body) {
         //Parse ID field into available options and add required error messages

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

@@ -817,7 +817,7 @@ const dummyDefaultProps = {
         minHeight: "25px",
         width: "100%",
         minWidth: "250px",
-        padding: "0 10px 5px 10px"
+        padding: "5px"
       },
       downloadTranscriptButtonStyleProps: {
         icon: {
@@ -1756,13 +1756,19 @@ const dummyDefaultProps = {
       }
     },
     localizedTexts: {
+      /*
+      MIDDLEWARE_BANNER_FILE parameters:
+      {0} = File limit size
+      {1} = File extension
+      {2} = File name
+      */
       MIDDLEWARE_BANNER_FILE_NULL_ERROR: "There was an error uploading the file, please try again.",
-      MIDDLEWARE_BANNER_FILE_SIZE_WITHOUT_EXTENSION_ERROR: "File exceeds the allowed limit of {0} MB and please upload the file with an appropriate file extension.",
-      MIDDLEWARE_BANNER_FILE_SIZE_EXTENSION_ERROR: "File exceeds the allowed limit of {0} MB and {1} files are not supported.",
-      MIDDLEWARE_BANNER_FILE_WITHOUT_EXTENSION: "File upload error. Please upload the file with an appropriate file extension.",
-      MIDDLEWARE_BANNER_FILE_EXTENSION_ERROR: "{0} files are not supported.",
-      MIDDLEWARE_BANNER_FILE_SIZE_ERROR: "File exceeds the allowed limit of {0} MB.",
-      MIDDLEWARE_BANNER_FILE_IS_EMPTY_ERROR: "This file can't be attached because it's empty. Please try again with a different file.",
+      MIDDLEWARE_BANNER_FILE_SIZE_WITHOUT_EXTENSION_ERROR: "File {2} exceeds the allowed limit of {0} MB and please upload the file with an appropriate file extension.",
+      MIDDLEWARE_BANNER_FILE_SIZE_EXTENSION_ERROR: "File {2} exceeds the allowed limit of {0} MB and {1} files are not supported.",
+      MIDDLEWARE_BANNER_FILE_WITHOUT_EXTENSION: "File upload error. Please upload the file {2} with an appropriate file extension.",
+      MIDDLEWARE_BANNER_FILE_EXTENSION_ERROR: "{1} files are not supported.",
+      MIDDLEWARE_BANNER_FILE_SIZE_ERROR: "File {2} exceeds the allowed limit of {0} MB.",
+      MIDDLEWARE_BANNER_FILE_IS_EMPTY_ERROR: "This file {2} can't be attached because it's empty. Please try again with a different file.",
       MIDDLEWARE_BANNER_ERROR_MESSAGE: "Upload failed, please try again.",
       MIDDLEWARE_BANNER_INTERNET_BACK_ONLINE: "You're back online.",
       MIDDLEWARE_BANNER_NO_INTERNET_CONNECTION: "Unable to connect—please check your internet connection.",

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

@@ -77,10 +77,6 @@ const endChat = async (props, chatSDK, setAdapter, setWebChatStyles, dispatch, a
     }
   }
   // Need to clear these states immediately when chat ended from OC.
-  dispatch({
-    type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CUSTOM_CONTEXT,
-    payload: undefined
-  });
   dispatch({
     type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CHAT_TOKEN,
     payload: undefined

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

@@ -4,6 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.updateSessionDataForTelemetry = void 0;
+var _TelemetryConstants = require("../../../common/telemetry/TelemetryConstants");
+var _omnichannelChatComponents = require("@microsoft/omnichannel-chat-components");
 var _LiveChatWidgetActionType = require("../../../contexts/common/LiveChatWidgetActionType");
 var _TelemetryHelper = require("../../../common/telemetry/TelemetryHelper");
 var _TelemetryManager = require("../../../common/telemetry/TelemetryManager");
@@ -17,6 +19,12 @@ const updateSessionDataForTelemetry = async (chatSDK, dispatch) => {
       type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_TELEMETRY_DATA,
       payload: telemetryData
     });
+    _omnichannelChatComponents.BroadcastService.postMessage({
+      eventName: _TelemetryConstants.BroadcastEvent.UpdateSessionDataForTelemetry,
+      payload: {
+        chatSession
+      }
+    });
     await updateConversationDataForTelemetry(chatSDK, dispatch);
   }
 };
@@ -32,5 +40,11 @@ const updateConversationDataForTelemetry = async (chatSDK, dispatch) => {
       type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_TELEMETRY_DATA,
       payload: telemetryData
     });
+    _omnichannelChatComponents.BroadcastService.postMessage({
+      eventName: _TelemetryConstants.BroadcastEvent.UpdateConversationDataForTelemetry,
+      payload: {
+        liveWorkItem
+      }
+    });
   }
 };

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

@@ -6,20 +6,22 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = exports.LiveChatWidgetStateful = void 0;
 var _TelemetryConstants = require("../../../common/telemetry/TelemetryConstants");
 var _omnichannelChatComponents = require("@microsoft/omnichannel-chat-components");
+var _Constants = require("../../../common/Constants");
 var _react = require("@fluentui/react");
 var _react2 = _interopRequireWildcard(require("react"));
 var _startChat = require("../common/startChat");
 var _utils = require("../../../common/utils");
 var _endChat = require("../common/endChat");
+var _reconnectChatHelper = require("../common/reconnectChatHelper");
 var _componentController = require("../../../controller/componentController");
 var _ActivityStreamHandler = require("../common/ActivityStreamHandler");
 var _CallingContainerStateful = _interopRequireDefault(require("../../callingcontainerstateful/CallingContainerStateful"));
 var _ChatButtonStateful = _interopRequireDefault(require("../../chatbuttonstateful/ChatButtonStateful"));
 var _botframeworkWebchat = require("botframework-webchat");
 var _ConfirmationPaneStateful = _interopRequireDefault(require("../../confirmationpanestateful/ConfirmationPaneStateful"));
+var _ConversationEndEntity = require("../../../contexts/common/ConversationEndEntity");
 var _ConversationState = require("../../../contexts/common/ConversationState");
 var _DataStoreManager = require("../../../common/contextDataStore/DataStoreManager");
-var _Constants = require("../../../common/Constants");
 var _EmailTranscriptPaneStateful = _interopRequireDefault(require("../../emailtranscriptpanestateful/EmailTranscriptPaneStateful"));
 var _HeaderStateful = _interopRequireDefault(require("../../headerstateful/HeaderStateful"));
 var _LiveChatWidgetActionType = require("../../../contexts/common/LiveChatWidgetActionType");
@@ -40,6 +42,8 @@ var _defaultScrollBarProps = require("../common/defaultProps/defaultScrollBarPro
 var _defaultWebChatContainerStatefulProps = require("../../webchatcontainerstateful/common/defaultProps/defaultWebChatContainerStatefulProps");
 var _disposeTelemetryLoggers = require("../common/disposeTelemetryLoggers");
 var _getGeneralStylesForButton = require("../common/getGeneralStylesForButton");
+var _agentEndConversationHelper = require("../common/agentEndConversationHelper");
+var _chatDisconnectHelper = require("../common/chatDisconnectHelper");
 var _initCallingSdk = require("../common/initCallingSdk");
 var _initConfirmationPropsComposer = require("../common/initConfirmationPropsComposer");
 var _initWebChatComposer = require("../common/initWebChatComposer");
@@ -50,10 +54,6 @@ var _startProactiveChat = require("../common/startProactiveChat");
 var _useChatAdapterStore = _interopRequireDefault(require("../../../hooks/useChatAdapterStore"));
 var _useChatContextStore = _interopRequireDefault(require("../../../hooks/useChatContextStore"));
 var _useChatSDKStore = _interopRequireDefault(require("../../../hooks/useChatSDKStore"));
-var _ConversationEndEntity = require("../../../contexts/common/ConversationEndEntity");
-var _agentEndConversationHelper = require("../common/agentEndConversationHelper");
-var _reconnectChatHelper = require("../common/reconnectChatHelper");
-var _chatDisconnectHelper = require("../common/chatDisconnectHelper");
 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); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -198,6 +198,12 @@ const LiveChatWidgetStateful = props => {
         });
       });
     }
+    if (props.initialCustomContext) {
+      dispatch({
+        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CUSTOM_CONTEXT,
+        payload: props.initialCustomContext
+      });
+    }
 
     // Initialize global dir
     const globalDir = ((_props$controlProps9 = props.controlProps) === null || _props$controlProps9 === void 0 ? void 0 : _props$controlProps9.dir) ?? (0, _utils.getLocaleDirection)((_props$chatConfig2 = props.chatConfig) === null || _props$chatConfig2 === void 0 ? void 0 : (_props$chatConfig2$Ch = _props$chatConfig2.ChatWidgetLanguage) === null || _props$chatConfig2$Ch === void 0 ? void 0 : _props$chatConfig2$Ch.msdyn_localeid);
@@ -258,16 +264,12 @@ const LiveChatWidgetStateful = props => {
     _omnichannelChatComponents.BroadcastService.getMessageByEventName(_TelemetryConstants.BroadcastEvent.HideChatVisibilityChangeEvent).subscribe(async event => {
       var _event$payload;
       if ((event === null || event === void 0 ? void 0 : (_event$payload = event.payload) === null || _event$payload === void 0 ? void 0 : _event$payload.isChatHidden) !== undefined) {
-        var _event$payload2, _props$controlProps10;
-        _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.INFO, {
-          Event: _TelemetryConstants.TelemetryEvent.ChatVisibilityChanged,
-          Description: "Chat visibility changed to " + (event === null || event === void 0 ? void 0 : (_event$payload2 = event.payload) === null || _event$payload2 === void 0 ? void 0 : _event$payload2.isChatHidden)
-        });
+        var _props$controlProps10;
         if ((_props$controlProps10 = props.controlProps) !== null && _props$controlProps10 !== void 0 && _props$controlProps10.hideStartChatButton) {
-          var _event$payload3;
+          var _event$payload2;
           dispatch({
             type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_MINIMIZED,
-            payload: event === null || event === void 0 ? void 0 : (_event$payload3 = event.payload) === null || _event$payload3 === void 0 ? void 0 : _event$payload3.isChatHidden
+            payload: event === null || event === void 0 ? void 0 : (_event$payload2 = event.payload) === null || _event$payload2 === void 0 ? void 0 : _event$payload2.isChatHidden
           });
         }
         const dateNow = Date.now();

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

@@ -7,6 +7,7 @@ exports.default = exports.PreChatSurveyPaneStateful = void 0;
 var _Constants = require("../../common/Constants");
 var _TelemetryConstants = require("../../common/telemetry/TelemetryConstants");
 var _react = _interopRequireWildcard(require("react"));
+var _markdownIt = _interopRequireDefault(require("markdown-it"));
 var _utils = require("../../common/utils");
 var _ConversationState = require("../../contexts/common/ConversationState");
 var _LiveChatWidgetActionType = require("../../contexts/common/LiveChatWidgetActionType");
@@ -21,6 +22,8 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const PreChatSurveyPaneStateful = props => {
   var _surveyProps$stylePro, _props$surveyProps, _props$surveyProps$co;
+  // Set MarkDown global variable to be used for prechat adaptive cards
+  window["markdownit"] = _markdownIt.default;
   const [state, dispatch] = (0, _useChatContextStore.default)();
   const {
     surveyProps,

package/lib/cjs/components/webchatcontainerstateful/common/defaultProps/defaultMiddlewareLocalizedTexts.js

@@ -4,14 +4,21 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.defaultMiddlewareLocalizedTexts = void 0;
+/* 
+MIDDLEWARE_BANNER_FILE parameters:
+{0} = File limit size
+{1} = File extension
+{2} = File name 
+*/
+
 const defaultMiddlewareLocalizedTexts = {
   MIDDLEWARE_BANNER_FILE_NULL_ERROR: "There was an error uploading the file, please try again.",
-  MIDDLEWARE_BANNER_FILE_SIZE_WITHOUT_EXTENSION_ERROR: "File exceeds the allowed limit of {0} MB and please upload the file with an appropriate file extension.",
-  MIDDLEWARE_BANNER_FILE_SIZE_EXTENSION_ERROR: "File exceeds the allowed limit of {0} MB and {1} files are not supported.",
-  MIDDLEWARE_BANNER_FILE_WITHOUT_EXTENSION: "File upload error. Please upload the file with an appropriate file extension.",
-  MIDDLEWARE_BANNER_FILE_EXTENSION_ERROR: "{0} files are not supported.",
-  MIDDLEWARE_BANNER_FILE_SIZE_ERROR: "File exceeds the allowed limit of {0} MB.",
-  MIDDLEWARE_BANNER_FILE_IS_EMPTY_ERROR: "This file can't be attached because it's empty. Please try again with a different file.",
+  MIDDLEWARE_BANNER_FILE_SIZE_WITHOUT_EXTENSION_ERROR: "File {2} exceeds the allowed limit of {0} MB and please upload the file with an appropriate file extension.",
+  MIDDLEWARE_BANNER_FILE_SIZE_EXTENSION_ERROR: "File {2} exceeds the allowed limit of {0} MB and {1} files are not supported.",
+  MIDDLEWARE_BANNER_FILE_WITHOUT_EXTENSION: "File upload error. Please upload the file {2} with an appropriate file extension.",
+  MIDDLEWARE_BANNER_FILE_EXTENSION_ERROR: "{1} files are not supported.",
+  MIDDLEWARE_BANNER_FILE_SIZE_ERROR: "File {2} exceeds the allowed limit of {0} MB.",
+  MIDDLEWARE_BANNER_FILE_IS_EMPTY_ERROR: "This file {2} can't be attached because it's empty. Please try again with a different file.",
   MIDDLEWARE_BANNER_ERROR_MESSAGE: "Upload failed, please try again.",
   MIDDLEWARE_BANNER_INTERNET_BACK_ONLINE: "You’re back online.",
   MIDDLEWARE_BANNER_NO_INTERNET_CONNECTION: "Unable to connect—please check your internet connection.",

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

@@ -32,7 +32,9 @@ class MockChatSDK {
     return "";
   }
   getConversationDetails() {
-    return {};
+    return {
+      State: "Active"
+    };
   }
   getCurrentLiveChatContext() {
     return {

package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/attachmentUploadValidatorMiddleware.js

@@ -76,6 +76,11 @@ const getMaxUploadFileSize = (maxFileSizeSupportedByDynamicsStr, contentType) =>
 const isImage = contentType => {
   return _Constants.AMSConstants.supportedImagesMimeTypes.includes(contentType);
 };
+const textEllipsis = function (str) {
+  let maxLength = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 20;
+  const ellipsis = "...";
+  return str.length > maxLength ? str.slice(0, maxLength - ellipsis.length) + ellipsis : str;
+};
 const buildErrorMessage = (fileName, supportedFileExtension, supportedFileSize, fileIsEmpty, maxUploadFileSize, maxFileSizeSupportedByDynamics, localizedTexts) => {
   let errorMessage = "";
   if (!fileName || !maxUploadFileSize) {
@@ -91,10 +96,11 @@ const buildErrorMessage = (fileName, supportedFileExtension, supportedFileSize,
   if (!supportedFileExtension && !supportedFileSize) {
     errorMessage = getFileSizeAndFileExtensionErrorMessage(fileName, maxUploadFileSize, maxFileSizeSupportedByDynamics, localizedTexts);
   } else if (!supportedFileSize) {
-    errorMessage = getFileSizeErrorMessage(maxUploadFileSize, maxFileSizeSupportedByDynamics, localizedTexts);
+    errorMessage = getFileSizeErrorMessage(fileName, maxUploadFileSize, maxFileSizeSupportedByDynamics, localizedTexts);
   } else if (!supportedFileExtension) {
     errorMessage = getFileExtensionErrorMessage(fileName, localizedTexts);
   } else if (fileIsEmpty) {
+    var _errorMessage;
     _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.ERROR, {
       Event: _TelemetryConstants.TelemetryEvent.AttachmentUploadValidatorMiddlewareFailed,
       Description: "Attachment validation failed",
@@ -102,7 +108,8 @@ const buildErrorMessage = (fileName, supportedFileExtension, supportedFileSize,
         ErrorDetails: "File provided is empty"
       }
     });
-    errorMessage = localizedTexts.MIDDLEWARE_BANNER_FILE_IS_EMPTY_ERROR ?? "";
+    errorMessage = localizedTexts.MIDDLEWARE_BANNER_FILE_IS_EMPTY_ERROR || "";
+    if ((_errorMessage = errorMessage) !== null && _errorMessage !== void 0 && _errorMessage.includes("{2}")) errorMessage = errorMessage.replace("{2}", textEllipsis(fileName));
   } else {
     _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.ERROR, {
       Event: _TelemetryConstants.TelemetryEvent.AttachmentUploadValidatorMiddlewareFailed,
@@ -116,19 +123,18 @@ const buildErrorMessage = (fileName, supportedFileExtension, supportedFileSize,
   return errorMessage;
 };
 const getFileSizeAndFileExtensionErrorMessage = (fileName, maxUploadFileSize, maxFileSizeSupportedByDynamics, localizedTexts) => {
+  var _errorMessage3;
   const index = fileName.lastIndexOf(".");
   let errorMessage, exceptionDetails;
   if (index < 0) {
     errorMessage = localizedTexts.MIDDLEWARE_BANNER_FILE_SIZE_WITHOUT_EXTENSION_ERROR;
     exceptionDetails = `File exceeded the allowed limit of ${maxUploadFileSize} MB and File provided without file extension`;
   } else {
-    var _errorMessage;
+    var _errorMessage2;
     const fileExtension = fileName.substring(index);
     errorMessage = localizedTexts.MIDDLEWARE_BANNER_FILE_SIZE_EXTENSION_ERROR;
+    if ((_errorMessage2 = errorMessage) !== null && _errorMessage2 !== void 0 && _errorMessage2.includes("{1}")) errorMessage = errorMessage.replace("{1}", fileExtension);
     exceptionDetails = `File exceeds the allowed limit of ${maxUploadFileSize} MB and ${fileExtension} files are not supported`;
-    if ((_errorMessage = errorMessage) !== null && _errorMessage !== void 0 && _errorMessage.includes("{1}")) {
-      errorMessage = errorMessage.replace("{1}", fileExtension);
-    }
   }
   _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.ERROR, {
     Event: _TelemetryConstants.TelemetryEvent.AttachmentUploadValidatorMiddlewareFailed,
@@ -137,10 +143,12 @@ const getFileSizeAndFileExtensionErrorMessage = (fileName, maxUploadFileSize, ma
       ErrorDetails: `${exceptionDetails} Dynamics file size limit=${maxFileSizeSupportedByDynamics} AMS image size limit=${_Constants.AMSConstants.maxSupportedImageSize} AMS file size limit=${_Constants.AMSConstants.maxSupportedFileSize}`
     }
   });
-  return errorMessage ? errorMessage.includes("{0}") ? errorMessage.replace("{0}", maxUploadFileSize) : errorMessage : "";
+  if ((_errorMessage3 = errorMessage) !== null && _errorMessage3 !== void 0 && _errorMessage3.includes("{0}")) errorMessage = errorMessage.replace("{0}", maxUploadFileSize);
+  return errorMessage ? errorMessage.includes("{2}") ? errorMessage.replace("{2}", textEllipsis(fileName)) : errorMessage : "";
 };
 const getFileExtensionErrorMessage = (fileName, localizedTexts) => {
   const index = fileName.lastIndexOf(".");
+  let errorMessage;
   if (index < 0) {
     _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.ERROR, {
       Event: _TelemetryConstants.TelemetryEvent.AttachmentUploadValidatorMiddlewareFailed,
@@ -149,8 +157,10 @@ const getFileExtensionErrorMessage = (fileName, localizedTexts) => {
         ErrorDetails: "File provided without file extension"
       }
     });
-    return localizedTexts.MIDDLEWARE_BANNER_FILE_WITHOUT_EXTENSION ?? "";
+    errorMessage = localizedTexts.MIDDLEWARE_BANNER_FILE_WITHOUT_EXTENSION;
+    return errorMessage ? errorMessage.includes("{2}") ? errorMessage.replace("{2}", textEllipsis(fileName)) : errorMessage : "";
   } else {
+    var _errorMessage4, _errorMessage5;
     const fileExtension = fileName.substring(index);
     _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.ERROR, {
       Event: _TelemetryConstants.TelemetryEvent.AttachmentUploadValidatorMiddlewareFailed,
@@ -159,11 +169,14 @@ const getFileExtensionErrorMessage = (fileName, localizedTexts) => {
         ErrorDetails: `${fileExtension} files extension is not supported.`
       }
     });
-    const errorMessage = localizedTexts.MIDDLEWARE_BANNER_FILE_EXTENSION_ERROR;
-    return errorMessage ? errorMessage.includes("{0}") ? errorMessage.replace("{0}", fileExtension) : errorMessage : "";
+    errorMessage = localizedTexts.MIDDLEWARE_BANNER_FILE_EXTENSION_ERROR;
+    if ((_errorMessage4 = errorMessage) !== null && _errorMessage4 !== void 0 && _errorMessage4.includes("{0}")) errorMessage = errorMessage.replace("{0}", fileExtension); //keeping backwards compatibility for this localized string
+    if ((_errorMessage5 = errorMessage) !== null && _errorMessage5 !== void 0 && _errorMessage5.includes("{1}")) errorMessage = errorMessage.replace("{1}", fileExtension);
+    return errorMessage && errorMessage.length > 0 ? errorMessage : "";
   }
 };
-const getFileSizeErrorMessage = (maxUploadFileSize, maxFileSizeSupportedByDynamics, localizedTexts) => {
+const getFileSizeErrorMessage = (fileName, maxUploadFileSize, maxFileSizeSupportedByDynamics, localizedTexts) => {
+  var _errorMessage6;
   _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.ERROR, {
     Event: _TelemetryConstants.TelemetryEvent.AttachmentUploadValidatorMiddlewareFailed,
     Description: "Attachment validation failed",
@@ -171,8 +184,9 @@ const getFileSizeErrorMessage = (maxUploadFileSize, maxFileSizeSupportedByDynami
       ErrorDetails: `File exceeds the allowed limit of ${maxUploadFileSize}MB. Dynamics file size limit=${maxFileSizeSupportedByDynamics} AMS image size limit=${_Constants.AMSConstants.maxSupportedImageSize} AMS file size limit=${_Constants.AMSConstants.maxSupportedFileSize}`
     }
   });
-  const errorMessage = localizedTexts.MIDDLEWARE_BANNER_FILE_SIZE_ERROR;
-  return errorMessage ? errorMessage.includes("{0}") ? errorMessage.replace("{0}", maxUploadFileSize) : errorMessage : "";
+  let errorMessage = localizedTexts.MIDDLEWARE_BANNER_FILE_SIZE_ERROR;
+  if ((_errorMessage6 = errorMessage) !== null && _errorMessage6 !== void 0 && _errorMessage6.includes("{0}")) errorMessage = errorMessage.replace("{0}", maxUploadFileSize);
+  return errorMessage ? errorMessage.includes("{2}") ? errorMessage.replace("{2}", textEllipsis(fileName)) : errorMessage : "";
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unused-vars

package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/dataMaskingMiddleware.js

@@ -28,22 +28,25 @@ const applyDataMasking = (action, regexCollection) => {
     });
     return action;
   }
-  let isRuleMatched = false;
   for (const ruleId of Object.keys(regexCollection)) {
     const item = regexCollection[ruleId];
     if (item) {
+      let ruleInfiniteException = false;
+      let ruleApplied = false;
       try {
         const regex = new RegExp(item, "gi");
         let match;
         // eslint-disable-next-line no-cond-assign
         while (match = regex.exec(text)) {
           const replaceStr = match[0].replace(/./gi, maskedChar);
-          text = text.replace(match[0], replaceStr);
-          _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.INFO, {
-            Event: _TelemetryConstants.TelemetryEvent.DataMaskingRuleApplied,
-            Description: `Data Masking Rule Id: ${ruleId} applied.`
-          });
-          isRuleMatched = true;
+          const modifiedText = text.replace(match[0], replaceStr);
+          if (modifiedText == text) {
+            ruleInfiniteException = true;
+            console.warn(`The data masking rule ${item} is ignored because it matches empty strings. Please modify this rule.`);
+            break;
+          }
+          ruleApplied = true;
+          text = modifiedText;
         }
       } catch (err) {
         _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.ERROR, {
@@ -54,11 +57,21 @@ const applyDataMasking = (action, regexCollection) => {
           }
         });
       }
-    }
-
-    // Exit if rule matched
-    if (isRuleMatched === true) {
-      break;
+      if (ruleApplied) {
+        _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.INFO, {
+          Event: _TelemetryConstants.TelemetryEvent.DataMaskingRuleApplied,
+          Description: `Data Masking Rule Id: ${ruleId} applied.`
+        });
+      }
+      if (ruleInfiniteException) {
+        _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.ERROR, {
+          Event: _TelemetryConstants.TelemetryEvent.DataMaskingRuleApplyFailed,
+          ExceptionDetails: {
+            RuleId: ruleId,
+            Exception: "The data masking rule matches empty strings."
+          }
+        });
+      }
     }
   }
   action.payload.text = text;

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

@@ -55,6 +55,8 @@ export let BroadcastEvent;
   BroadcastEvent["BotAuthConfigRequest"] = "BotAuthConfigRequest";
   BroadcastEvent["BotAuthConfigResponse"] = "BotAuthConfigResponse";
   BroadcastEvent["HideChatVisibilityChangeEvent"] = "hideChatVisibilityChangeEvent";
+  BroadcastEvent["UpdateSessionDataForTelemetry"] = "UpdateSessionDataForTelemetry";
+  BroadcastEvent["UpdateConversationDataForTelemetry"] = "UpdateConversationDataForTelemetry";
 })(BroadcastEvent || (BroadcastEvent = {}));
 export let TelemetryEvent;
 (function (TelemetryEvent) {

package/lib/esm/common/utils.js

@@ -1,8 +1,8 @@
 var _this = this;
 import { AriaTelemetryConstants, Constants, LocaleConstants } from "./Constants";
+import { BroadcastEvent, LogLevel, TelemetryEvent } from "./telemetry/TelemetryConstants";
 import { DataStoreManager } from "./contextDataStore/DataStoreManager";
 import { KeyCodes } from "./KeyCodes";
-import { BroadcastEvent, LogLevel, TelemetryEvent } from "./telemetry/TelemetryConstants";
 import { Md5 } from "md5-typescript";
 import { TelemetryHelper } from "./telemetry/TelemetryHelper";
 const getElementBySelector = selector => {
@@ -154,7 +154,7 @@ export const getTimestampHourMinute = timestampStr => {
 export const parseAdaptiveCardPayload = (payload, requiredFieldMissingMessage) => {
   if (payload && payload !== "{}") {
     try {
-      const parsedPayload = JSON.parse(payload.replace(/*/g, "*"));
+      const parsedPayload = JSON.parse(payload.replace("*", "*"));
       const body = parsedPayload.body;
       if (body) {
         //Parse ID field into available options and add required error messages

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

@@ -811,7 +811,7 @@ export const dummyDefaultProps = {
         minHeight: "25px",
         width: "100%",
         minWidth: "250px",
-        padding: "0 10px 5px 10px"
+        padding: "5px"
       },
       downloadTranscriptButtonStyleProps: {
         icon: {
@@ -1750,13 +1750,19 @@ export const dummyDefaultProps = {
       }
     },
     localizedTexts: {
+      /*
+      MIDDLEWARE_BANNER_FILE parameters:
+      {0} = File limit size
+      {1} = File extension
+      {2} = File name
+      */
       MIDDLEWARE_BANNER_FILE_NULL_ERROR: "There was an error uploading the file, please try again.",
-      MIDDLEWARE_BANNER_FILE_SIZE_WITHOUT_EXTENSION_ERROR: "File exceeds the allowed limit of {0} MB and please upload the file with an appropriate file extension.",
-      MIDDLEWARE_BANNER_FILE_SIZE_EXTENSION_ERROR: "File exceeds the allowed limit of {0} MB and {1} files are not supported.",
-      MIDDLEWARE_BANNER_FILE_WITHOUT_EXTENSION: "File upload error. Please upload the file with an appropriate file extension.",
-      MIDDLEWARE_BANNER_FILE_EXTENSION_ERROR: "{0} files are not supported.",
-      MIDDLEWARE_BANNER_FILE_SIZE_ERROR: "File exceeds the allowed limit of {0} MB.",
-      MIDDLEWARE_BANNER_FILE_IS_EMPTY_ERROR: "This file can't be attached because it's empty. Please try again with a different file.",
+      MIDDLEWARE_BANNER_FILE_SIZE_WITHOUT_EXTENSION_ERROR: "File {2} exceeds the allowed limit of {0} MB and please upload the file with an appropriate file extension.",
+      MIDDLEWARE_BANNER_FILE_SIZE_EXTENSION_ERROR: "File {2} exceeds the allowed limit of {0} MB and {1} files are not supported.",
+      MIDDLEWARE_BANNER_FILE_WITHOUT_EXTENSION: "File upload error. Please upload the file {2} with an appropriate file extension.",
+      MIDDLEWARE_BANNER_FILE_EXTENSION_ERROR: "{1} files are not supported.",
+      MIDDLEWARE_BANNER_FILE_SIZE_ERROR: "File {2} exceeds the allowed limit of {0} MB.",
+      MIDDLEWARE_BANNER_FILE_IS_EMPTY_ERROR: "This file {2} can't be attached because it's empty. Please try again with a different file.",
       MIDDLEWARE_BANNER_ERROR_MESSAGE: "Upload failed, please try again.",
       MIDDLEWARE_BANNER_INTERNET_BACK_ONLINE: "You're back online.",
       MIDDLEWARE_BANNER_NO_INTERNET_CONNECTION: "Unable to connect—please check your internet connection.",

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

@@ -71,10 +71,6 @@ const endChat = async (props, chatSDK, setAdapter, setWebChatStyles, dispatch, a
     }
   }
   // Need to clear these states immediately when chat ended from OC.
-  dispatch({
-    type: LiveChatWidgetActionType.SET_CUSTOM_CONTEXT,
-    payload: undefined
-  });
   dispatch({
     type: LiveChatWidgetActionType.SET_CHAT_TOKEN,
     payload: undefined

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

@@ -1,3 +1,5 @@
+import { BroadcastEvent } from "../../../common/telemetry/TelemetryConstants";
+import { BroadcastService } from "@microsoft/omnichannel-chat-components";
 import { LiveChatWidgetActionType } from "../../../contexts/common/LiveChatWidgetActionType";
 import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
 import { TelemetryManager } from "../../../common/telemetry/TelemetryManager";
@@ -12,6 +14,12 @@ export const updateSessionDataForTelemetry = async (chatSDK, dispatch) => {
       type: LiveChatWidgetActionType.SET_TELEMETRY_DATA,
       payload: telemetryData
     });
+    BroadcastService.postMessage({
+      eventName: BroadcastEvent.UpdateSessionDataForTelemetry,
+      payload: {
+        chatSession
+      }
+    });
     await updateConversationDataForTelemetry(chatSDK, dispatch);
   }
 };
@@ -26,5 +34,11 @@ const updateConversationDataForTelemetry = async (chatSDK, dispatch) => {
       type: LiveChatWidgetActionType.SET_TELEMETRY_DATA,
       payload: telemetryData
     });
+    BroadcastService.postMessage({
+      eventName: BroadcastEvent.UpdateConversationDataForTelemetry,
+      payload: {
+        liveWorkItem
+      }
+    });
   }
 };

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

@@ -1,20 +1,22 @@
 function _extends() { _extends = Object.assign ? Object.assign.bind() : 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, BroadcastServiceInitialize, decodeComponentString } from "@microsoft/omnichannel-chat-components";
+import { Constants, E2VVOptions, LiveWorkItemState } from "../../../common/Constants";
 import { Stack } from "@fluentui/react";
 import React, { useEffect, useRef, useState } from "react";
 import { checkIfConversationStillValid, initStartChat, prepareStartChat, setPreChatAndInitiateChat } from "../common/startChat";
-import { createTimer, getBroadcastChannelName, getLocaleDirection, getStateFromCache, getWidgetCacheId, getWidgetEndChatEventName, isNullOrEmptyString, isUndefinedOrEmpty, getConversationDetailsCall } from "../../../common/utils";
+import { createTimer, getBroadcastChannelName, getConversationDetailsCall, getLocaleDirection, getStateFromCache, getWidgetCacheId, getWidgetEndChatEventName, isNullOrEmptyString, isUndefinedOrEmpty } from "../../../common/utils";
 import { endChat, prepareEndChat } from "../common/endChat";
+import { handleChatReconnect, isReconnectEnabled } from "../common/reconnectChatHelper";
 import { shouldShowCallingContainer, shouldShowChatButton, shouldShowConfirmationPane, shouldShowEmailTranscriptPane, shouldShowHeader, shouldShowLoadingPane, shouldShowOutOfOfficeHoursPane, shouldShowPostChatLoadingPane, shouldShowPostChatSurveyPane, shouldShowPreChatSurveyPane, shouldShowProactiveChatPane, shouldShowReconnectChatPane, shouldShowWebChatContainer } from "../../../controller/componentController";
 import { ActivityStreamHandler } from "../common/ActivityStreamHandler";
 import CallingContainerStateful from "../../callingcontainerstateful/CallingContainerStateful";
 import ChatButtonStateful from "../../chatbuttonstateful/ChatButtonStateful";
 import { Components } from "botframework-webchat";
 import ConfirmationPaneStateful from "../../confirmationpanestateful/ConfirmationPaneStateful";
+import { ConversationEndEntity } from "../../../contexts/common/ConversationEndEntity";
 import { ConversationState } from "../../../contexts/common/ConversationState";
 import { DataStoreManager } from "../../../common/contextDataStore/DataStoreManager";
-import { Constants, E2VVOptions, LiveWorkItemState } from "../../../common/Constants";
 import { ElementType } from "@microsoft/omnichannel-chat-components";
 import EmailTranscriptPaneStateful from "../../emailtranscriptpanestateful/EmailTranscriptPaneStateful";
 import HeaderStateful from "../../headerstateful/HeaderStateful";
@@ -36,6 +38,8 @@ import { defaultScrollBarProps } from "../common/defaultProps/defaultScrollBarPr
 import { defaultWebChatContainerStatefulProps } from "../../webchatcontainerstateful/common/defaultProps/defaultWebChatContainerStatefulProps";
 import { disposeTelemetryLoggers } from "../common/disposeTelemetryLoggers";
 import { getGeneralStylesForButton } from "../common/getGeneralStylesForButton";
+import { handleAgentEndConversation } from "../common/agentEndConversationHelper";
+import { handleChatDisconnect } from "../common/chatDisconnectHelper";
 import { initCallingSdk } from "../common/initCallingSdk";
 import { initConfirmationPropsComposer } from "../common/initConfirmationPropsComposer";
 import { initWebChatComposer } from "../common/initWebChatComposer";
@@ -46,10 +50,6 @@ import { startProactiveChat } from "../common/startProactiveChat";
 import useChatAdapterStore from "../../../hooks/useChatAdapterStore";
 import useChatContextStore from "../../../hooks/useChatContextStore";
 import useChatSDKStore from "../../../hooks/useChatSDKStore";
-import { ConversationEndEntity } from "../../../contexts/common/ConversationEndEntity";
-import { handleAgentEndConversation } from "../common/agentEndConversationHelper";
-import { handleChatReconnect, isReconnectEnabled } from "../common/reconnectChatHelper";
-import { handleChatDisconnect } from "../common/chatDisconnectHelper";
 export const LiveChatWidgetStateful = props => {
   var _props$webChatContain, _props$styleProps, _chatSDK$omnichannelC, _props$controlProps, _props$controlProps2, _props$webChatContain3, _props$webChatContain4, _props$styleProps2, _props$controlProps15, _props$controlProps16, _props$componentOverr, _props$controlProps17, _props$componentOverr2, _props$controlProps18, _props$componentOverr3, _props$controlProps19, _props$componentOverr4, _props$controlProps20, _props$componentOverr5, _props$controlProps21, _props$componentOverr6, _props$controlProps22, _props$componentOverr7, _props$controlProps23, _props$controlProps24, _props$componentOverr8, _props$controlProps25, _props$componentOverr9, _props$controlProps26, _props$componentOverr10, _props$componentOverr11, _props$componentOverr12;
   const [state, dispatch] = useChatContextStore();
@@ -190,6 +190,12 @@ export const LiveChatWidgetStateful = props => {
         });
       });
     }
+    if (props.initialCustomContext) {
+      dispatch({
+        type: LiveChatWidgetActionType.SET_CUSTOM_CONTEXT,
+        payload: props.initialCustomContext
+      });
+    }
 
     // Initialize global dir
     const globalDir = ((_props$controlProps9 = props.controlProps) === null || _props$controlProps9 === void 0 ? void 0 : _props$controlProps9.dir) ?? getLocaleDirection((_props$chatConfig2 = props.chatConfig) === null || _props$chatConfig2 === void 0 ? void 0 : (_props$chatConfig2$Ch = _props$chatConfig2.ChatWidgetLanguage) === null || _props$chatConfig2$Ch === void 0 ? void 0 : _props$chatConfig2$Ch.msdyn_localeid);
@@ -250,16 +256,12 @@ export const LiveChatWidgetStateful = props => {
     BroadcastService.getMessageByEventName(BroadcastEvent.HideChatVisibilityChangeEvent).subscribe(async event => {
       var _event$payload;
       if ((event === null || event === void 0 ? void 0 : (_event$payload = event.payload) === null || _event$payload === void 0 ? void 0 : _event$payload.isChatHidden) !== undefined) {
-        var _event$payload2, _props$controlProps10;
-        TelemetryHelper.logActionEvent(LogLevel.INFO, {
-          Event: TelemetryEvent.ChatVisibilityChanged,
-          Description: "Chat visibility changed to " + (event === null || event === void 0 ? void 0 : (_event$payload2 = event.payload) === null || _event$payload2 === void 0 ? void 0 : _event$payload2.isChatHidden)
-        });
+        var _props$controlProps10;
         if ((_props$controlProps10 = props.controlProps) !== null && _props$controlProps10 !== void 0 && _props$controlProps10.hideStartChatButton) {
-          var _event$payload3;
+          var _event$payload2;
           dispatch({
             type: LiveChatWidgetActionType.SET_MINIMIZED,
-            payload: event === null || event === void 0 ? void 0 : (_event$payload3 = event.payload) === null || _event$payload3 === void 0 ? void 0 : _event$payload3.isChatHidden
+            payload: event === null || event === void 0 ? void 0 : (_event$payload2 = event.payload) === null || _event$payload2 === void 0 ? void 0 : _event$payload2.isChatHidden
           });
         }
         const dateNow = Date.now();

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

@@ -1,6 +1,7 @@
 import { HtmlAttributeNames, Regex } from "../../common/Constants";
 import { LogLevel, TelemetryEvent } from "../../common/telemetry/TelemetryConstants";
 import React, { useEffect } from "react";
+import MarkdownIt from "markdown-it";
 import { extractPreChatSurveyResponseValues, findAllFocusableElement, getStateFromCache, isUndefinedOrEmpty, parseAdaptiveCardPayload } from "../../common/utils";
 import { ConversationState } from "../../contexts/common/ConversationState";
 import { LiveChatWidgetActionType } from "../../contexts/common/LiveChatWidgetActionType";
@@ -13,6 +14,8 @@ import useChatContextStore from "../../hooks/useChatContextStore";
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const PreChatSurveyPaneStateful = props => {
   var _surveyProps$stylePro, _props$surveyProps, _props$surveyProps$co;
+  // Set MarkDown global variable to be used for prechat adaptive cards
+  window["markdownit"] = MarkdownIt;
   const [state, dispatch] = useChatContextStore();
   const {
     surveyProps,

package/lib/esm/components/webchatcontainerstateful/common/defaultProps/defaultMiddlewareLocalizedTexts.js

@@ -1,11 +1,18 @@
+/* 
+MIDDLEWARE_BANNER_FILE parameters:
+{0} = File limit size
+{1} = File extension
+{2} = File name 
+*/
+
 export const defaultMiddlewareLocalizedTexts = {
   MIDDLEWARE_BANNER_FILE_NULL_ERROR: "There was an error uploading the file, please try again.",
-  MIDDLEWARE_BANNER_FILE_SIZE_WITHOUT_EXTENSION_ERROR: "File exceeds the allowed limit of {0} MB and please upload the file with an appropriate file extension.",
-  MIDDLEWARE_BANNER_FILE_SIZE_EXTENSION_ERROR: "File exceeds the allowed limit of {0} MB and {1} files are not supported.",
-  MIDDLEWARE_BANNER_FILE_WITHOUT_EXTENSION: "File upload error. Please upload the file with an appropriate file extension.",
-  MIDDLEWARE_BANNER_FILE_EXTENSION_ERROR: "{0} files are not supported.",
-  MIDDLEWARE_BANNER_FILE_SIZE_ERROR: "File exceeds the allowed limit of {0} MB.",
-  MIDDLEWARE_BANNER_FILE_IS_EMPTY_ERROR: "This file can't be attached because it's empty. Please try again with a different file.",
+  MIDDLEWARE_BANNER_FILE_SIZE_WITHOUT_EXTENSION_ERROR: "File {2} exceeds the allowed limit of {0} MB and please upload the file with an appropriate file extension.",
+  MIDDLEWARE_BANNER_FILE_SIZE_EXTENSION_ERROR: "File {2} exceeds the allowed limit of {0} MB and {1} files are not supported.",
+  MIDDLEWARE_BANNER_FILE_WITHOUT_EXTENSION: "File upload error. Please upload the file {2} with an appropriate file extension.",
+  MIDDLEWARE_BANNER_FILE_EXTENSION_ERROR: "{1} files are not supported.",
+  MIDDLEWARE_BANNER_FILE_SIZE_ERROR: "File {2} exceeds the allowed limit of {0} MB.",
+  MIDDLEWARE_BANNER_FILE_IS_EMPTY_ERROR: "This file {2} can't be attached because it's empty. Please try again with a different file.",
   MIDDLEWARE_BANNER_ERROR_MESSAGE: "Upload failed, please try again.",
   MIDDLEWARE_BANNER_INTERNET_BACK_ONLINE: "You’re back online.",
   MIDDLEWARE_BANNER_NO_INTERNET_CONNECTION: "Unable to connect—please check your internet connection.",

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

@@ -25,7 +25,9 @@ export class MockChatSDK {
     return "";
   }
   getConversationDetails() {
-    return {};
+    return {
+      State: "Active"
+    };
   }
   getCurrentLiveChatContext() {
     return {

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

@@ -70,6 +70,11 @@ const getMaxUploadFileSize = (maxFileSizeSupportedByDynamicsStr, contentType) =>
 const isImage = contentType => {
   return AMSConstants.supportedImagesMimeTypes.includes(contentType);
 };
+const textEllipsis = function (str) {
+  let maxLength = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 20;
+  const ellipsis = "...";
+  return str.length > maxLength ? str.slice(0, maxLength - ellipsis.length) + ellipsis : str;
+};
 const buildErrorMessage = (fileName, supportedFileExtension, supportedFileSize, fileIsEmpty, maxUploadFileSize, maxFileSizeSupportedByDynamics, localizedTexts) => {
   let errorMessage = "";
   if (!fileName || !maxUploadFileSize) {
@@ -85,10 +90,11 @@ const buildErrorMessage = (fileName, supportedFileExtension, supportedFileSize,
   if (!supportedFileExtension && !supportedFileSize) {
     errorMessage = getFileSizeAndFileExtensionErrorMessage(fileName, maxUploadFileSize, maxFileSizeSupportedByDynamics, localizedTexts);
   } else if (!supportedFileSize) {
-    errorMessage = getFileSizeErrorMessage(maxUploadFileSize, maxFileSizeSupportedByDynamics, localizedTexts);
+    errorMessage = getFileSizeErrorMessage(fileName, maxUploadFileSize, maxFileSizeSupportedByDynamics, localizedTexts);
   } else if (!supportedFileExtension) {
     errorMessage = getFileExtensionErrorMessage(fileName, localizedTexts);
   } else if (fileIsEmpty) {
+    var _errorMessage;
     TelemetryHelper.logActionEvent(LogLevel.ERROR, {
       Event: TelemetryEvent.AttachmentUploadValidatorMiddlewareFailed,
       Description: "Attachment validation failed",
@@ -96,7 +102,8 @@ const buildErrorMessage = (fileName, supportedFileExtension, supportedFileSize,
         ErrorDetails: "File provided is empty"
       }
     });
-    errorMessage = localizedTexts.MIDDLEWARE_BANNER_FILE_IS_EMPTY_ERROR ?? "";
+    errorMessage = localizedTexts.MIDDLEWARE_BANNER_FILE_IS_EMPTY_ERROR || "";
+    if ((_errorMessage = errorMessage) !== null && _errorMessage !== void 0 && _errorMessage.includes("{2}")) errorMessage = errorMessage.replace("{2}", textEllipsis(fileName));
   } else {
     TelemetryHelper.logActionEvent(LogLevel.ERROR, {
       Event: TelemetryEvent.AttachmentUploadValidatorMiddlewareFailed,
@@ -110,19 +117,18 @@ const buildErrorMessage = (fileName, supportedFileExtension, supportedFileSize,
   return errorMessage;
 };
 const getFileSizeAndFileExtensionErrorMessage = (fileName, maxUploadFileSize, maxFileSizeSupportedByDynamics, localizedTexts) => {
+  var _errorMessage3;
   const index = fileName.lastIndexOf(".");
   let errorMessage, exceptionDetails;
   if (index < 0) {
     errorMessage = localizedTexts.MIDDLEWARE_BANNER_FILE_SIZE_WITHOUT_EXTENSION_ERROR;
     exceptionDetails = `File exceeded the allowed limit of ${maxUploadFileSize} MB and File provided without file extension`;
   } else {
-    var _errorMessage;
+    var _errorMessage2;
     const fileExtension = fileName.substring(index);
     errorMessage = localizedTexts.MIDDLEWARE_BANNER_FILE_SIZE_EXTENSION_ERROR;
+    if ((_errorMessage2 = errorMessage) !== null && _errorMessage2 !== void 0 && _errorMessage2.includes("{1}")) errorMessage = errorMessage.replace("{1}", fileExtension);
     exceptionDetails = `File exceeds the allowed limit of ${maxUploadFileSize} MB and ${fileExtension} files are not supported`;
-    if ((_errorMessage = errorMessage) !== null && _errorMessage !== void 0 && _errorMessage.includes("{1}")) {
-      errorMessage = errorMessage.replace("{1}", fileExtension);
-    }
   }
   TelemetryHelper.logActionEvent(LogLevel.ERROR, {
     Event: TelemetryEvent.AttachmentUploadValidatorMiddlewareFailed,
@@ -131,10 +137,12 @@ const getFileSizeAndFileExtensionErrorMessage = (fileName, maxUploadFileSize, ma
       ErrorDetails: `${exceptionDetails} Dynamics file size limit=${maxFileSizeSupportedByDynamics} AMS image size limit=${AMSConstants.maxSupportedImageSize} AMS file size limit=${AMSConstants.maxSupportedFileSize}`
     }
   });
-  return errorMessage ? errorMessage.includes("{0}") ? errorMessage.replace("{0}", maxUploadFileSize) : errorMessage : "";
+  if ((_errorMessage3 = errorMessage) !== null && _errorMessage3 !== void 0 && _errorMessage3.includes("{0}")) errorMessage = errorMessage.replace("{0}", maxUploadFileSize);
+  return errorMessage ? errorMessage.includes("{2}") ? errorMessage.replace("{2}", textEllipsis(fileName)) : errorMessage : "";
 };
 const getFileExtensionErrorMessage = (fileName, localizedTexts) => {
   const index = fileName.lastIndexOf(".");
+  let errorMessage;
   if (index < 0) {
     TelemetryHelper.logActionEvent(LogLevel.ERROR, {
       Event: TelemetryEvent.AttachmentUploadValidatorMiddlewareFailed,
@@ -143,8 +151,10 @@ const getFileExtensionErrorMessage = (fileName, localizedTexts) => {
         ErrorDetails: "File provided without file extension"
       }
     });
-    return localizedTexts.MIDDLEWARE_BANNER_FILE_WITHOUT_EXTENSION ?? "";
+    errorMessage = localizedTexts.MIDDLEWARE_BANNER_FILE_WITHOUT_EXTENSION;
+    return errorMessage ? errorMessage.includes("{2}") ? errorMessage.replace("{2}", textEllipsis(fileName)) : errorMessage : "";
   } else {
+    var _errorMessage4, _errorMessage5;
     const fileExtension = fileName.substring(index);
     TelemetryHelper.logActionEvent(LogLevel.ERROR, {
       Event: TelemetryEvent.AttachmentUploadValidatorMiddlewareFailed,
@@ -153,11 +163,14 @@ const getFileExtensionErrorMessage = (fileName, localizedTexts) => {
         ErrorDetails: `${fileExtension} files extension is not supported.`
       }
     });
-    const errorMessage = localizedTexts.MIDDLEWARE_BANNER_FILE_EXTENSION_ERROR;
-    return errorMessage ? errorMessage.includes("{0}") ? errorMessage.replace("{0}", fileExtension) : errorMessage : "";
+    errorMessage = localizedTexts.MIDDLEWARE_BANNER_FILE_EXTENSION_ERROR;
+    if ((_errorMessage4 = errorMessage) !== null && _errorMessage4 !== void 0 && _errorMessage4.includes("{0}")) errorMessage = errorMessage.replace("{0}", fileExtension); //keeping backwards compatibility for this localized string
+    if ((_errorMessage5 = errorMessage) !== null && _errorMessage5 !== void 0 && _errorMessage5.includes("{1}")) errorMessage = errorMessage.replace("{1}", fileExtension);
+    return errorMessage && errorMessage.length > 0 ? errorMessage : "";
   }
 };
-const getFileSizeErrorMessage = (maxUploadFileSize, maxFileSizeSupportedByDynamics, localizedTexts) => {
+const getFileSizeErrorMessage = (fileName, maxUploadFileSize, maxFileSizeSupportedByDynamics, localizedTexts) => {
+  var _errorMessage6;
   TelemetryHelper.logActionEvent(LogLevel.ERROR, {
     Event: TelemetryEvent.AttachmentUploadValidatorMiddlewareFailed,
     Description: "Attachment validation failed",
@@ -165,8 +178,9 @@ const getFileSizeErrorMessage = (maxUploadFileSize, maxFileSizeSupportedByDynami
       ErrorDetails: `File exceeds the allowed limit of ${maxUploadFileSize}MB. Dynamics file size limit=${maxFileSizeSupportedByDynamics} AMS image size limit=${AMSConstants.maxSupportedImageSize} AMS file size limit=${AMSConstants.maxSupportedFileSize}`
     }
   });
-  const errorMessage = localizedTexts.MIDDLEWARE_BANNER_FILE_SIZE_ERROR;
-  return errorMessage ? errorMessage.includes("{0}") ? errorMessage.replace("{0}", maxUploadFileSize) : errorMessage : "";
+  let errorMessage = localizedTexts.MIDDLEWARE_BANNER_FILE_SIZE_ERROR;
+  if ((_errorMessage6 = errorMessage) !== null && _errorMessage6 !== void 0 && _errorMessage6.includes("{0}")) errorMessage = errorMessage.replace("{0}", maxUploadFileSize);
+  return errorMessage ? errorMessage.includes("{2}") ? errorMessage.replace("{2}", textEllipsis(fileName)) : errorMessage : "";
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unused-vars

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

@@ -22,22 +22,25 @@ const applyDataMasking = (action, regexCollection) => {
     });
     return action;
   }
-  let isRuleMatched = false;
   for (const ruleId of Object.keys(regexCollection)) {
     const item = regexCollection[ruleId];
     if (item) {
+      let ruleInfiniteException = false;
+      let ruleApplied = false;
       try {
         const regex = new RegExp(item, "gi");
         let match;
         // eslint-disable-next-line no-cond-assign
         while (match = regex.exec(text)) {
           const replaceStr = match[0].replace(/./gi, maskedChar);
-          text = text.replace(match[0], replaceStr);
-          TelemetryHelper.logActionEvent(LogLevel.INFO, {
-            Event: TelemetryEvent.DataMaskingRuleApplied,
-            Description: `Data Masking Rule Id: ${ruleId} applied.`
-          });
-          isRuleMatched = true;
+          const modifiedText = text.replace(match[0], replaceStr);
+          if (modifiedText == text) {
+            ruleInfiniteException = true;
+            console.warn(`The data masking rule ${item} is ignored because it matches empty strings. Please modify this rule.`);
+            break;
+          }
+          ruleApplied = true;
+          text = modifiedText;
         }
       } catch (err) {
         TelemetryHelper.logActionEvent(LogLevel.ERROR, {
@@ -48,11 +51,21 @@ const applyDataMasking = (action, regexCollection) => {
           }
         });
       }
-    }
-
-    // Exit if rule matched
-    if (isRuleMatched === true) {
-      break;
+      if (ruleApplied) {
+        TelemetryHelper.logActionEvent(LogLevel.INFO, {
+          Event: TelemetryEvent.DataMaskingRuleApplied,
+          Description: `Data Masking Rule Id: ${ruleId} applied.`
+        });
+      }
+      if (ruleInfiniteException) {
+        TelemetryHelper.logActionEvent(LogLevel.ERROR, {
+          Event: TelemetryEvent.DataMaskingRuleApplyFailed,
+          ExceptionDetails: {
+            RuleId: ruleId,
+            Exception: "The data masking rule matches empty strings."
+          }
+        });
+      }
     }
   }
   action.payload.text = text;

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

@@ -48,7 +48,9 @@ export declare enum BroadcastEvent {
     SigninCardReceived = "SignInCardReceived",
     BotAuthConfigRequest = "BotAuthConfigRequest",
     BotAuthConfigResponse = "BotAuthConfigResponse",
-    HideChatVisibilityChangeEvent = "hideChatVisibilityChangeEvent"
+    HideChatVisibilityChangeEvent = "hideChatVisibilityChangeEvent",
+    UpdateSessionDataForTelemetry = "UpdateSessionDataForTelemetry",
+    UpdateConversationDataForTelemetry = "UpdateConversationDataForTelemetry"
 }
 export declare enum TelemetryEvent {
     CallAdded = "CallAdded",

package/lib/types/components/livechatwidget/interfaces/ILiveChatWidgetProps.d.ts

@@ -53,5 +53,6 @@ export interface ILiveChatWidgetProps {
     liveChatContextFromCache?: ILiveChatWidgetContext;
     contextDataStore?: IContextDataStore;
     getAuthToken?: (authClientFunction?: string) => Promise<string | null>;
+    initialCustomContext?: any;
     scrollBarProps?: IScrollBarProps;
 }

package/lib/types/components/webchatcontainerstateful/common/mockchatsdk.d.ts

@@ -7,7 +7,9 @@ export declare class MockChatSDK {
     getChatToken(): null;
     createChatAdapter(): MockAdapter;
     getPreChatSurvey(parseToJson: boolean): string;
-    getConversationDetails(): {};
+    getConversationDetails(): {
+        State: string;
+    };
     getCurrentLiveChatContext(): {
         chatToken: {};
         requestId: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/omnichannel-chat-widget",
-  "version": "1.0.2-main.b2301a3",
+  "version": "1.0.3-main.05297ce",
   "description": "Microsoft Omnichannel Chat Widget",
   "main": "lib/cjs/index.js",
   "types": "lib/types/index.d.ts",
@@ -74,8 +74,8 @@
   },
   "dependencies": {
     "@fluentui/react": "^8.49.1",
-    "@microsoft/omnichannel-chat-components": "0.1.0-main.f4c21f0",
-    "@microsoft/omnichannel-chat-sdk": "1.2.1-main.171bfbe",
+    "@microsoft/omnichannel-chat-components": "1.0.1",
+    "@microsoft/omnichannel-chat-sdk": "1.3.0",
     "abort-controller-es5": "^2.0.1",
     "dompurify": "^2.3.4",
     "markdown-it": "^12.3.2",