@microsoft/omnichannel-chat-widget 0.1.0-main.9e62ed8 → 0.1.0-main.a60f242

package/lib/cjs/common/Constants.js

@@ -167,6 +167,8 @@ _defineProperty(Constants, "internetConnectionTestUrlText", "Omnichannel Connect
 
 _defineProperty(Constants, "ChatWidgetStateChangedPrefix", "ChatWidgetStateChanged");
 
+_defineProperty(Constants, "PostChatLoadingDurationInMs", 2000);
+
 const Regex = (_class = class Regex {}, _defineProperty(_class, "EmailRegex", "(?:[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+)*|\"(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21\\x23-\\x5b\\x5d-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])*\")@(?:(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?\\.)+[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?|\\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-zA-Z0-9-]*[a-zA-Z0-9]:(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21-\\x5a\\x53-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])+)\\])"), _class);
 exports.Regex = Regex;
 

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

@@ -59,6 +59,7 @@ exports.BroadcastEvent = BroadcastEvent;
   BroadcastEvent["ChatInitiated"] = "ChatInitiated";
   BroadcastEvent["CloseChat"] = "CloseChat";
   BroadcastEvent["InitiateEndChatOnBrowserUnload"] = "InitiateEndChatOnBrowserUnload";
+  BroadcastEvent["ClosePopoutWindow"] = "ClosePopoutWindow";
 })(BroadcastEvent || (exports.BroadcastEvent = BroadcastEvent = {}));
 
 let TelemetryEvent;
@@ -140,6 +141,8 @@ exports.TelemetryEvent = TelemetryEvent;
   TelemetryEvent["AudioToggleButtonClicked"] = "AudioToggleButtonClicked";
   TelemetryEvent["SuppressBotMagicCodeSucceeded"] = "SuppressBotMagicCodeSucceeded";
   TelemetryEvent["SuppressBotMagicCodeFailed"] = "SuppressBotMagicCodeFailed";
+  TelemetryEvent["GetConversationDetailsException"] = "GetConversationDetailsException";
+  TelemetryEvent["BrowserUnloadEventStarted"] = "BrowserUnloadEventStarted";
   TelemetryEvent["ProcessingHTMLTextMiddlewareFailed"] = "ProcessingHTMLTextMiddlewareFailed";
   TelemetryEvent["ProcessingSanitizationMiddlewareFailed"] = "ProcessingSanitizationMiddlewareFailed";
   TelemetryEvent["FormatTagsMiddlewareJSONStringifyFailed"] = "FormatTagsMiddlewareJSONStringifyFailed";
