@microsoft/omnichannel-chat-widget 1.0.3-main.527f8c3 → 1.0.3-main.87088f3

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

@@ -1,18 +1,11 @@
-import { BroadcastEvent, LogLevel, TelemetryEvent } from "../../../common/telemetry/TelemetryConstants";
+import { LogLevel, TelemetryEvent } from "../../../common/telemetry/TelemetryConstants";
 import { BroadcastService } from "@microsoft/omnichannel-chat-components";
 import { ConversationState } from "../../../contexts/common/ConversationState";
 import { LiveChatWidgetActionType } from "../../../contexts/common/LiveChatWidgetActionType";
 import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
-import { Constants } from "../../../common/Constants";
-import { endChat } from "./endChat";
-import { PostChatSurveyMode } from "../../postchatsurveypanestateful/enums/PostChatSurveyMode";
-import { addDelayInMs } from "../../../common/utils";
-import { NotificationHandler } from "../../webchatcontainerstateful/webchatcontroller/notification/NotificationHandler";
-import { NotificationScenarios } from "../../webchatcontainerstateful/webchatcontroller/enums/NotificationScenarios";
-import { ConversationEndEntity } from "../../../contexts/common/ConversationEndEntity";
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const setPostChatContextAndLoadSurvey = async (chatSDK, dispatch, persistedChat) => {
+export const setPostChatContextAndLoadSurvey = async (chatSDK, dispatch, persistedChat) => {
   try {
     if (!persistedChat) {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -42,249 +35,4 @@ const setPostChatContextAndLoadSurvey = async (chatSDK, dispatch, persistedChat)
       payload: ConversationState.Postchat
     });
   });
