@microsoft/omnichannel-chat-widget 0.1.0-main.52da005 → 0.1.0-main.52fa2fc

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

@@ -3,12 +3,19 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setPostChatContextAndLoadSurvey = void 0;
+exports.setPostChatContextAndLoadSurvey = exports.initiatePostChat = exports.checkPostChatEnabled = void 0;
 var _TelemetryConstants = require("../../../common/telemetry/TelemetryConstants");
 var _omnichannelChatComponents = require("@microsoft/omnichannel-chat-components");
 var _ConversationState = require("../../../contexts/common/ConversationState");
 var _LiveChatWidgetActionType = require("../../../contexts/common/LiveChatWidgetActionType");
 var _TelemetryHelper = require("../../../common/telemetry/TelemetryHelper");
+var _Constants = require("../../../common/Constants");
+var _endChat = require("./endChat");
+var _PostChatSurveyMode = require("../../postchatsurveypanestateful/enums/PostChatSurveyMode");
+var _utils = require("../../../common/utils");
+var _NotificationHandler = require("../../webchatcontainerstateful/webchatcontroller/notification/NotificationHandler");
+var _NotificationScenarios = require("../../webchatcontainerstateful/webchatcontroller/enums/NotificationScenarios");
+var _ConversationEndEntity = require("../../../contexts/common/ConversationEndEntity");
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const setPostChatContextAndLoadSurvey = async (chatSDK, dispatch, persistedChat) => {
   try {
@@ -41,4 +48,250 @@ const setPostChatContextAndLoadSurvey = async (chatSDK, dispatch, persistedChat)
     });
   });
 };
