Merge pull request #3652 from techmatters/gian_fix-welc-msg-rc

refactor: move conversationJoined subscriptions - afterAcceptTask > beforeAcceptTask [CHI-3543]

Author: gpaoloni

plugin-hrm-form/src/HrmFormPlugin.tsx

@@ -155,6 +155,7 @@ const setUpActions = (
   // bind setupObject to the functions that requires some initialization
   const wrapupOverride = ActionFunctions.wrapupTask(setupObject, getMessage);
 
+  Flex.Actions.addListener('beforeAcceptTask', ActionFunctions.beforeAcceptTask(setupObject, getMessage));
   Flex.Actions.addListener('afterAcceptTask', ActionFunctions.afterAcceptTask(featureFlags, setupObject, getMessage));
 
   setUpTransferActions(setupObject);

plugin-hrm-form/src/utils/setUpActions.ts

@@ -140,6 +140,21 @@ const sendWelcomeMessageOnConversationJoined = (
   manager.conversationsClient.once('conversationJoined', (c: Conversation) => trySendWelcomeMessage(c, 0, 0));
 };
 
+export const beforeAcceptTask = (setupObject: SetupObject, getMessage: GetMessage) => async (
+  payload: ActionPayload,
+) => {
+  const { task } = payload;
+
+  if (TaskHelper.isChatBasedTask(task)) {
+    subscribeAlertOnConversationJoined(task);
+  }
+
+  // If this is the first counsellor that gets the task, say hi
+  if (TaskHelper.isChatBasedTask(task) && !TransferHelpers.hasTransferStarted(task)) {
+    sendWelcomeMessageOnConversationJoined(setupObject, getMessage, payload);
+  }
+};
+
 export const afterAcceptTask = (featureFlags: FeatureFlags, setupObject: SetupObject, getMessage: GetMessage) => async (
   payload: ActionPayload,
 ) => {
@@ -158,14 +173,6 @@ export const afterAcceptTask = (featureFlags: FeatureFlags, setupObject: SetupOb
       }
     }
   });
-  if (TaskHelper.isChatBasedTask(task)) {
-    subscribeAlertOnConversationJoined(task);
-  }
-
-  // If this is the first counsellor that gets the task, say hi
-  if (TaskHelper.isChatBasedTask(task) && !TransferHelpers.hasTransferStarted(task)) {
-    sendWelcomeMessageOnConversationJoined(setupObject, getMessage, payload);
-  }
 
   if (TransferHelpers.hasTransferStarted(task)) {
     await handleTransferredTask(task);