-};
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const checkPostChatEnabled = (props, state) => {
-  var _props$chatConfig, _props$chatConfig$Liv, _state$domainStates$l, _state$domainStates$l2;
-  const isPostChatEnabled = ((_props$chatConfig = props.chatConfig) === null || _props$chatConfig === void 0 ? void 0 : (_props$chatConfig$Liv = _props$chatConfig.LiveWSAndLiveChatEngJoin) === null || _props$chatConfig$Liv === void 0 ? void 0 : _props$chatConfig$Liv.msdyn_postconversationsurveyenable) ?? ((_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);
-  return isPostChatEnabled === Constants.true;
-};
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const initiatePostChat = async (props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, state) => {
-  // Check if Postchat already in progress and handle case where chat is ended by customer
-  if (state.appStates.postChatWorkflowInProgress && state.appStates.conversationEndedBy === ConversationEndEntity.Customer) {
-    await endChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, false, false, true);
-    return;
-  }
-
-  // Conversation Details call required by customer as well as agent 
-  const conversationDetails = await getConversationDetailsCall(chatSDK);
-  // Start Postchat workflow
-  dispatch({
-    type: LiveChatWidgetActionType.SET_POST_CHAT_WORKFLOW_IN_PROGRESS,
-    payload: true
-  });
-
-  // Below logic checks if agent or bot or noone joins conversation and handles them separately
-  if ((conversationDetails === null || conversationDetails === void 0 ? void 0 : conversationDetails.participantType) === Constants.userParticipantTypeTag) {
-    if (state.appStates.conversationEndedBy === ConversationEndEntity.Customer) {
-      // Set use bot settings to false
-      await postChatInitiatedByCustomer(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, state, conversationDetails, false);
-    } else if (state.appStates.conversationEndedBy === ConversationEndEntity.Agent) {
-      await postChatInitiatedByAgent(props, setWebChatStyles, dispatch, state);
-    } else {
-      const error = `Conversation was Ended after agent joined but App State was not set correctly: conversationEndedBy = ${state.appStates.conversationEndedBy}`;
-      TelemetryHelper.logActionEvent(LogLevel.ERROR, {
-        Event: TelemetryEvent.AppStatesException,
-        ExceptionDetails: {
-          exception: error
-        }
-      });
-      throw new Error(error);
-    }
-  } else if ((conversationDetails === null || conversationDetails === void 0 ? void 0 : conversationDetails.participantType) === Constants.botParticipantTypeTag) {
-    // Set Use bot survey to true
-    dispatch({
-      type: LiveChatWidgetActionType.SET_SHOULD_USE_BOT_SURVEY,
-      payload: true
-    });
-    if (state.appStates.conversationEndedBy === ConversationEndEntity.Customer) {
-      // Set use bot settings to true
-      await postChatInitiatedByCustomer(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, state, conversationDetails, true);
-    } else if (state.appStates.conversationEndedBy === ConversationEndEntity.Agent) {
-      await postChatInitiatedByBot(props, setWebChatStyles, dispatch, state);
-    } else {
-      const error = `Conversation was Ended after bot joined but App State was not set correctly: conversationEndedBy = ${state.appStates.conversationEndedBy}`;
-      TelemetryHelper.logActionEvent(LogLevel.ERROR, {
-        Event: TelemetryEvent.AppStatesException,
-        ExceptionDetails: {
-          exception: error
-        }
-      });
-      throw new Error(error);
-    }
-  } else {
-    if (state.appStates.conversationEndedBy === ConversationEndEntity.Customer) {
-      // No one has joined chat will be handled by postChat customer
-      await postChatInitiatedByCustomer(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, state, conversationDetails, false);
-    } else {
-      const error = `ConversationDetails and App state was not set correctly: conversationDetails = ${JSON.stringify(conversationDetails)} , conversationEndedBy = ${state.appStates.conversationEndedBy}`;
-      TelemetryHelper.logActionEvent(LogLevel.ERROR, {
-        Event: TelemetryEvent.AppStatesException,
-        ExceptionDetails: {
-          exception: error
-        }
-      });
-      throw new Error(error);
-    }
-  }
-};
-
-// Function for link mode postchat workflow which is essentially same for both customer and agent
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const linkModePostChatWorkflow = (props, dispatch, setWebChatStyles) => {
-  var _props$webChatContain, _props$webChatContain2;
-  TelemetryHelper.logActionEvent(LogLevel.INFO, {
-    Event: TelemetryEvent.LinkModePostChatWorkflowStarted
-  });
-  dispatch({
-    type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-    payload: ConversationState.InActive
-  });
-
-  // Disable SendBox
-  if ((props === null || props === void 0 ? void 0 : (_props$webChatContain = props.webChatContainerProps) === null || _props$webChatContain === void 0 ? void 0 : (_props$webChatContain2 = _props$webChatContain.renderingMiddlewareProps) === null || _props$webChatContain2 === void 0 ? void 0 : _props$webChatContain2.hideSendboxOnConversationEnd) !== false) {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    setWebChatStyles(styles => {
-      return {
-        ...styles,
-        hideSendBox: true
-      };
-    });
-  }
-};
-
-// Function for embed mode postchat workflow which is essentially same for both customer and agent
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const embedModePostChatWorkflow = async (dispatch, state) => {
-  TelemetryHelper.logActionEvent(LogLevel.INFO, {
-    Event: TelemetryEvent.EmbedModePostChatWorkflowStarted
-  });
-  if (state.domainStates.postChatContext) {
-    dispatch({
-      type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-      payload: ConversationState.PostchatLoading
-    });
-    await addDelayInMs(Constants.PostChatLoadingDurationInMs);
-    const loadPostChatEvent = {
-      eventName: BroadcastEvent.LoadPostChatSurvey
-    };
-    BroadcastService.postMessage(loadPostChatEvent);
-  } else {
-    const error = `Conversation was Ended but App State was not set correctly: postChatContext = ${state.domainStates.postChatContext}`;
-    TelemetryHelper.logActionEvent(LogLevel.ERROR, {
-      Event: TelemetryEvent.AppStatesException,
-      ExceptionDetails: {
-        exception: error
-      }
-    });
-    throw new Error(error);
-  }
-};
-
-// Function will handle only postchat cases initiated by customer
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const postChatInitiatedByCustomer = async (props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, state, conversationDetails, shouldUseBotSetting) => {
-  let postChatSurveyMode = "";
-  if (shouldUseBotSetting) {
-    var _props$chatConfig2, _props$chatConfig2$Li, _state$domainStates$l3, _state$domainStates$l4;
-    postChatSurveyMode = ((_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_postconversationsurveybotsurveymode) ?? ((_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_postconversationsurveybotsurveymode);
-  } else {
-    var _props$chatConfig3, _props$chatConfig3$Li, _state$domainStates$l5, _state$domainStates$l6;
-    postChatSurveyMode = ((_props$chatConfig3 = props.chatConfig) === null || _props$chatConfig3 === void 0 ? void 0 : (_props$chatConfig3$Li = _props$chatConfig3.LiveWSAndLiveChatEngJoin) === null || _props$chatConfig3$Li === void 0 ? void 0 : _props$chatConfig3$Li.msdyn_postconversationsurveymode) ?? ((_state$domainStates$l5 = state.domainStates.liveChatConfig) === null || _state$domainStates$l5 === void 0 ? void 0 : (_state$domainStates$l6 = _state$domainStates$l5.LiveWSAndLiveChatEngJoin) === null || _state$domainStates$l6 === void 0 ? void 0 : _state$domainStates$l6.msdyn_postconversationsurveymode);
-  }
-  // Check if agent or bot has joined conversation
-  if ((conversationDetails === null || conversationDetails === void 0 ? void 0 : conversationDetails.canRenderPostChat) === Constants.truePascal) {
-    TelemetryHelper.logActionEvent(LogLevel.INFO, {
-      Event: TelemetryEvent.PostChatWorkflowFromCustomer,
-      Description: shouldUseBotSetting ? "PostChat Workflow was started by customer using bot settings" : "PostChat Workflow was started by customer using agent settings"
-    });
-    const chatSession = await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.getCurrentLiveChatContext());
-    // End chat call to end chatsdk but not close chat, only if chat ended by customer
-    await endChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, false, true, false);
-    // Saving request Id below for chat transcript calls
-    if (chatSession) {
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      chatSDK.chatToken = chatSession.chatToken ?? {};
-      chatSDK.requestId = chatSession.requestId;
-    }
-    if (postChatSurveyMode === PostChatSurveyMode.Embed) {
-      await embedModePostChatWorkflow(dispatch, state);
-    } else if (postChatSurveyMode === PostChatSurveyMode.Link) {
-      linkModePostChatWorkflow(props, dispatch, setWebChatStyles);
-    } else {
-      const error = `Conversation was Ended but App State was not set correctly: msdyn_postconversationsurveymode = ${postChatSurveyMode}`;
-      TelemetryHelper.logActionEvent(LogLevel.ERROR, {
-        Event: TelemetryEvent.AppStatesException,
-        ExceptionDetails: {
-          exception: error
-        }
-      });
-      throw new Error(error);
-    }
-  } else {
-    // Agent did not join chat so end chat normally
-    await endChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, false, false, true);
-  }
-};
-
-// Function will handle only postchat cases initiated by agent
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const postChatInitiatedByAgent = async (props, setWebChatStyles, dispatch, state) => {
-  var _props$chatConfig4, _props$chatConfig4$Li, _state$domainStates$l7, _state$domainStates$l8;
-  const postChatSurveyMode = ((_props$chatConfig4 = props.chatConfig) === null || _props$chatConfig4 === void 0 ? void 0 : (_props$chatConfig4$Li = _props$chatConfig4.LiveWSAndLiveChatEngJoin) === null || _props$chatConfig4$Li === void 0 ? void 0 : _props$chatConfig4$Li.msdyn_postconversationsurveymode) ?? ((_state$domainStates$l7 = state.domainStates.liveChatConfig) === null || _state$domainStates$l7 === void 0 ? void 0 : (_state$domainStates$l8 = _state$domainStates$l7.LiveWSAndLiveChatEngJoin) === null || _state$domainStates$l8 === void 0 ? void 0 : _state$domainStates$l8.msdyn_postconversationsurveymode);
-  TelemetryHelper.logActionEvent(LogLevel.INFO, {
-    Event: TelemetryEvent.PostChatWorkflowFromAgent,
-    Description: "PostChat Workflow was started by agent"
-  });
-  if (postChatSurveyMode === PostChatSurveyMode.Embed) {
-    await embedModePostChatWorkflow(dispatch, state);
-  } else if (postChatSurveyMode === PostChatSurveyMode.Link) {
-    linkModePostChatWorkflow(props, dispatch, setWebChatStyles);
-  } else {
-    const error = `Conversation was Ended but App State was not set correctly: msdyn_postconversationsurveymode = ${postChatSurveyMode}`;
-    TelemetryHelper.logActionEvent(LogLevel.ERROR, {
-      Event: TelemetryEvent.AppStatesException,
-      ExceptionDetails: {
-        exception: error
-      }
-    });
-    throw new Error(error);
-  }
-};
-
-// Function will handle only postchat cases initiated by bot
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const postChatInitiatedByBot = async (props, setWebChatStyles, dispatch, state) => {
-  var _props$chatConfig5, _props$chatConfig5$Li, _state$domainStates$l9, _state$domainStates$l10;
-  const postChatSurveyMode = ((_props$chatConfig5 = props.chatConfig) === null || _props$chatConfig5 === void 0 ? void 0 : (_props$chatConfig5$Li = _props$chatConfig5.LiveWSAndLiveChatEngJoin) === null || _props$chatConfig5$Li === void 0 ? void 0 : _props$chatConfig5$Li.msdyn_postconversationsurveybotsurveymode) ?? ((_state$domainStates$l9 = state.domainStates.liveChatConfig) === null || _state$domainStates$l9 === void 0 ? void 0 : (_state$domainStates$l10 = _state$domainStates$l9.LiveWSAndLiveChatEngJoin) === null || _state$domainStates$l10 === void 0 ? void 0 : _state$domainStates$l10.msdyn_postconversationsurveybotsurveymode);
-  TelemetryHelper.logActionEvent(LogLevel.INFO, {
-    Event: TelemetryEvent.PostChatWorkflowFromBot,
-    Description: "PostChat Workflow was started by bot"
-  });
-  if (postChatSurveyMode === PostChatSurveyMode.Embed) {
-    await embedModePostChatWorkflow(dispatch, state);
-  } else if (postChatSurveyMode === PostChatSurveyMode.Link) {
-    linkModePostChatWorkflow(props, dispatch, setWebChatStyles);
-  } else {
-    const error = `Conversation was Ended but App State was not set correctly: msdyn_postconversationsurveybotsurveymode = ${postChatSurveyMode}`;
-    TelemetryHelper.logActionEvent(LogLevel.ERROR, {
-      Event: TelemetryEvent.AppStatesException,
-      ExceptionDetails: {
-        exception: error
-      }
-    });
-    throw new Error(error);
-  }
-};
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const getConversationDetailsCall = async chatSDK => {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  let conversationDetails = undefined;
-  try {
-    conversationDetails = await chatSDK.getConversationDetails();
-  } catch (error) {
-    TelemetryHelper.logSDKEvent(LogLevel.ERROR, {
-      Event: TelemetryEvent.GetConversationDetailsCallFailed,
-      ExceptionDetails: {
-        exception: `Get Conversation Details Call Failed : ${error}`
-      }
-    });
-    NotificationHandler.notifyError(NotificationScenarios.Connection, "Get Conversation Details Call Failed: " + error);
-  }
-  return conversationDetails;
-};
-export { setPostChatContextAndLoadSurvey, checkPostChatEnabled, initiatePostChat };
+};

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

