@microsoft/omnichannel-chat-widget 1.8.3-main.ec1328d → 1.8.4-main.4478bbf

package/lib/esm/components/headerstateful/HeaderStateful.js

@@ -1,4 +1,4 @@
-import { LogLevel, TelemetryEvent } from "../../common/telemetry/TelemetryConstants";
+import { ConversationStage, LogLevel, TelemetryEvent } from "../../common/telemetry/TelemetryConstants";
 import React, { useEffect, useRef, useState } from "react";
 import { ConfirmationState } from "../../common/Constants";
 import { ConversationState } from "../../contexts/common/ConversationState";
@@ -61,7 +61,10 @@ export const HeaderStateful = props => {
       var _props$headerProps, _props$headerProps$co, _props$headerProps$co2;
       TelemetryHelper.logActionEventToAllTelemetry(LogLevel.INFO, {
         Event: TelemetryEvent.HeaderCloseButtonClicked,
-        Description: "Header Close action started."
+        Description: "Header Close action started.",
+        CustomProperties: {
+          ConversationStage: ConversationStage.ConversationEnd
+        }
       });
       if (localConfirmationPaneState.current !== ConfirmationState.Ok) {
         dispatch({
@@ -76,7 +79,10 @@ export const HeaderStateful = props => {
       }
       TelemetryHelper.logActionEventToAllTelemetry(LogLevel.INFO, {
         Event: TelemetryEvent.CloseChatActionCompleted,
-        Description: "Header Close action completed."
+        Description: "Header Close action completed.",
+        CustomProperties: {
+          ConversationStage: ConversationStage.ConversationEnd
+        }
       });
       const closeButtonId = ((_props$headerProps = props.headerProps) === null || _props$headerProps === void 0 ? void 0 : (_props$headerProps$co = _props$headerProps.controlProps) === null || _props$headerProps$co === void 0 ? void 0 : (_props$headerProps$co2 = _props$headerProps$co.closeButtonProps) === null || _props$headerProps$co2 === void 0 ? void 0 : _props$headerProps$co2.id) ?? `${controlProps.id}-close-button`;
       if (closeButtonId) {

package/lib/esm/components/livechatwidget/LiveChatWidget.js

@@ -13,13 +13,13 @@ import { isPersistentChatEnabled } from "./common/liveChatConfigUtils";
 import overridePropsOnMockIfApplicable from "./common/overridePropsOnMockIfApplicable";
 import { registerTelemetryLoggers } from "./common/registerTelemetryLoggers";
 export const LiveChatWidget = props => {
-  var _props$mock, _props$featureConfigP, _props$chatConfig, _props$chatConfig$Liv, _props$chatConfig2, _props$chatConfig2$Li;
+  var _props$featureConfigP, _props$chatConfig, _props$chatConfig$Liv, _props$chatConfig2, _props$chatConfig2$Li;
   const reducer = createReducer();
   const [state, dispatch] = useReducer(reducer, getLiveChatWidgetContextInitialState(props));
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const [adapter, setAdapter] = useState(undefined);
   const [facadeChatSDK, setFacadeChatSDK] = useState(undefined);
-  const chatSDK = getMockChatSDKIfApplicable(props.chatSDK, props === null || props === void 0 ? void 0 : (_props$mock = props.mock) === null || _props$mock === void 0 ? void 0 : _props$mock.type);
+  const chatSDK = getMockChatSDKIfApplicable(props.chatSDK, props === null || props === void 0 ? void 0 : props.mock);
   const disableReauthentication = ((_props$featureConfigP = props.featureConfigProps) === null || _props$featureConfigP === void 0 ? void 0 : _props$featureConfigP.disableReauthentication) === true;
   overridePropsOnMockIfApplicable(props);
   if (!props.chatConfig) {
@@ -29,14 +29,14 @@ export const LiveChatWidget = props => {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const isAuthenticatedChat = !!((_props$chatConfig = props.chatConfig) !== null && _props$chatConfig !== void 0 && (_props$chatConfig$Liv = _props$chatConfig.LiveChatConfigAuthSettings) !== null && _props$chatConfig$Liv !== void 0 && _props$chatConfig$Liv.msdyn_javascriptclientfunction) || isPersistentChatEnabled((_props$chatConfig2 = props.chatConfig) === null || _props$chatConfig2 === void 0 ? void 0 : (_props$chatConfig2$Li = _props$chatConfig2.LiveWSAndLiveChatEngJoin) === null || _props$chatConfig2$Li === void 0 ? void 0 : _props$chatConfig2$Li.msdyn_conversationmode);
   if (!facadeChatSDK) {
-    var _props$mock2;
+    var _props$mock;
     setFacadeChatSDK(new FacadeChatSDK({
       "chatSDK": chatSDK,
       "chatConfig": props.chatConfig,
       "isAuthenticated": isAuthenticatedChat,
       "getAuthToken": props === null || props === void 0 ? void 0 : props.getAuthToken,
       //when type is not undefined, it means the SDK is mocked
-      "isSDKMocked": !isNullOrUndefined(props === null || props === void 0 ? void 0 : (_props$mock2 = props.mock) === null || _props$mock2 === void 0 ? void 0 : _props$mock2.type)
+      "isSDKMocked": !isNullOrUndefined(props === null || props === void 0 ? void 0 : (_props$mock = props.mock) === null || _props$mock === void 0 ? void 0 : _props$mock.type)
     }, disableReauthentication));
   }
   useEffect(() => {

package/lib/esm/components/livechatwidget/common/ActivitySubscriber/AddActivitySubscriber.js

@@ -0,0 +1,120 @@
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+import { BroadcastEvent } from "../../../../common/telemetry/TelemetryConstants";
+import { BroadcastService } from "@microsoft/omnichannel-chat-components";
+import ChatWidgetEvents from "../ChatWidgetEvents";
+import SecureEventBus from "../../../../common/utils/SecureEventBus";
+
+/**
+ * The `AddActivitySubscriber` class is responsible for subscribing to the `ADD_ACTIVITY` event
+ * from the `ChatWidgetEvents` and notifying an observer when a new activity is added.
+ * 
+ * This class implements the `IActivitySubscriber` interface and acts as a bridge between
+ * the event system and the observer pattern.
+ */
+export let AddActivitySubscriber = /*#__PURE__*/function () {
+  /**
+   * The observer that will be notified when a new activity is added.
+   * This is expected to be an object with a `next` method, such as an RxJS `Observer`.
+   */
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+  /**
+   * Set to track processed activity IDs to prevent duplicate processing.
+   */
+
+  /**
+   * Unsubscribe function for the secure event listener
+   */
+
+  /**
+   * Subscription for PersistentConversationReset event
+   */
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+  /**
+   * Constructor initializes the `AddActivitySubscriber` and sets up a secure event listener
+   * for the `ChatWidgetEvents.ADD_ACTIVITY` event. When the event is triggered, it checks
+   * if the event payload contains an `activity` and notifies the observer.
+   */
+  function AddActivitySubscriber() {
+    _classCallCheck(this, AddActivitySubscriber);
+    _defineProperty(this, "observer", void 0);
+    _defineProperty(this, "processedActivityIds", new Set());
+    _defineProperty(this, "unsubscribeFromSecureEvent", null);
+    _defineProperty(this, "resetEventListener", void 0);
+    const eventBus = SecureEventBus.getInstance();
+
+    // Subscribe to the secure event bus instead of global window events
+    this.unsubscribeFromSecureEvent = eventBus.subscribe(ChatWidgetEvents.ADD_ACTIVITY, payload => {
+      if (payload !== null && payload !== void 0 && payload.activity) {
+        var _this$observer;
+        const activity = payload.activity;
+        const activityId = activity.id;
+        if (activity.identifier) {
+          if (this.processedActivityIds.has(activity === null || activity === void 0 ? void 0 : activity.identifier)) {
+            return; // Skip processing if already handled
+          }
+          // Add the activity ID to the processed set
+          this.processedActivityIds.add(activity === null || activity === void 0 ? void 0 : activity.identifier);
+        }
+
+        // Check if activity has an ID and if it has already been processed
+        if (activityId) {
+          if (this.processedActivityIds.has(activityId)) {
+            return; // Skip processing if already handled
+          }
+
+          // Add the activity ID to the processed set
+          this.processedActivityIds.add(activityId);
+        }
+
+        // Notify the observer with the new activity
+        (_this$observer = this.observer) === null || _this$observer === void 0 ? void 0 : _this$observer.next(activity);
+      }
+    });
+
+    // Subscribe to reset events for cleanup
+    this.resetEventListener = BroadcastService.getMessageByEventName(BroadcastEvent.PersistentConversationReset).subscribe(() => {
+      this.reset();
+      // Clean up the secure event listener when conversation resets
+      if (this.unsubscribeFromSecureEvent) {
+        this.unsubscribeFromSecureEvent();
+        this.unsubscribeFromSecureEvent = null;
+      }
+      // Unsubscribe from the reset event to prevent accumulation
+      if (this.resetEventListener) {
+        this.resetEventListener.unsubscribe();
+      }
+    });
+  }
+
+  /**
+   * The `next` method is a placeholder for processing the activity.
+   * This method can be overridden or extended as needed.
+   * 
+   * @param activity - The activity object to process.
+   * @returns The activity object (asynchronously).
+   */
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  _createClass(AddActivitySubscriber, [{
+    key: "next",
+    value: async function next(activity) {
+      return activity;
+    }
+
+    /**
+     * Reset the processed activity IDs when a conversation resets
+     */
+  }, {
+    key: "reset",
+    value: function reset() {
+      this.processedActivityIds.clear();
+    }
+  }]);
+  return AddActivitySubscriber;
+}();

package/lib/esm/components/livechatwidget/common/ActivitySubscriber/BotAuthActivitySubscriber.js

@@ -13,7 +13,6 @@ import { TelemetryManager } from "../../../../common/telemetry/TelemetryManager"
 const supportedSignInCardContentTypes = ["application/vnd.microsoft.card.signin", "application/vnd.microsoft.card.oauth"];
 const botOauthUrlRegex = /[\S]+.botframework.com\/api\/oauth\/signin\?signin=([\S]+)/;
 const delay = t => new Promise(resolve => setTimeout(resolve, t));
-let response;
 const extractSignInId = signInUrl => {
   const result = botOauthUrlRegex.exec(signInUrl);
   if (result && result[1]) {
@@ -49,20 +48,20 @@ const fetchBotAuthConfig = async (retries, interval) => {
     eventName: BroadcastEvent.BotAuthConfigRequest
   };
   BroadcastService.postMessage(botAuthConfigRequestEvent);
+  let response;
   const listener = BroadcastService.getMessageByEventName(BroadcastEvent.BotAuthConfigResponse).subscribe(data => {
     var _data$payload, _data$payload2;
     response = ((_data$payload = data.payload) === null || _data$payload === void 0 ? void 0 : _data$payload.response) !== undefined ? (_data$payload2 = data.payload) === null || _data$payload2 === void 0 ? void 0 : _data$payload2.response : response;
     listener.unsubscribe();
   });
-  if (response !== undefined) {
-    //return response;
-    return response;
-  }
   if (retries === 1) {
     // Base Case
     throw new Error();
   }
   await delay(interval);
+  if (response !== undefined) {
+    return response;
+  }
   return await fetchBotAuthConfig(--retries, interval);
 };
 export let BotAuthActivitySubscriber = /*#__PURE__*/function () {

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

@@ -0,0 +1,8 @@
+var ChatWidgetEvents;
+(function (ChatWidgetEvents) {
+  ChatWidgetEvents["ADD_ACTIVITY"] = "CHAT_WIDGET/ADD_ACTIVITY";
+  ChatWidgetEvents["FETCH_PERSISTENT_CHAT_HISTORY"] = "CHAT_WIDGET/FETCH_PERSISTENT_CHAT_HISTORY";
+  ChatWidgetEvents["NO_MORE_HISTORY_AVAILABLE"] = "CHAT_WIDGET/NO_MORE_HISTORY_AVAILABLE";
+  ChatWidgetEvents["HIDE_LOADING_BANNER"] = "CHAT_WIDGET/HIDE_LOADING_BANNER";
+})(ChatWidgetEvents || (ChatWidgetEvents = {}));
+export default ChatWidgetEvents;

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

@@ -0,0 +1,277 @@
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+import { BroadcastEvent, LogLevel, TelemetryEvent } from "../../../common/telemetry/TelemetryConstants";
+import { BroadcastService } from "@microsoft/omnichannel-chat-components";
+import ChatWidgetEvents from "./ChatWidgetEvents";
+import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
+import conversationDividerActivity from "../../webchatcontainerstateful/common/activities/conversationDividerActivity";
+import convertPersistentChatHistoryMessageToActivity from "../../webchatcontainerstateful/common/activityConverters/convertPersistentChatHistoryMessageToActivity";
+import { createTimer } from "../../../common/utils";
+import { defaultPersistentChatHistoryProps } from "./defaultProps/defaultPersistentChatHistoryProps";
+import dispatchCustomEvent from "../../../common/utils/dispatchCustomEvent";
+
+/**
+ * Class responsible for handling persistent conversation history
+ */
+let PersistentConversationHandler = /*#__PURE__*/function () {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+  function PersistentConversationHandler(facadeChatSDK, props) {
+    _classCallCheck(this, PersistentConversationHandler);
+    _defineProperty(this, "appliedProps", {
+      ...defaultPersistentChatHistoryProps
+    });
+    _defineProperty(this, "isLastPull", false);
+    _defineProperty(this, "pageToken", null);
+    _defineProperty(this, "facadeChatSDK", void 0);
+    _defineProperty(this, "lastMessage", null);
+    _defineProperty(this, "count", 0);
+    _defineProperty(this, "pageSize", 4);
+    _defineProperty(this, "isCurrentlyPulling", false);
+    _defineProperty(this, "pageTokenInTransitSet", new Set());
+    _defineProperty(this, "resetEventListener", BroadcastService.getMessageByEventName(BroadcastEvent.PersistentConversationReset).subscribe(() => {
+      this.reset();
+    }));
+    this.facadeChatSDK = facadeChatSDK;
+    this.appliedPropsHandler(props);
+    TelemetryHelper.logActionEventToAllTelemetry(LogLevel.INFO, {
+      Event: TelemetryEvent.LCWPersistentConversationHandlerInitialized,
+      Description: "PersistentConversationHandler initialized",
+      CustomProperties: {
+        pageSize: this.pageSize
+      }
+    });
+  }
+  _createClass(PersistentConversationHandler, [{
+    key: "appliedPropsHandler",
+    value: function appliedPropsHandler(props) {
+      this.appliedProps = {
+        ...defaultPersistentChatHistoryProps,
+        ...props
+      };
+      this.pageSize = this.appliedProps.pageSize || 4;
+    }
+  }, {
+    key: "reset",
+    value: function reset() {
+      this.isLastPull = false;
+      this.pageToken = null;
+      this.lastMessage = null;
+      this.count = 0;
+      this.isCurrentlyPulling = false;
+      this.pageTokenInTransitSet.clear();
+    }
+  }, {
+    key: "destroy",
+    value: function destroy() {
+      // Only unsubscribe when the handler is being destroyed completely
+      this.resetEventListener.unsubscribe();
+    }
+  }, {
+    key: "pullHistory",
+    value: async function pullHistory() {
+      const pullTimer = createTimer();
+
+      // Prevent concurrent pulls regardless of pageToken
+      if (this.isCurrentlyPulling) {
+        TelemetryHelper.logActionEvent(LogLevel.WARN, {
+          Event: TelemetryEvent.LCWPersistentHistoryPullBlocked,
+          Description: "History pull blocked - already in progress"
+        });
+        return;
+      }
+
+      // Additional check for specific pageToken duplicates
+      if (this.pageToken && this.pageTokenInTransitSet.has(this.pageToken)) {
+        return;
+      }
+
+      // Mark as currently pulling
+      this.isCurrentlyPulling = true;
+      if (this.pageToken) {
+        this.pageTokenInTransitSet.add(this.pageToken);
+      }
+      try {
+        var _ref;
+        const messages = await this.fetchHistoryMessages();
+        if (messages === null || (messages === null || messages === void 0 ? void 0 : messages.length) === 0) {
+          this.isLastPull = true;
+          // Dispatch event to notify UI that no more history is available
+          dispatchCustomEvent(ChatWidgetEvents.NO_MORE_HISTORY_AVAILABLE);
+          // Also hide the loading banner
+          dispatchCustomEvent(ChatWidgetEvents.HIDE_LOADING_BANNER);
+          TelemetryHelper.logActionEvent(LogLevel.INFO, {
+            Event: TelemetryEvent.LCWPersistentHistoryPullCompleted,
+            Description: "History pull completed - no more messages",
+            ElapsedTimeInMilliseconds: pullTimer.milliSecondsElapsed
+          });
+          return;
+        }
+        const messagesDescOrder = (_ref = [...messages]) === null || _ref === void 0 ? void 0 : _ref.reverse();
+        this.processHistoryMessages(messagesDescOrder);
+
+        // Dispatch event to hide the loading banner after messages are processed
+        dispatchCustomEvent(ChatWidgetEvents.HIDE_LOADING_BANNER);
+        TelemetryHelper.logActionEvent(LogLevel.INFO, {
+          Event: TelemetryEvent.LCWPersistentHistoryPullCompleted,
+          Description: "History pull completed successfully",
+          ElapsedTimeInMilliseconds: pullTimer.milliSecondsElapsed,
+          CustomProperties: {
+            messageCount: messages.length,
+            totalProcessed: this.count
+          }
+        });
+      } finally {
+        // Always clear the pulling flag when done
+        this.isCurrentlyPulling = false;
+
+        // Remove pageToken from transit set if it was added
+        if (this.pageToken) {
+          this.pageTokenInTransitSet.delete(this.pageToken);
+        }
+      }
+    }
+
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  }, {
+    key: "processHistoryMessages",
+    value: function processHistoryMessages(messagesDescOrder) {
+      for (const message of messagesDescOrder) {
+        try {
+          const activity = this.processMessageToActivity(message);
+          if (activity) {
+            dispatchCustomEvent(ChatWidgetEvents.ADD_ACTIVITY, {
+              activity
+            });
+            const dividerActivity = this.createDividerActivity(activity);
+            if (dividerActivity) {
+              dispatchCustomEvent(ChatWidgetEvents.ADD_ACTIVITY, {
+                activity: dividerActivity
+              });
+            }
+            this.lastMessage = activity;
+          }
+        } catch (error) {
+          TelemetryHelper.logActionEvent(LogLevel.ERROR, {
+            Event: TelemetryEvent.ConvertPersistentChatHistoryMessageToActivityFailed,
+            ExceptionDetails: error
+          });
+        }
+      }
+    }
+
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  }, {
+    key: "fetchHistoryMessages",
+    value: async function fetchHistoryMessages() {
+      if (!this.shouldPull()) {
+        // Dispatch event to ensure banner is hidden when no more pulls are needed
+        dispatchCustomEvent(ChatWidgetEvents.NO_MORE_HISTORY_AVAILABLE);
+        dispatchCustomEvent(ChatWidgetEvents.HIDE_LOADING_BANNER);
+        return [];
+      }
+      const options = {
+        pageSize: this.pageSize,
+        pageToken: this.pageToken || undefined
+      };
+      try {
+        var _this$facadeChatSDK;
+        const response = await ((_this$facadeChatSDK = this.facadeChatSDK) === null || _this$facadeChatSDK === void 0 ? void 0 : _this$facadeChatSDK.fetchPersistentConversationHistory(options));
+        const {
+          chatMessages: messages,
+          nextPageToken: pageToken
+        } = response;
+        this.pageToken = pageToken || null;
+        if (pageToken === null) {
+          this.isLastPull = true;
+          // Dispatch event when we reach the end of available history
+          dispatchCustomEvent(ChatWidgetEvents.NO_MORE_HISTORY_AVAILABLE);
+        }
+
+        // if chatMessages is null, return empty array
+        if (!messages) {
+          this.isLastPull = true;
+          // Dispatch event when we reach the end of available history
+          dispatchCustomEvent(ChatWidgetEvents.NO_MORE_HISTORY_AVAILABLE);
+          // Also hide the loading banner
+          dispatchCustomEvent(ChatWidgetEvents.HIDE_LOADING_BANNER);
+          return [];
+        }
+        dispatchCustomEvent(ChatWidgetEvents.HIDE_LOADING_BANNER);
+        return messages;
+      } catch (error) {
+        TelemetryHelper.logSDKEvent(LogLevel.ERROR, {
+          Event: TelemetryEvent.FetchPersistentChatHistoryFailed,
+          ExceptionDetails: error
+        });
+        this.isLastPull = true;
+        this.pageToken = null;
+        // Dispatch event when there's an error to stop loading banner
+        dispatchCustomEvent(ChatWidgetEvents.NO_MORE_HISTORY_AVAILABLE);
+        // Also hide the loading banner
+        dispatchCustomEvent(ChatWidgetEvents.HIDE_LOADING_BANNER);
+        return [];
+      }
+    }
+  }, {
+    key: "shouldPull",
+    value: function shouldPull() {
+      return !this.isLastPull;
+    }
+
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  }, {
+    key: "processMessageToActivity",
+    value: function processMessageToActivity(message) {
+      try {
+        const activity = convertPersistentChatHistoryMessageToActivity(message);
+        activity.id = activity.id || `activity-${this.count}`;
+        activity.channelData = {
+          ...activity.channelData,
+          metadata: {
+            count: this.count
+          }
+        };
+
+        // Increment the count after assigning it to the activity
+        this.count += 1;
+        return activity;
+      } catch (error) {
+        TelemetryHelper.logActionEvent(LogLevel.ERROR, {
+          Event: TelemetryEvent.ConvertPersistentChatHistoryMessageToActivityFailed,
+          ExceptionDetails: error
+        });
+        throw error;
+      }
+    }
+
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  }, {
+    key: "createDividerActivity",
+    value: function createDividerActivity(activity) {
+      var _this$lastMessage, _this$lastMessage$cha;
+      if (((_this$lastMessage = this.lastMessage) === null || _this$lastMessage === void 0 ? void 0 : (_this$lastMessage$cha = _this$lastMessage.channelData) === null || _this$lastMessage$cha === void 0 ? void 0 : _this$lastMessage$cha.conversationId) !== activity.channelData.conversationId) {
+        const rawSequenceId = activity.channelData["webchat:sequence-id"];
+        const sequenceId = typeof rawSequenceId === "number" && !isNaN(rawSequenceId) ? rawSequenceId + 1 : 1;
+        const timestamp = new Date(activity.timestamp).getTime() + 1;
+        return {
+          ...conversationDividerActivity,
+          channelData: {
+            ...conversationDividerActivity.channelData,
+            conversationId: activity.channelData.conversationId,
+            "webchat:sequence-id": sequenceId
+          },
+          timestamp: new Date(timestamp).toISOString(),
+          identifier: `divider-${activity.channelData.conversationId}`
+        };
+      }
+      return null;
+    }
+  }]);
+  return PersistentConversationHandler;
+}();
+export default PersistentConversationHandler;

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

@@ -1,3 +1,4 @@
+import { AddActivitySubscriber } from "./ActivitySubscriber/AddActivitySubscriber";
 import { BotAuthActivitySubscriber } from "./ActivitySubscriber/BotAuthActivitySubscriber";
 import { ChatAdapterShim } from "./ChatAdapterShim";
 import { HiddenAdaptiveCardActivitySubscriber } from "./ActivitySubscriber/HiddenAdaptiveCardActivitySubscriber";
@@ -44,6 +45,7 @@ export const createAdapter = async (facadeChatSDK, props) => {
       fetchBotAuthConfigRetryInterval: (props === null || props === void 0 ? void 0 : (_props$webChatContain3 = props.webChatContainerProps) === null || _props$webChatContain3 === void 0 ? void 0 : (_props$webChatContain4 = _props$webChatContain3.botAuthConfig) === null || _props$webChatContain4 === void 0 ? void 0 : _props$webChatContain4.fetchBotAuthConfigRetryInterval) || defaultBotAuthConfig.fetchBotAuthConfigRetryInterval
     };
     adapter = new ChatAdapterShim(adapter);
+    adapter.addSubscriber(new AddActivitySubscriber());
     adapter.addSubscriber(new PauseActivitySubscriber());
     adapter.addSubscriber(new BotAuthActivitySubscriber(botAuthActivitySubscriberOptionalParams));
     // Remove this code after ICM ID:544623085 is fixed

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

@@ -0,0 +1,11 @@
+export const defaultPersistentChatHistoryProps = {
+  persistentChatHistoryEnabled: true,
+  pageSize: 4,
+  dividerActivityStyle: {
+    border: "1px solid rgb(96, 94, 92, 0.5)",
+    margin: "10px 20%"
+  },
+  bannerStyle: {
+    margin: "10px auto"
+  }
+};

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

@@ -1,9 +1,10 @@
 import { BroadcastEvent, LogLevel, TelemetryEvent } from "../../../common/telemetry/TelemetryConstants";
-import { ConfirmationState, Constants, ConversationEndEntity, ParticipantType, PrepareEndChatDescriptionConstants } from "../../../common/Constants";
+import { ConfirmationState, Constants, ConversationEndEntity, LiveWorkItemState, ParticipantType, PrepareEndChatDescriptionConstants } from "../../../common/Constants";
 import { getConversationDetailsCall, getWidgetEndChatEventName } from "../../../common/utils";
 import { getPostChatContext, initiatePostChat } from "./renderSurveyHelpers";
 import { BroadcastService } from "@microsoft/omnichannel-chat-components";
 import { ConversationState } from "../../../contexts/common/ConversationState";
+import { LazyLoadHandler } from "../../webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/activities/LazyLoadActivity";
 import { LiveChatWidgetActionType } from "../../../contexts/common/LiveChatWidgetActionType";
 import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
 import { TelemetryManager } from "../../../common/telemetry/TelemetryManager";
@@ -39,7 +40,7 @@ const prepareEndChat = async (props, facadeChatSDK, state, dispatch, setAdapter,
       }
 
       // Use Case: If ended by Agent, stay chat in InActive state
-      let isConversationalSurveyEnabled = state.appStates.isConversationalSurveyEnabled;
+      const isConversationalSurveyEnabled = state.appStates.isConversationalSurveyEnabled;
       if (isConversationalSurveyEnabled && ((state === null || state === void 0 ? void 0 : (_state$appStates2 = state.appStates) === null || _state$appStates2 === void 0 ? void 0 : _state$appStates2.conversationEndedBy) === ConversationEndEntity.Agent || (state === null || state === void 0 ? void 0 : (_state$appStates3 = state.appStates) === null || _state$appStates3 === void 0 ? void 0 : _state$appStates3.conversationEndedBy) === ConversationEndEntity.Bot)) {
         dispatch({
           type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
@@ -147,8 +148,23 @@ const endChat = async (props, facadeChatSDK, state, dispatch, setAdapter, setWeb
       type: LiveChatWidgetActionType.GET_IN_MEMORY_STATE,
       payload: null
     });
+    let isSessionEnded = inMemoryState === null || inMemoryState === void 0 ? void 0 : (_inMemoryState$appSta = inMemoryState.appStates) === null || _inMemoryState$appSta === void 0 ? void 0 : _inMemoryState$appSta.chatDisconnectEventReceived;
+    if (!isSessionEnded) {
+      // double check by fetching the latest conversation details
+      const conversationDetails = await getConversationDetailsCall(facadeChatSDK);
+      if ((conversationDetails === null || conversationDetails === void 0 ? void 0 : conversationDetails.state) === LiveWorkItemState.WrapUp || (conversationDetails === null || conversationDetails === void 0 ? void 0 : conversationDetails.state) === LiveWorkItemState.Closed) {
+        TelemetryHelper.logActionEvent(LogLevel.INFO, {
+          Event: TelemetryEvent.ChatDisconnectThreadEventReceived,
+          Description: "Checking conversation details upon endChat. Chat disconnected.",
+          CustomProperties: {
+            conversationDetails
+          }
+        });
+        isSessionEnded = true;
+      }
+    }
     const endChatOptionalParameters = {
-      isSessionEnded: inMemoryState === null || inMemoryState === void 0 ? void 0 : (_inMemoryState$appSta = inMemoryState.appStates) === null || _inMemoryState$appSta === void 0 ? void 0 : _inMemoryState$appSta.chatDisconnectEventReceived
+      isSessionEnded
     };
     try {
       TelemetryHelper.logSDKEvent(LogLevel.INFO, {
@@ -210,7 +226,12 @@ const endChat = async (props, facadeChatSDK, state, dispatch, setAdapter, setWeb
         type: LiveChatWidgetActionType.SET_POST_CHAT_CONTEXT,
         payload: undefined
       });
-      // Always allow to close the chat for embedded mode irrespective of end chat errors
+
+      // Call direct reset to ensure LazyLoadHandler gets reset regardless of broadcast timing
+      LazyLoadHandler.directReset();
+      BroadcastService.postMessage({
+        eventName: BroadcastEvent.PersistentConversationReset
+      });
       closeChatWidget(dispatch, setWebChatStyles, props);
       facadeChatSDK.destroy();
     }
@@ -296,6 +317,10 @@ export const closeChatStateCleanUp = dispatch => {
       proactiveChatInNewWindow: false
     }
   });
+  dispatch({
+    type: LiveChatWidgetActionType.SET_CITATIONS,
+    payload: {}
+  });
 
   // Clear live chat context only if chat widget is fully closed to support transcript calls after sessionclose is called
   dispatch({

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

@@ -3,14 +3,15 @@ import { DesignerChatSDK } from "../../webchatcontainerstateful/common/DesignerC
 import { MockChatSDK } from "../../webchatcontainerstateful/common/mockchatsdk";
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const getMockChatSDKIfApplicable = (chatSDK, type) => {
-  if (type) {
-    switch (type.toLowerCase()) {
+export const getMockChatSDKIfApplicable = (chatSDK, mockProps) => {
+  if (mockProps !== null && mockProps !== void 0 && mockProps.type) {
+    switch (mockProps.type.toLowerCase()) {
       case "demo":
         chatSDK = new DemoChatSDK();
         break;
       case "designer":
         chatSDK = new DesignerChatSDK();
+        chatSDK.mockMessages = mockProps === null || mockProps === void 0 ? void 0 : mockProps.mockMessages;
         break;
       default:
         chatSDK = new MockChatSDK();