@@ -211,6 +214,7 @@ class TelemetryConstants {
       case TelemetryEvent.MessageSent:
       case TelemetryEvent.MessageReceived:
       case TelemetryEvent.CustomContextReceived:
+      case TelemetryEvent.BrowserUnloadEventStarted:
         return ScenarioType.ACTIONS;
 
       case TelemetryEvent.StartChatSDKCall:

package/lib/cjs/common/utils.js

@@ -3,10 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setTabIndices = exports.setFocusOnSendBox = exports.setFocusOnElement = exports.preventFocusToMoveOutOfElement = exports.parseAdaptiveCardPayload = exports.newGuid = exports.isNullOrUndefined = exports.isNullOrEmptyString = exports.getWidgetEndChatEventName = exports.getWidgetCacheId = exports.getTimestampHourMinute = exports.getLocaleDirection = exports.getIconText = exports.getDomain = exports.findParentFocusableElementsWithoutChildContainer = exports.findAllFocusableElement = exports.extractPreChatSurveyResponseValues = exports.escapeHtml = exports.createTimer = exports.changeLanguageCodeFormatForWebChat = void 0;
+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.findParentFocusableElementsWithoutChildContainer = exports.findAllFocusableElement = exports.extractPreChatSurveyResponseValues = exports.escapeHtml = exports.createTimer = exports.changeLanguageCodeFormatForWebChat = exports.addDelayInMs = void 0;
 
 var _Constants = require("./Constants");
 
+var _DataStoreManager = require("./contextDataStore/DataStoreManager");
+
 var _KeyCodes = require("./KeyCodes");
 
 var _TelemetryConstants = require("./telemetry/TelemetryConstants");
@@ -360,6 +362,50 @@ exports.getWidgetCacheId = getWidgetCacheId;
 
 const getWidgetEndChatEventName = (orgId, widgetId) => {
   return `${_TelemetryConstants.BroadcastEvent.ChatEnded}_${orgId}_${widgetId}`;
+}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+
+exports.getWidgetEndChatEventName = getWidgetEndChatEventName;
+
+const getStateFromCache = (orgId, widgetId) => {
+  // Getting updated state from cache
+  try {
+    if (_DataStoreManager.DataStoreManager.clientDataStore) {
+      var _DataStoreManager$cli;
+
+      const widgetStateEventName = getWidgetCacheId(orgId, widgetId);
+      const widgetStateFromCache = (_DataStoreManager$cli = _DataStoreManager.DataStoreManager.clientDataStore) === null || _DataStoreManager$cli === void 0 ? void 0 : _DataStoreManager$cli.getData(widgetStateEventName, "localStorage");
+      const persistedState = widgetStateFromCache ? JSON.parse(widgetStateFromCache) : undefined;
+      return persistedState;
+    } else {
+      return null;
+    }
+  } catch (error) {
+    console.log(error);
+    return null;
+  }
+}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+
+exports.getStateFromCache = getStateFromCache;
+
+const isUndefinedOrEmpty = object => {
+  if (object) {
+    if (Object.keys(object).length === 0) {
+      return true;
+    }
+
+    return false;
+  } else {
+    return true;
+  }
+}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+
+exports.isUndefinedOrEmpty = isUndefinedOrEmpty;
+
+const addDelayInMs = ms => {
+  return new Promise(resolve => setTimeout(resolve, ms));
 };
 
-exports.getWidgetEndChatEventName = getWidgetEndChatEventName;
+exports.addDelayInMs = addDelayInMs;

package/lib/cjs/components/chatbuttonstateful/ChatButtonStateful.js

@@ -82,6 +82,10 @@ const ChatButtonStateful = props => {
     titleText: "We're Offline",
     subtitleText: "No agents available",
     onClick: async () => {
+      _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.INFO, {
+        Event: _TelemetryConstants.TelemetryEvent.LCWChatButtonClicked
+      });
+
       if (state.appStates.isMinimized) {
         dispatch({
           type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_MINIMIZED,

package/lib/cjs/components/confirmationpanestateful/ConfirmationPaneStateful.js

@@ -41,7 +41,6 @@ const ConfirmationPaneStateful = props => {
   const {
     prepareEndChat
   } = props; // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
   const [adapter] = (0, _useChatAdapterStore.default)();
   const controlProps = {

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

@@ -81,8 +81,8 @@ const HeaderStateful = props => {
       });
     },
     ...(headerProps === null || headerProps === void 0 ? void 0 : headerProps.controlProps),
-    hideTitle: state.appStates.conversationState === _ConversationState.ConversationState.Loading || (headerProps === null || headerProps === void 0 ? void 0 : (_headerProps$controlP = headerProps.controlProps) === null || _headerProps$controlP === void 0 ? void 0 : _headerProps$controlP.hideTitle),
-    hideIcon: state.appStates.conversationState === _ConversationState.ConversationState.Loading || (headerProps === null || headerProps === void 0 ? void 0 : (_headerProps$controlP2 = headerProps.controlProps) === null || _headerProps$controlP2 === void 0 ? void 0 : _headerProps$controlP2.hideIcon),
+    hideTitle: state.appStates.conversationState === _ConversationState.ConversationState.Loading || state.appStates.conversationState === _ConversationState.ConversationState.PostchatLoading || (headerProps === null || headerProps === void 0 ? void 0 : (_headerProps$controlP = headerProps.controlProps) === null || _headerProps$controlP === void 0 ? void 0 : _headerProps$controlP.hideTitle),
+    hideIcon: state.appStates.conversationState === _ConversationState.ConversationState.Loading || state.appStates.conversationState === _ConversationState.ConversationState.PostchatLoading || (headerProps === null || headerProps === void 0 ? void 0 : (_headerProps$controlP2 = headerProps.controlProps) === null || _headerProps$controlP2 === void 0 ? void 0 : _headerProps$controlP2.hideIcon),
     hideCloseButton: state.appStates.conversationState === _ConversationState.ConversationState.Loading || state.appStates.conversationState === _ConversationState.ConversationState.Prechat || state.appStates.conversationState === _ConversationState.ConversationState.ReconnectChat || (headerProps === null || headerProps === void 0 ? void 0 : (_headerProps$controlP3 = headerProps.controlProps) === null || _headerProps$controlP3 === void 0 ? void 0 : _headerProps$controlP3.hideCloseButton)
   };
   const outOfOfficeControlProps = {

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

@@ -27,18 +27,35 @@ var _utils = require("../../../common/utils");
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const prepareEndChat = async (props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, state) => {
-  var _state$domainStates$l, _state$domainStates$l2, _state$domainStates$l3, _state$domainStates$l4;
+  var _state$domainStates$l, _state$domainStates$l2, _state$domainStates$l3, _state$domainStates$l4, _conversationDetails;
 
   const isPostChatEnabled = (_state$domainStates$l = state.domainStates.liveChatConfig) === null || _state$domainStates$l === void 0 ? void 0 : (_state$domainStates$l2 = _state$domainStates$l.LiveWSAndLiveChatEngJoin) === null || _state$domainStates$l2 === void 0 ? void 0 : _state$domainStates$l2.msdyn_postconversationsurveyenable;
-  const postChatSurveyMode = (_state$domainStates$l3 = state.domainStates.liveChatConfig) === null || _state$domainStates$l3 === void 0 ? void 0 : (_state$domainStates$l4 = _state$domainStates$l3.LiveWSAndLiveChatEngJoin) === null || _state$domainStates$l4 === void 0 ? void 0 : _state$domainStates$l4.msdyn_postconversationsurveymode;
-  const conversationDetails = await chatSDK.getConversationDetails();
+  const postChatSurveyMode = (_state$domainStates$l3 = state.domainStates.liveChatConfig) === null || _state$domainStates$l3 === void 0 ? void 0 : (_state$domainStates$l4 = _state$domainStates$l3.LiveWSAndLiveChatEngJoin) === null || _state$domainStates$l4 === void 0 ? void 0 : _state$domainStates$l4.msdyn_postconversationsurveymode; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
-  if (isPostChatEnabled === "true" && (conversationDetails === null || conversationDetails === void 0 ? void 0 : conversationDetails.canRenderPostChat) === _Constants.Constants.truePascal) {
+  let conversationDetails = undefined;
+
+  try {
+    conversationDetails = await chatSDK.getConversationDetails();
+  } catch (erorr) {
+    _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.ERROR, {
+      Event: _TelemetryConstants.TelemetryEvent.GetConversationDetailsException,
+      ExceptionDetails: {
+        exception: `Failed to get conversation details: ${erorr}`
+      }
+    });
+  }
+
+  if (isPostChatEnabled === "true" && ((_conversationDetails = conversationDetails) === null || _conversationDetails === void 0 ? void 0 : _conversationDetails.canRenderPostChat) === _Constants.Constants.truePascal) {
     const skipEndChatSDK = false;
     const skipCloseChat = true;
     await endChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, skipEndChatSDK, skipCloseChat, true);
 
     if (postChatSurveyMode === _PostChatSurveyMode.PostChatSurveyMode.Embed) {
+      dispatch({
+        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+        payload: _ConversationState.ConversationState.PostchatLoading
+      });
+      await (0, _utils.addDelayInMs)(_Constants.Constants.PostChatLoadingDurationInMs);
       const loadPostChatEvent = {
         eventName: _TelemetryConstants.BroadcastEvent.LoadPostChatSurvey
       };
@@ -50,9 +67,11 @@ const prepareEndChat = async (props, chatSDK, setAdapter, setWebChatStyles, disp
         payload: _ConversationState.ConversationState.InActive
       });
     }
-  } else {
-    await endChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, false, false, true);
+
+    return;
   }
+
+  await endChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, false, false, true);
 }; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
 
@@ -65,16 +84,7 @@ const endChat = async (props, chatSDK, setAdapter, setWebChatStyles, dispatch, a
         Event: _TelemetryConstants.TelemetryEvent.EndChatSDKCall
       });
 