@@ -1,6 +1,6 @@
 import { BroadcastEvent, LogLevel, TelemetryEvent } from "../../../common/telemetry/TelemetryConstants";
 import { ChatSDKError, LiveWorkItemState } from "../../../common/Constants";
-import { createTimer, getStateFromCache, isUndefinedOrEmpty } from "../../../common/utils";
+import { createTimer, getStateFromCache, getWidgetCacheIdfromProps, isNullOrEmptyString, isUndefinedOrEmpty } from "../../../common/utils";
 import { getAuthClientFunction, handleAuthentication } from "./authHelper";
 import { ActivityStreamHandler } from "./ActivityStreamHandler";
 import { BroadcastService } from "@microsoft/omnichannel-chat-components";
@@ -20,21 +20,26 @@ import { updateSessionDataForTelemetry } from "./updateSessionDataForTelemetry";
 let optionalParams = {};
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 let widgetInstanceId;
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+let popoutWidgetInstanceId;
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const prepareStartChat = async (props, chatSDK, state, dispatch, setAdapter) => {
-  var _props$controlProps;
   optionalParams = {}; //Resetting to ensure no stale values
-  widgetInstanceId = props === null || props === void 0 ? void 0 : (_props$controlProps = props.controlProps) === null || _props$controlProps === void 0 ? void 0 : _props$controlProps.widgetInstanceId;
+  widgetInstanceId = getWidgetCacheIdfromProps(props);
 
   // reconnect > chat from cache
   await handleChatReconnect(chatSDK, props, dispatch, setAdapter, initStartChat, state);
-
   // If chat reconnect has kicked in chat state will become Active or Reconnect. So just exit, else go next
   if (state.appStates.conversationState === ConversationState.Active || state.appStates.conversationState === ConversationState.ReconnectChat) {
     return;
   }
 
+  // Check if there is any active popout chats in cache
+  if (await canStartPopoutChat(props)) {
+    return;
+  }
+
   // Can connect to existing chat session
   if (await canConnectToExistingChat(props, chatSDK, state, dispatch, setAdapter)) {
     return;
@@ -45,19 +50,12 @@ const prepareStartChat = async (props, chatSDK, state, dispatch, setAdapter) =>
   const isPreChatEnabledInProactiveChat = state.appStates.proactiveChatStates.proactiveChatEnablePrechat;
 
   //Setting PreChat and intiate chat
-  setPreChatAndInitiateChat(chatSDK, dispatch, setAdapter, isProactiveChat, isPreChatEnabledInProactiveChat, undefined, props);
+  await setPreChatAndInitiateChat(chatSDK, dispatch, setAdapter, isProactiveChat, isPreChatEnabledInProactiveChat, undefined, props);
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const setPreChatAndInitiateChat = async (chatSDK, dispatch, setAdapter, isProactiveChat, proactiveChatEnablePrechatState, state, props) => {
   //Handle reconnect scenario
-  if (state) {
-    await handleChatReconnect(chatSDK, props, dispatch, setAdapter, initStartChat, state);
-    // If chat reconnect has kicked in chat state will become Active or Reconnect. So just exit, else go next
-    if (state.appStates.conversationState === ConversationState.Active || state.appStates.conversationState === ConversationState.ReconnectChat) {
-      return;
-    }
-  }
 
   // Getting prechat Survey Context
   const parseToJson = false;
@@ -88,11 +86,11 @@ const setPreChatAndInitiateChat = async (chatSDK, dispatch, setAdapter, isProact
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const initStartChat = async (chatSDK, dispatch, setAdapter, props, params, persistedState) => {
-  var _props$controlProps2;
+  var _props$controlProps;
   let isStartChatSuccessful = false;
   const chatConfig = props === null || props === void 0 ? void 0 : props.chatConfig;
   const getAuthToken = props === null || props === void 0 ? void 0 : props.getAuthToken;
-  const hideErrorUIPane = props === null || props === void 0 ? void 0 : (_props$controlProps2 = props.controlProps) === null || _props$controlProps2 === void 0 ? void 0 : _props$controlProps2.hideErrorUIPane;
+  const hideErrorUIPane = props === null || props === void 0 ? void 0 : (_props$controlProps = props.controlProps) === null || _props$controlProps === void 0 ? void 0 : _props$controlProps.hideErrorUIPane;
   try {
     var _newAdapter$activity$, _TelemetryTimers$Widg;
     //Start widget load timer
@@ -106,11 +104,8 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, props, params, persi
       // set auth token to chat sdk before start chat
       const authSuccess = await handleAuthentication(chatSDK, chatConfig, getAuthToken);
       if (!authSuccess) {
-        dispatch({
-          type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-          payload: ConversationState.Closed
-        });
-        return;
+        // Replacing with error ui
+        throw new Error("Authentication was not successful");
       }
     }
 
@@ -128,7 +123,7 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, props, params, persi
     try {
       var _window$Microsoft, _window$Microsoft$Dyn, _window$Microsoft$Dyn2, _window$Microsoft$Dyn3;
       // Set custom context params
-      setCustomContextParams(chatSDK);
+      setCustomContextParams(props);
       const defaultOptionalParams = {
         sendDefaultInitContext: true,
         isProactiveChat: !!(params !== null && params !== void 0 && params.isProactiveChat),
@@ -157,21 +152,6 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, props, params, persi
       payload: chatToken
     });
     newAdapter === null || newAdapter === void 0 ? void 0 : (_newAdapter$activity$ = newAdapter.activity$) === null || _newAdapter$activity$ === void 0 ? void 0 : _newAdapter$activity$.subscribe(createOnNewAdapterActivityHandler(chatToken === null || chatToken === void 0 ? void 0 : chatToken.chatId, chatToken === null || chatToken === void 0 ? void 0 : chatToken.visitorId));
-    if (persistedState) {
-      dispatch({
-        type: LiveChatWidgetActionType.SET_WIDGET_STATE,
-        payload: persistedState
-      });
-      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.SET_LIVE_CHAT_CONTEXT,
-      payload: liveChatContext
-    });
 
     // Set app state to Active
     if (isStartChatSuccessful) {
@@ -186,14 +166,30 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, props, params, persi
         payload: ConversationState.Active
       });
     }
+    if (persistedState) {
+      dispatch({
+        type: LiveChatWidgetActionType.SET_WIDGET_STATE,
+        payload: persistedState
+      });
+      await 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.SET_LIVE_CHAT_CONTEXT,
+      payload: liveChatContext
+    });
     TelemetryHelper.logLoadingEvent(LogLevel.INFO, {
       Event: TelemetryEvent.WidgetLoadComplete,
       Description: "Widget load complete",
       ElapsedTimeInMilliseconds: TelemetryTimers === null || TelemetryTimers === void 0 ? void 0 : (_TelemetryTimers$Widg = TelemetryTimers.WidgetLoadTimer) === null || _TelemetryTimers$Widg === void 0 ? void 0 : _TelemetryTimers$Widg.milliSecondsElapsed
     });
 
-    // Set post chat context in state, no survey load
-    setPostChatContextAndLoadSurvey(chatSDK, dispatch);
+    // Set post chat context in state
+    // Commenting this for now as post chat context is fetched during end chat
+    await setPostChatContextAndLoadSurvey(chatSDK, dispatch);
 
     // Updating chat session detail for telemetry
     await updateSessionDataForTelemetry(chatSDK, dispatch);
@@ -217,12 +213,12 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, props, params, persi
       });
       return;
     }