-exports.setPostChatContextAndLoadSurvey = setPostChatContextAndLoadSurvey;
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+exports.setPostChatContextAndLoadSurvey = setPostChatContextAndLoadSurvey;
+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.Constants.true;
+};
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+exports.checkPostChatEnabled = checkPostChatEnabled;
+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.ConversationEndEntity.Customer) {
+    await (0, _endChat.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.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.Constants.userParticipantTypeTag) {
+    if (state.appStates.conversationEndedBy === _ConversationEndEntity.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.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.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.ERROR, {
+        Event: _TelemetryConstants.TelemetryEvent.AppStatesException,
+        ExceptionDetails: {
+          exception: error
+        }
+      });
+      throw new Error(error);
+    }
+  } else if ((conversationDetails === null || conversationDetails === void 0 ? void 0 : conversationDetails.participantType) === _Constants.Constants.botParticipantTypeTag) {
+    // Set Use bot survey to true
+    dispatch({
+      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_SHOULD_USE_BOT_SURVEY,
+      payload: true
+    });
+    if (state.appStates.conversationEndedBy === _ConversationEndEntity.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.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.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.ERROR, {
+        Event: _TelemetryConstants.TelemetryEvent.AppStatesException,
+        ExceptionDetails: {
+          exception: error
+        }
+      });
+      throw new Error(error);
+    }
+  } else {
+    if (state.appStates.conversationEndedBy === _ConversationEndEntity.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.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.ERROR, {
+        Event: _TelemetryConstants.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
+exports.initiatePostChat = initiatePostChat;
+const linkModePostChatWorkflow = (props, dispatch, setWebChatStyles) => {
+  var _props$webChatContain, _props$webChatContain2;
+  _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.INFO, {
+    Event: _TelemetryConstants.TelemetryEvent.LinkModePostChatWorkflowStarted
+  });
+  dispatch({
+    type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+    payload: _ConversationState.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.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.INFO, {
+    Event: _TelemetryConstants.TelemetryEvent.EmbedModePostChatWorkflowStarted
+  });
+  if (state.domainStates.postChatContext) {
+    dispatch({
+      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+      payload: _ConversationState.ConversationState.PostchatLoading
+    });
+    await (0, _utils.addDelayInMs)(_Constants.Constants.PostChatLoadingDurationInMs);
+    const loadPostChatEvent = {
+      eventName: _TelemetryConstants.BroadcastEvent.LoadPostChatSurvey
+    };
+    _omnichannelChatComponents.BroadcastService.postMessage(loadPostChatEvent);
+  } else {
+    const error = `Conversation was Ended but App State was not set correctly: postChatContext = ${state.domainStates.postChatContext}`;
+    _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.ERROR, {
+      Event: _TelemetryConstants.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.Constants.truePascal) {
+    _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.INFO, {
+      Event: _TelemetryConstants.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 (0, _endChat.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.PostChatSurveyMode.Embed) {
+      await embedModePostChatWorkflow(dispatch, state);
+    } else if (postChatSurveyMode === _PostChatSurveyMode.PostChatSurveyMode.Link) {
+      linkModePostChatWorkflow(props, dispatch, setWebChatStyles);
+    } else {
+      const error = `Conversation was Ended but App State was not set correctly: msdyn_postconversationsurveymode = ${postChatSurveyMode}`;
+      _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.ERROR, {
+        Event: _TelemetryConstants.TelemetryEvent.AppStatesException,
+        ExceptionDetails: {
+          exception: error
+        }
+      });
+      throw new Error(error);
+    }
+  } else {
+    // Agent did not join chat so end chat normally
+    await (0, _endChat.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.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.INFO, {
+    Event: _TelemetryConstants.TelemetryEvent.PostChatWorkflowFromAgent,
+    Description: "PostChat Workflow was started by agent"
+  });
+  if (postChatSurveyMode === _PostChatSurveyMode.PostChatSurveyMode.Embed) {
+    await embedModePostChatWorkflow(dispatch, state);
+  } else if (postChatSurveyMode === _PostChatSurveyMode.PostChatSurveyMode.Link) {
+    linkModePostChatWorkflow(props, dispatch, setWebChatStyles);
+  } else {
+    const error = `Conversation was Ended but App State was not set correctly: msdyn_postconversationsurveymode = ${postChatSurveyMode}`;
+    _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.ERROR, {
+      Event: _TelemetryConstants.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.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.INFO, {
+    Event: _TelemetryConstants.TelemetryEvent.PostChatWorkflowFromBot,
+    Description: "PostChat Workflow was started by bot"
+  });
+  if (postChatSurveyMode === _PostChatSurveyMode.PostChatSurveyMode.Embed) {
+    await embedModePostChatWorkflow(dispatch, state);
+  } else if (postChatSurveyMode === _PostChatSurveyMode.PostChatSurveyMode.Link) {
+    linkModePostChatWorkflow(props, dispatch, setWebChatStyles);
+  } else {
+    const error = `Conversation was Ended but App State was not set correctly: msdyn_postconversationsurveybotsurveymode = ${postChatSurveyMode}`;
+    _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.ERROR, {
+      Event: _TelemetryConstants.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.TelemetryHelper.logSDKEvent(_TelemetryConstants.LogLevel.ERROR, {
+      Event: _TelemetryConstants.TelemetryEvent.GetConversationDetailsCallFailed,
+      ExceptionDetails: {
+        exception: `Get Conversation Details Call Failed : ${error}`
+      }
+    });
+    _NotificationHandler.NotificationHandler.notifyError(_NotificationScenarios.NotificationScenarios.Connection, "Get Conversation Details Call Failed: " + error);
+  }
+  return conversationDetails;
+};

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

@@ -4,8 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.setPreChatAndInitiateChat = exports.prepareStartChat = exports.initStartChat = exports.checkIfConversationStillValid = void 0;
-var _Constants = require("../../../common/Constants");
 var _TelemetryConstants = require("../../../common/telemetry/TelemetryConstants");
+var _Constants = require("../../../common/Constants");
+var _utils = require("../../../common/utils");
+var _authHelper = require("./authHelper");
+var _ActivityStreamHandler = require("./ActivityStreamHandler");
+var _omnichannelChatComponents = require("@microsoft/omnichannel-chat-components");
 var _ConversationState = require("../../../contexts/common/ConversationState");
 var _LiveChatWidgetActionType = require("../../../contexts/common/LiveChatWidgetActionType");
 var _NotificationHandler = require("../../webchatcontainerstateful/webchatcontroller/notification/NotificationHandler");
@@ -14,13 +18,9 @@ var _TelemetryHelper = require("../../../common/telemetry/TelemetryHelper");
 var _TelemetryManager = require("../../../common/telemetry/TelemetryManager");
 var _createAdapter = require("./createAdapter");
 var _newMessageEventHandler = require("../../../plugins/newMessageEventHandler");
-var _utils = require("../../../common/utils");
+var _reconnectChatHelper = require("./reconnectChatHelper");
 var _setPostChatContextAndLoadSurvey = require("./setPostChatContextAndLoadSurvey");
 var _updateSessionDataForTelemetry = require("./updateSessionDataForTelemetry");
-var _omnichannelChatComponents = require("@microsoft/omnichannel-chat-components");
-var _ActivityStreamHandler = require("./ActivityStreamHandler");
-var _authHelper = require("./authHelper");
-var _reconnectChatHelper = require("./reconnectChatHelper");
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 let optionalParams = {};
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -32,10 +32,7 @@ const prepareStartChat = async (props, chatSDK, state, dispatch, setAdapter) =>
   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;
 
-  // Can connect to existing chat session
-  if (await canConnectToExistingChat(props, chatSDK, state, dispatch, setAdapter)) {
-    return;
-  }
+  // reconnect > chat from cache
   await (0, _reconnectChatHelper.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
@@ -43,6 +40,11 @@ const prepareStartChat = async (props, chatSDK, state, dispatch, setAdapter) =>
     return;
   }
 
+  // Can connect to existing chat session
+  if (await canConnectToExistingChat(props, chatSDK, state, dispatch, setAdapter)) {
+    return;
+  }
+
   // Setting Proactive chat settings
   const isProactiveChat = state.appStates.conversationState === _ConversationState.ConversationState.ProactiveChat;
   const isPreChatEnabledInProactiveChat = state.appStates.proactiveChatStates.proactiveChatEnablePrechat;
@@ -84,12 +86,20 @@ const setPreChatAndInitiateChat = async (chatSDK, dispatch, setAdapter, isProact
     type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
     payload: _ConversationState.ConversationState.Loading
   });
-  await initStartChat(chatSDK, props === null || props === void 0 ? void 0 : props.chatConfig, props === null || props === void 0 ? void 0 : props.getAuthToken, dispatch, setAdapter);
+  const optionalParams = {
+    isProactiveChat
+  };
+  await initStartChat(chatSDK, dispatch, setAdapter, props, optionalParams);
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 exports.setPreChatAndInitiateChat = setPreChatAndInitiateChat;
-const initStartChat = async (chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, params, persistedState) => {
+const initStartChat = async (chatSDK, dispatch, setAdapter, props, params, persistedState) => {
+  var _props$controlProps2;
+  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;
   try {
     var _newAdapter$activity$, _TelemetryTimers$Widg;
     //Start widget load timer
@@ -103,10 +113,13 @@ const initStartChat = async (chatSDK, chatConfig, getAuthToken, dispatch, setAda
       // set auth token to chat sdk before start chat
       const authSuccess = await (0, _authHelper.handleAuthentication)(chatSDK, chatConfig, getAuthToken);
       if (!authSuccess) {
+        dispatch({
+          type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+          payload: _ConversationState.ConversationState.Closed
+        });
         return;
       }
     }
-    let isStartChatSuccessful = false;
 
     //Check if chat retrieved from cache
     if (persistedState || params !== null && params !== void 0 && params.liveChatContext) {
@@ -120,10 +133,16 @@ const initStartChat = async (chatSDK, chatConfig, getAuthToken, dispatch, setAda
       });
     }
     try {
+      var _window$Microsoft, _window$Microsoft$Dyn, _window$Microsoft$Dyn2, _window$Microsoft$Dyn3;
       // Set custom context params
       setCustomContextParams(chatSDK);
-      optionalParams = Object.assign({}, params, optionalParams);
-      await chatSDK.startChat(optionalParams);
+      const defaultOptionalParams = {
+        sendDefaultInitContext: true,
+        isProactiveChat: !!(params !== null && params !== void 0 && params.isProactiveChat),
+        portalContactId: (_window$Microsoft = window.Microsoft) === null || _window$Microsoft === void 0 ? void 0 : (_window$Microsoft$Dyn = _window$Microsoft.Dynamic365) === null || _window$Microsoft$Dyn === void 0 ? void 0 : (_window$Microsoft$Dyn2 = _window$Microsoft$Dyn.Portal) === null || _window$Microsoft$Dyn2 === void 0 ? void 0 : (_window$Microsoft$Dyn3 = _window$Microsoft$Dyn2.User) === null || _window$Microsoft$Dyn3 === void 0 ? void 0 : _window$Microsoft$Dyn3.contactId
+      };
+      const startChatOptionalParams = Object.assign({}, params, optionalParams, defaultOptionalParams);
+      await chatSDK.startChat(startChatOptionalParams);
       isStartChatSuccessful = true;
     } catch (error) {
       _TelemetryHelper.TelemetryHelper.logSDKEvent(_TelemetryConstants.LogLevel.ERROR, {
@@ -133,12 +152,6 @@ const initStartChat = async (chatSDK, chatConfig, getAuthToken, dispatch, setAda
         }
       });
       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;
     }
 
@@ -167,12 +180,6 @@ const initStartChat = async (chatSDK, chatConfig, getAuthToken, dispatch, setAda
       payload: liveChatContext
     });
 
-    // Set post chat context in state, no survey load
-    (0, _setPostChatContextAndLoadSurvey.setPostChatContextAndLoadSurvey)(chatSDK, dispatch);
-
-    // Updating chat session detail for telemetry
-    await (0, _updateSessionDataForTelemetry.updateSessionDataForTelemetry)(chatSDK, dispatch);
-
     // Set app state to Active
     if (isStartChatSuccessful) {
       _ActivityStreamHandler.ActivityStreamHandler.uncork();
@@ -191,6 +198,12 @@ const initStartChat = async (chatSDK, chatConfig, getAuthToken, dispatch, setAda
       Description: "Widget load complete",
       ElapsedTimeInMilliseconds: _TelemetryManager.TelemetryTimers === null || _TelemetryManager.TelemetryTimers === void 0 ? void 0 : (_TelemetryTimers$Widg = _TelemetryManager.TelemetryTimers.WidgetLoadTimer) === null || _TelemetryTimers$Widg === void 0 ? void 0 : _TelemetryTimers$Widg.milliSecondsElapsed
     });
+
+    // Set post chat context in state, no survey load
+    (0, _setPostChatContextAndLoadSurvey.setPostChatContextAndLoadSurvey)(chatSDK, dispatch);
+
+    // Updating chat session detail for telemetry
+    await (0, _updateSessionDataForTelemetry.updateSessionDataForTelemetry)(chatSDK, dispatch);
   } catch (ex) {
     _TelemetryHelper.TelemetryHelper.logLoadingEvent(_TelemetryConstants.LogLevel.ERROR, {
       Event: _TelemetryConstants.TelemetryEvent.WidgetLoadFailed,
@@ -211,16 +224,28 @@ const initStartChat = async (chatSDK, chatConfig, getAuthToken, dispatch, setAda
       });
       return;
     }
-    // Set app state to failing start chat
-    dispatch({
-      type: _LiveChatWidgetActionType.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.LiveChatWidgetActionType.SET_START_CHAT_FAILING,
+        payload: true
+      });
+      _TelemetryHelper.TelemetryHelper.logLoadingEvent(_TelemetryConstants.LogLevel.INFO, {
+        Event: _TelemetryConstants.TelemetryEvent.ErrorUIPaneLoaded,
+        Description: "Error UI Pane Loaded"
+      });
+    }
     // Show the loading pane in other cases for failure, this will help for both hideStartChatButton case
     dispatch({
       type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
       payload: _ConversationState.ConversationState.Loading
     });
+
+    // If sessionInit was successful but LCW startchat failed due to some reason e.g adapter didn't load
+    // we need to directly endChat to avoid leaving ghost chats in OC, not disturbing any other UI state 
+    if (isStartChatSuccessful === true) {
+      await forceEndChat(chatSDK);
+    }
   } finally {
     optionalParams = {};
     widgetInstanceId = "";
@@ -229,16 +254,27 @@ const initStartChat = async (chatSDK, chatConfig, getAuthToken, dispatch, setAda
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 exports.initStartChat = initStartChat;
+const forceEndChat = async chatSDK => {
+  _TelemetryHelper.TelemetryHelper.logLoadingEvent(_TelemetryConstants.LogLevel.ERROR, {
+    Event: _TelemetryConstants.TelemetryEvent.WidgetLoadFailed,
+    ExceptionDetails: {
+      Exception: "SessionInit was successful, but widget load failed."
+    }
+  });
+  chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.endChat();
+};
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 const canConnectToExistingChat = async (props, chatSDK, state, dispatch, setAdapter) => {
-  var _chatSDK$omnichannelC, _chatSDK$omnichannelC2, _props$controlProps2, _persistedState$domai6, _persistedState$appSt;
+  var _chatSDK$omnichannelC, _chatSDK$omnichannelC2, _props$controlProps3, _persistedState$domai6;
   // By pass this function in case of popout chat
   if (state.appStates.hideStartChatButton === true) {
     return false;
   }
-  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, (props === null || props === void 0 ? void 0 : (_props$controlProps2 = props.controlProps) === null || _props$controlProps2 === void 0 ? void 0 : _props$controlProps2.widgetInstanceId) ?? "");
+  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, (props === null || props === void 0 ? void 0 : (_props$controlProps3 = props.controlProps) === null || _props$controlProps3 === void 0 ? void 0 : _props$controlProps3.widgetInstanceId) ?? "");
 
   //Connect to only active chat session
-  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) {
+  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)) {
     var _persistedState$domai7;
     dispatch({
       type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
@@ -247,7 +283,7 @@ const canConnectToExistingChat = async (props, chatSDK, state, dispatch, setAdap
     const optionalParams = {
       liveChatContext: persistedState === null || persistedState === void 0 ? void 0 : (_persistedState$domai7 = persistedState.domainStates) === null || _persistedState$domai7 === void 0 ? void 0 : _persistedState$domai7.liveChatContext
     };
-    await initStartChat(chatSDK, props.chatConfig, props.getAuthToken, dispatch, setAdapter, optionalParams, persistedState);
+    await initStartChat(chatSDK, dispatch, setAdapter, props, optionalParams, persistedState);
     return true;
   } else {
     return false;
@@ -278,39 +314,18 @@ const setCustomContextParams = chatSDK => {
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const handleAuthenticationIfEnabled = async (chatSDK, props) => {
-  //For auth chat
-  if (props.getAuthToken) {
-    const authClientFunction = (0, _authHelper.getAuthClientFunction)(props.chatConfig);
-    if (authClientFunction) {
-      // set auth token to chat sdk before start chat
-      const authSuccess = await (0, _authHelper.handleAuthentication)(chatSDK, props.chatConfig, props.getAuthToken);
-      if (!authSuccess) {
-        return false;
-      }
-      return true;
-    }
-  }
-  return true;
-};
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const checkIfConversationStillValid = async (chatSDK, props, requestId, dispatch) => {
+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;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   let conversationDetails = undefined;
 
-  // Show Loading screen during auth check and start chat calls 
+  //Preserve old requestId
+  const oldRequestId = chatSDK.requestId ?? "";
   dispatch({
-    type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-    payload: _ConversationState.ConversationState.Loading
+    type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_INITIAL_CHAT_SDK_REQUEST_ID,
+    payload: oldRequestId
   });
-  const authSucceed = await handleAuthenticationIfEnabled(chatSDK, props);
-  if (!authSucceed) {
-    return false;
-  }
-
-  //Preserve old requestId
-  const oldRequestId = chatSDK.requestId;
   try {
     chatSDK.requestId = requestId;
     conversationDetails = await chatSDK.getConversationDetails();
@@ -319,6 +334,10 @@ const checkIfConversationStillValid = async (chatSDK, props, requestId, dispatch
       return false;
     }
     if (conversationDetails.state === _Constants.LiveWorkItemState.Closed || conversationDetails.state === _Constants.LiveWorkItemState.WrapUp) {
+      dispatch({
+        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_LIVE_CHAT_CONTEXT,
+        payload: undefined
+      });
       chatSDK.requestId = oldRequestId;
       return false;
     }