-      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
-      });
+      await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.endChat());
     } catch (ex) {
       _TelemetryHelper.TelemetryHelper.logSDKEvent(_TelemetryConstants.LogLevel.ERROR, {
         Event: _TelemetryConstants.TelemetryEvent.EndChatSDKCallFailed,
@@ -85,7 +95,21 @@ const endChat = async (props, chatSDK, setAdapter, setWebChatStyles, dispatch, a
 
       postMessageToOtherTab = false;
     }
-  }
+  } // 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
+  });
+  dispatch({
+    type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_LIVE_CHAT_CONTEXT,
+    payload: undefined
+  });
 
   if (!skipCloseChat) {
     try {
@@ -117,6 +141,14 @@ const endChat = async (props, chatSDK, setAdapter, setWebChatStyles, dispatch, a
         type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_UNREAD_MESSAGE_COUNT,
         payload: 0
       });
+      dispatch({
+        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_PROACTIVE_CHAT_PARAMS,
+        payload: {
+          proactiveChatBodyTitle: "",
+          proactiveChatEnablePrechat: false,
+          proactiveChatInNewWindow: false
+        }
+      });
 
       if (postMessageToOtherTab) {
         var _chatSDK$omnichannelC, _chatSDK$omnichannelC2;

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

@@ -67,6 +67,8 @@ var _cardActionMiddleware = require("../../webchatcontainerstateful/webchatcontr
 
 var _messageTimestampMiddleware = _interopRequireDefault(require("../../webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/messageTimestampMiddleware"));
 
+var _Constants = require("../../../common/Constants");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -103,8 +105,15 @@ const initWebChatComposer = (props, chatSDK, state, dispatch, setWebChatStyles)
         });
       }
 