+    dispatch({
+      type: LiveChatWidgetActionType.SET_START_CHAT_FAILING,
+      payload: true
+    });
     if (!hideErrorUIPane) {
       // Set app state to failing start chat if hideErrorUI is not turned on
-      dispatch({
-        type: LiveChatWidgetActionType.SET_START_CHAT_FAILING,
-        payload: true
-      });
       TelemetryHelper.logLoadingEvent(LogLevel.INFO, {
         Event: TelemetryEvent.ErrorUIPaneLoaded,
         Description: "Error UI Pane Loaded"
@@ -258,15 +254,15 @@ const forceEndChat = async chatSDK => {
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const canConnectToExistingChat = async (props, chatSDK, state, dispatch, setAdapter) => {
-  var _chatSDK$omnichannelC, _chatSDK$omnichannelC2, _props$controlProps3, _persistedState$domai6;
+  var _state$appStates, _persistedState$domai6, _persistedState$appSt;
   // By pass this function in case of popout chat
-  if (state.appStates.hideStartChatButton === true) {
+  if ((state === null || state === void 0 ? void 0 : (_state$appStates = state.appStates) === null || _state$appStates === void 0 ? void 0 : _state$appStates.hideStartChatButton) === true) {
     return false;
   }
-  const persistedState = 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, (props === null || props === void 0 ? void 0 : (_props$controlProps3 = props.controlProps) === null || _props$controlProps3 === void 0 ? void 0 : _props$controlProps3.widgetInstanceId) ?? "");
+  const persistedState = getStateFromCache(getWidgetCacheIdfromProps(props));
 
   //Connect to only active chat session
-  if (persistedState && !isUndefinedOrEmpty(persistedState === null || persistedState === void 0 ? void 0 : (_persistedState$domai6 = persistedState.domainStates) === null || _persistedState$domai6 === void 0 ? void 0 : _persistedState$domai6.liveChatContext)) {
+  if (persistedState && !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.Active) {
     var _persistedState$domai7;
     dispatch({
       type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
@@ -277,52 +273,72 @@ const canConnectToExistingChat = async (props, chatSDK, state, dispatch, setAdap
     };
     await initStartChat(chatSDK, dispatch, setAdapter, props, optionalParams, persistedState);
     return true;
-  } else {
-    return false;
   }
+  return false;
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const setCustomContextParams = chatSDK => {
-  var _chatSDK$omnichannelC3, _chatSDK$omnichannelC4, _persistedState$domai8;
+const setCustomContextParams = props => {
+  var _props$chatConfig, _props$chatConfig$Liv, _persistedState$domai8;
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const isAuthenticatedChat = props !== null && props !== void 0 && (_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 ? true : false;
+  //Should not set custom context for auth chat
+  if (isAuthenticatedChat) {
+    return;
+  }
+  if (isNullOrEmptyString(widgetInstanceId)) {
+    widgetInstanceId = getWidgetCacheIdfromProps(props);
+  }
   // Add custom context only for unauthenticated chat
-  const persistedState = 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, widgetInstanceId ?? "");
+  const persistedState = getStateFromCache(widgetInstanceId);
   if (!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, _persistedState$domai10;
-    if (persistedState !== null && persistedState !== void 0 && (_persistedState$domai9 = persistedState.domainStates.liveChatConfig) !== null && _persistedState$domai9 !== void 0 && _persistedState$domai9.LiveChatConfigAuthSettings) {
-      const errorMessage = "Use of custom context with authenticated chat is deprecated. The chat would not go through.";
-      TelemetryHelper.logSDKEvent(LogLevel.WARN, {
-        Event: TelemetryEvent.StartChatMethodException,
-        ExceptionDetails: {
-          exception: errorMessage
-        }
-      });
-      throw new Error(errorMessage);
-    }
+    var _persistedState$domai9;
+    TelemetryHelper.logLoadingEvent(LogLevel.INFO, {
+      Event: TelemetryEvent.SetCustomContext,
+      Description: "Setting custom context for unauthenicated chat"
+    });
     optionalParams = Object.assign({}, optionalParams, {
-      customContext: persistedState === null || persistedState === void 0 ? void 0 : (_persistedState$domai10 = persistedState.domainStates) === null || _persistedState$domai10 === void 0 ? void 0 : _persistedState$domai10.customContext
+      customContext: persistedState === null || persistedState === void 0 ? void 0 : (_persistedState$domai9 = persistedState.domainStates) === null || _persistedState$domai9 === void 0 ? void 0 : _persistedState$domai9.customContext
     });
   }
 };
+const canStartPopoutChat = async props => {
+  if (props.allowSdkChatSupport === false) {
+    return false;
+  }
+  popoutWidgetInstanceId = getWidgetCacheIdfromProps(props, true);
+  if (!isNullOrEmptyString(popoutWidgetInstanceId)) {
+    var _persistedState$domai10, _persistedState$appSt2;
+    const persistedState = getStateFromCache(popoutWidgetInstanceId);
+    if (persistedState && !isUndefinedOrEmpty(persistedState === null || persistedState === void 0 ? void 0 : (_persistedState$domai10 = persistedState.domainStates) === null || _persistedState$domai10 === void 0 ? void 0 : _persistedState$domai10.liveChatContext) && (persistedState === null || persistedState === void 0 ? void 0 : (_persistedState$appSt2 = persistedState.appStates) === null || _persistedState$appSt2 === void 0 ? void 0 : _persistedState$appSt2.conversationState) === ConversationState.Active) {
+      // Initiate popout chat
+      BroadcastService.postMessage({
+        eventName: BroadcastEvent.InitiateStartChatInPopoutMode
+      });
+      return true;
+    }
+  }
+  return false;
+};
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const checkIfConversationStillValid = async (chatSDK, dispatch, state) => {
   var _state$domainStates, _state$domainStates$l;
-  const requestId = (_state$domainStates = state.domainStates) === null || _state$domainStates === void 0 ? void 0 : (_state$domainStates$l = _state$domainStates.liveChatContext) === null || _state$domainStates$l === void 0 ? void 0 : _state$domainStates$l.requestId;
+  const requestIdFromCache = (_state$domainStates = state.domainStates) === null || _state$domainStates === void 0 ? void 0 : (_state$domainStates$l = _state$domainStates.liveChatContext) === null || _state$domainStates$l === void 0 ? void 0 : _state$domainStates$l.requestId;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   let conversationDetails = undefined;
 
-  //Preserve old requestId
-  const oldRequestId = chatSDK.requestId ?? "";
+  //Preserve current requestId
+  const currentRequestId = chatSDK.requestId ?? "";
   dispatch({
     type: LiveChatWidgetActionType.SET_INITIAL_CHAT_SDK_REQUEST_ID,
-    payload: oldRequestId
+    payload: currentRequestId
   });
   try {
-    chatSDK.requestId = requestId;
+    chatSDK.requestId = requestIdFromCache;
     conversationDetails = await chatSDK.getConversationDetails();
     if (Object.keys(conversationDetails).length === 0) {
-      chatSDK.requestId = oldRequestId;
+      chatSDK.requestId = currentRequestId;
       return false;
     }
     if (conversationDetails.state === LiveWorkItemState.Closed || conversationDetails.state === LiveWorkItemState.WrapUp) {
@@ -330,7 +346,7 @@ const checkIfConversationStillValid = async (chatSDK, dispatch, state) => {
         type: LiveChatWidgetActionType.SET_LIVE_CHAT_CONTEXT,
         payload: undefined
       });
-      chatSDK.requestId = oldRequestId;
+      chatSDK.requestId = currentRequestId;
       return false;
     }
     return true;
@@ -341,7 +357,7 @@ const checkIfConversationStillValid = async (chatSDK, dispatch, state) => {
         exception: `Conversation is not valid: ${erorr}`
       }
     });
-    chatSDK.requestId = oldRequestId;
+    chatSDK.requestId = currentRequestId;
     return false;
   }
 };