+      _WebChatStoreLoader.WebChatStoreLoader.store = null;
+
       if (isPostChatEnabled === "true") {
         if (postChatSurveyMode === _PostChatSurveyMode.PostChatSurveyMode.Embed) {
+          dispatch({
+            type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+            payload: _ConversationState.ConversationState.PostchatLoading
+          });
+          await (0, _utils.addDelayInMs)(_Constants.Constants.PostChatLoadingDurationInMs);
           const loadPostChatEvent = {
             eventName: _TelemetryConstants.BroadcastEvent.LoadPostChatSurvey
           };

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

@@ -43,10 +43,6 @@ const setPostChatContextAndLoadSurvey = async (chatSDK, dispatch, persistedChat)
 
 
   _omnichannelChatComponents.BroadcastService.getMessageByEventName("LoadPostChatSurvey").subscribe(msg => {
-    dispatch({
-      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-      payload: _ConversationState.ConversationState.Loading
-    });
     dispatch({
       type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
       payload: _ConversationState.ConversationState.Postchat

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.prepareStartChat = exports.initStartChat = void 0;
+exports.setPreChatAndInitiateChat = exports.prepareStartChat = exports.initStartChat = void 0;
 
 var _Constants = require("../../../common/Constants");
 
@@ -11,8 +11,6 @@ var _TelemetryConstants = require("../../../common/telemetry/TelemetryConstants"
 
 var _ConversationState = require("../../../contexts/common/ConversationState");
 
-var _DataStoreManager = require("../../../common/contextDataStore/DataStoreManager");
-
 var _LiveChatWidgetActionType = require("../../../contexts/common/LiveChatWidgetActionType");
 
 var _NotificationHandler = require("../../webchatcontainerstateful/webchatcontroller/notification/NotificationHandler");
@@ -43,6 +41,9 @@ let optionalParams = {}; // eslint-disable-next-line @typescript-eslint/no-expli
 const prepareStartChat = async (props, chatSDK, state, dispatch, setAdapter) => {
   var _props$reconnectChatP;
 
+  optionalParams = {}; //Resetting to ensure no stale values
+  // Can connect to existing chat session
+
   if (await canConnectToExistingChat(props, chatSDK, state, dispatch, setAdapter)) {
     return;
   } // Redirecting if unauthenticated reconnect chat expired
@@ -52,57 +53,74 @@ const prepareStartChat = async (props, chatSDK, state, dispatch, setAdapter) =>
     var _props$reconnectChatP2, _props$reconnectChatP3;
 
     await (0, _reconnectChatHelper.handleRedirectUnauthenticatedReconnectChat)(chatSDK, dispatch, setAdapter, initStartChat, (_props$reconnectChatP2 = props.reconnectChatPaneProps) === null || _props$reconnectChatP2 === void 0 ? void 0 : _props$reconnectChatP2.reconnectId, (_props$reconnectChatP3 = props.reconnectChatPaneProps) === null || _props$reconnectChatP3 === void 0 ? void 0 : _props$reconnectChatP3.redirectInSameWindow);
-  } else {
-    // Getting PreChat Survey Context
-    const parseToJson = false;
-    const preChatSurveyResponse = await chatSDK.getPreChatSurvey(parseToJson);
-    const showPrechat = state.appStates.conversationState === _ConversationState.ConversationState.ProactiveChat ? preChatSurveyResponse && state.appStates.proactiveChatStates.proactiveChatEnablePrechat : preChatSurveyResponse; // Getting reconnectId for authenticated chat
+    return;
+  } // Getting reconnectId for authenticated chat
 
-    const reconnectId = await (0, _reconnectChatHelper.getReconnectIdForAuthenticatedChat)(props, chatSDK);
 
-    if (reconnectId) {
-      dispatch({
-        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_RECONNECT_ID,
-        payload: reconnectId
-      });
-      dispatch({
-        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-        payload: _ConversationState.ConversationState.ReconnectChat
-      });
-    } else if (showPrechat) {
-      dispatch({
-        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_PRE_CHAT_SURVEY_RESPONSE,
-        payload: preChatSurveyResponse
-      });
-      dispatch({
-        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);
-    }
-  }
+  const reconnectId = await (0, _reconnectChatHelper.getReconnectIdForAuthenticatedChat)(props, chatSDK);
+
+  if (reconnectId) {
+    dispatch({
+      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_RECONNECT_ID,
+      payload: reconnectId
+    });
+    dispatch({
+      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+      payload: _ConversationState.ConversationState.ReconnectChat
+    });
+    return;
+  } // Set custom context params
+
+
+  setCustomContextParams(props, chatSDK); // Setting Proactive chat settings
+
+  const isProactiveChat = state.appStates.conversationState === _ConversationState.ConversationState.ProactiveChat;
+  const isPreChatEnabledInProactiveChat = state.appStates.proactiveChatStates.proactiveChatEnablePrechat; //Setting PreChat and intiate chat
+
+  setPreChatAndInitiateChat(chatSDK, dispatch, setAdapter, isProactiveChat, isPreChatEnabledInProactiveChat);
 }; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
 
 exports.prepareStartChat = prepareStartChat;
 
+const setPreChatAndInitiateChat = async (chatSDK, dispatch, setAdapter, isProactiveChat, proactiveChatEnablePrechatState) => {
+  // Getting prechat Survey Context
+  const parseToJson = false;
+  const preChatSurveyResponse = await chatSDK.getPreChatSurvey(parseToJson);
+  const showPrechat = isProactiveChat ? preChatSurveyResponse && proactiveChatEnablePrechatState : preChatSurveyResponse;
+
+  if (showPrechat) {
+    dispatch({
+      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_PRE_CHAT_SURVEY_RESPONSE,
+      payload: preChatSurveyResponse
+    });
+    dispatch({
+      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+      payload: _ConversationState.ConversationState.Prechat
+    });
+    return;
+  } //Initiate start chat
+
+
+  dispatch({
+    type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+    payload: _ConversationState.ConversationState.Loading
+  });
+  await initStartChat(chatSDK, dispatch, setAdapter);
+}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+
+exports.setPreChatAndInitiateChat = setPreChatAndInitiateChat;
+
 const initStartChat = async (chatSDK, dispatch, setAdapter, params, persistedState) => {
   try {
     var _newAdapter$activity$, _TelemetryTimers$Widg;
 
-    let isStartChatSuccessful = false;
+    let isStartChatSuccessful = false; //Check if chat retrieved from cache
 
     if (persistedState || params !== null && params !== void 0 && params.liveChatContext) {
       var _persistedState$domai, _persistedState$domai2, _persistedState$domai3, _persistedState$domai4, _persistedState$domai5;
 
-      // Broadcasting limited cached chat details
       _omnichannelChatComponents.BroadcastService.postMessage({
         eventName: _TelemetryConstants.BroadcastEvent.ChatRetrievedFromCache,
         payload: {
@@ -113,11 +131,13 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, params, persistedSta
     }
 
     try {
+      //Start widget load timer
       _TelemetryManager.TelemetryTimers.WidgetLoadTimer = (0, _utils.createTimer)();
 
       _TelemetryHelper.TelemetryHelper.logSDKEvent(_TelemetryConstants.LogLevel.INFO, {
         Event: _TelemetryConstants.TelemetryEvent.StartChatSDKCall
-      });
+      }); // Set optional params
+
 
       optionalParams = Object.assign({}, params, optionalParams);
       await chatSDK.startChat(optionalParams);
@@ -130,46 +150,51 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, params, persistedSta
         }
       });
 
-      isStartChatSuccessful = false;
-    }
+      isStartChatSuccessful = false; // Resetting the widget state to Closed, for recent introduction of OC rate limiting(429 Error) 
+      // TODO : How to diplay a proper UI message to customer to try after sometime at this point - cool down scenario
+
+      dispatch({
+        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+        payload: _ConversationState.ConversationState.Closed
+      });
+      return;
+    } // New adapter creation
+
 
     const newAdapter = await (0, _createAdapter.createAdapter)(chatSDK);
     setAdapter(newAdapter);
     const chatToken = await chatSDK.getChatToken();
+    dispatch({
+      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CHAT_TOKEN,
+      payload: chatToken
+    });
     newAdapter === null || newAdapter === void 0 ? void 0 : (_newAdapter$activity$ = newAdapter.activity$) === null || _newAdapter$activity$ === void 0 ? void 0 : _newAdapter$activity$.subscribe((0, _newMessageEventHandler.createOnNewAdapterActivityHandler)(chatToken === null || chatToken === void 0 ? void 0 : chatToken.chatId, chatToken === null || chatToken === void 0 ? void 0 : chatToken.visitorId));
 
-    if (!persistedState) {
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      if (chatSDK !== null && chatSDK !== void 0 && chatSDK.getVoiceVideoCalling) {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const chatToken = await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.getChatToken());
-        dispatch({
-          type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CHAT_TOKEN,
-          payload: chatToken
-        });
-      } // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
-
-      const liveChatContext = await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.getCurrentLiveChatContext());
-      dispatch({
-        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_LIVE_CHAT_CONTEXT,
-        payload: liveChatContext
-      });
-      await (0, _setPostChatContextAndLoadSurvey.setPostChatContextAndLoadSurvey)(chatSDK, dispatch);
-      await (0, _updateSessionDataForTelemetry.updateSessionDataForTelemetry)(chatSDK, dispatch); // Set app state to Active
-
-      if (isStartChatSuccessful) {
-        dispatch({
-          type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-          payload: _ConversationState.ConversationState.Active
-        });
-      }
-    } else {
+    if (persistedState) {
       dispatch({
         type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_WIDGET_STATE,
         payload: persistedState
       });
       await (0, _setPostChatContextAndLoadSurvey.setPostChatContextAndLoadSurvey)(chatSDK, dispatch, true);
+      return;
+    } // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+
+    const liveChatContext = await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.getCurrentLiveChatContext());
+    dispatch({
+      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_LIVE_CHAT_CONTEXT,
+      payload: liveChatContext
+    }); // Set post chat context in state, no survey load
+
+    await (0, _setPostChatContextAndLoadSurvey.setPostChatContextAndLoadSurvey)(chatSDK, dispatch); // Updating chat session detail for telemetry
+
+    await (0, _updateSessionDataForTelemetry.updateSessionDataForTelemetry)(chatSDK, dispatch); // Set app state to Active
+
+    if (isStartChatSuccessful) {
+      dispatch({
+        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+        payload: _ConversationState.ConversationState.Active
+      });
     }
 
     _TelemetryHelper.TelemetryHelper.logLoadingEvent(_TelemetryConstants.LogLevel.INFO, {
@@ -198,6 +223,8 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, params, persistedSta
         payload: _ConversationState.ConversationState.OutOfOffice
       });
     }
+  } finally {
+    optionalParams = {};
   }
 }; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
@@ -205,13 +232,16 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, params, persistedSta
 exports.initStartChat = initStartChat;
 
 const canConnectToExistingChat = async (props, chatSDK, state, dispatch, setAdapter) => {
-  var _chatSDK$omnichannelC, _chatSDK$omnichannelC2, _DataStoreManager$cli, _persistedState$domai6;
+  var _chatSDK$omnichannelC, _chatSDK$omnichannelC2, _persistedState$domai6, _persistedState$appSt;
+
+  // By pass this function in case of popout chat
+  if (state.appStates.skipChatButtonRendering === true) {
+    return false;
+  }
 
-  const widgetStateEventName = (0, _utils.getWidgetCacheId)((chatSDK === null || chatSDK === void 0 ? void 0 : (_chatSDK$omnichannelC = chatSDK.omnichannelConfig) === null || _chatSDK$omnichannelC === void 0 ? void 0 : _chatSDK$omnichannelC.orgId) ?? "", (chatSDK === null || chatSDK === void 0 ? void 0 : (_chatSDK$omnichannelC2 = chatSDK.omnichannelConfig) === null || _chatSDK$omnichannelC2 === void 0 ? void 0 : _chatSDK$omnichannelC2.widgetId) ?? "");
-  const widgetStateFromCache = (_DataStoreManager$cli = _DataStoreManager.DataStoreManager.clientDataStore) === null || _DataStoreManager$cli === void 0 ? void 0 : _DataStoreManager$cli.getData(widgetStateEventName, "localStorage");
-  const persistedState = widgetStateFromCache ? JSON.parse(widgetStateFromCache) : undefined;
+  const persistedState = (0, _utils.getStateFromCache)(chatSDK === null || chatSDK === void 0 ? void 0 : (_chatSDK$omnichannelC = chatSDK.omnichannelConfig) === null || _chatSDK$omnichannelC === void 0 ? void 0 : _chatSDK$omnichannelC.orgId, chatSDK === null || chatSDK === void 0 ? void 0 : (_chatSDK$omnichannelC2 = chatSDK.omnichannelConfig) === null || _chatSDK$omnichannelC2 === void 0 ? void 0 : _chatSDK$omnichannelC2.widgetId); //Connect to only active chat session
 
-  if (persistedState !== null && persistedState !== void 0 && (_persistedState$domai6 = persistedState.domainStates) !== null && _persistedState$domai6 !== void 0 && _persistedState$domai6.liveChatContext) {
+  if (persistedState && !(0, _utils.isUndefinedOrEmpty)(persistedState === null || persistedState === void 0 ? void 0 : (_persistedState$domai6 = persistedState.domainStates) === null || _persistedState$domai6 === void 0 ? void 0 : _persistedState$domai6.liveChatContext) && (persistedState === null || persistedState === void 0 ? void 0 : (_persistedState$appSt = persistedState.appStates) === null || _persistedState$appSt === void 0 ? void 0 : _persistedState$appSt.conversationState) === _ConversationState.ConversationState.Active) {
     var _persistedState$domai7;
 
     dispatch({
@@ -226,15 +256,20 @@ const canConnectToExistingChat = async (props, chatSDK, state, dispatch, setAdap
   } else {
     return false;
   }
-};
+}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+
+const setCustomContextParams = (props, chatSDK) => {
+  var _chatSDK$omnichannelC3, _chatSDK$omnichannelC4, _props$chatConfig, _persistedState$domai8;
+
+  // Add custom context only for unauthenticated chat
+  const persistedState = (0, _utils.getStateFromCache)(chatSDK === null || chatSDK === void 0 ? void 0 : (_chatSDK$omnichannelC3 = chatSDK.omnichannelConfig) === null || _chatSDK$omnichannelC3 === void 0 ? void 0 : _chatSDK$omnichannelC3.orgId, chatSDK === null || chatSDK === void 0 ? void 0 : (_chatSDK$omnichannelC4 = chatSDK.omnichannelConfig) === null || _chatSDK$omnichannelC4 === void 0 ? void 0 : _chatSDK$omnichannelC4.widgetId);
 
-const setCustomContextParams = (props, state) => {
-  var _props$chatConfig, _state$domainStates;
+  if (!((_props$chatConfig = props.chatConfig) !== null && _props$chatConfig !== void 0 && _props$chatConfig.LiveChatConfigAuthSettings) && !(0, _utils.isUndefinedOrEmpty)(persistedState === null || persistedState === void 0 ? void 0 : (_persistedState$domai8 = persistedState.domainStates) === null || _persistedState$domai8 === void 0 ? void 0 : _persistedState$domai8.customContext)) {
+    var _persistedState$domai9;
 
-  // 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
+      customContext: persistedState === null || persistedState === void 0 ? void 0 : (_persistedState$domai9 = persistedState.domainStates) === null || _persistedState$domai9 === void 0 ? void 0 : _persistedState$domai9.customContext
     });
   }
 };