@davi-ai/retorik-framework 3.2.3 → 3.2.4

package/dist/index.modern.js

@@ -10,7 +10,7 @@ import {ConnectionStatus as $bZRJW$ConnectionStatus, DirectLine as $bZRJW$Direct
 import {Document as $bZRJW$Document, Page as $bZRJW$Page, pdfjs as $bZRJW$pdfjs} from "react-pdf";
 import {animated as $bZRJW$animated, useSpring as $bZRJW$useSpring, easings as $bZRJW$easings} from "@react-spring/web";
 import {Player as $bZRJW$Player} from "@lottiefiles/react-lottie-player";
-import {browserName as $bZRJW$browserName, BrowserTypes as $bZRJW$BrowserTypes, osName as $bZRJW$osName, OsTypes as $bZRJW$OsTypes, osVersion as $bZRJW$osVersion, browserVersion as $bZRJW$browserVersion, isMobile as $bZRJW$isMobile} from "react-device-detect";
+import {browserName as $bZRJW$browserName, BrowserTypes as $bZRJW$BrowserTypes, osName as $bZRJW$osName, OsTypes as $bZRJW$OsTypes, isMobile as $bZRJW$isMobile} from "react-device-detect";
 import {presets as $d70757f720801c36$re_export$presets} from "@davi-ai/react-bodyengine-three";
 import {createRoot as $bZRJW$createRoot} from "react-dom/client";
 import $bZRJW$reactshadow from "react-shadow";
@@ -90,7 +90,6 @@ const $920719987d28bd50$var$initialState = {
     retorikEvent: undefined,
     displayAgent: true,
     activityToSend: undefined,
-    currentNewsActivity: undefined,
     retorikNewsEnded: false,
     userIsTyping: false,
     userIsSwiping: false,
@@ -176,11 +175,6 @@ const $920719987d28bd50$var$createUtilsStore = ()=>(0, $bZRJW$createStore)((set,
                         activityToSend: value
                     });
                 },
-                setCurrentNewsActivity: (value)=>{
-                    set({
-                        currentNewsActivity: value
-                    });
-                },
                 setRetorikNewsEnded: (value)=>{
                     set({
                         retorikNewsEnded: value
@@ -338,6 +332,7 @@ $parcel$export(module.exports, "Source3DEngine", () => $179a76b9823b36f3$export$
 $parcel$export(module.exports, "UIPart", () => $179a76b9823b36f3$export$63fc5f52b5b4da1e);
 $parcel$export(module.exports, "TextFrom", () => $179a76b9823b36f3$export$b685c7d489184507);
 $parcel$export(module.exports, "Theme", () => $179a76b9823b36f3$export$14faa19a0f3bbeb2);
+$parcel$export(module.exports, "TraceType", () => $179a76b9823b36f3$export$d4b4ca0ba30ae29c);
 var $179a76b9823b36f3$export$e4a712fff93fb00f = /*#__PURE__*/ function(ActionType) {
     ActionType["message"] = "message";
     ActionType["event"] = "event";
@@ -563,6 +558,12 @@ var $179a76b9823b36f3$export$14faa19a0f3bbeb2 = /*#__PURE__*/ function(Theme) {
     Theme["auto"] = "auto";
     return Theme;
 }($179a76b9823b36f3$export$14faa19a0f3bbeb2 || {});
+var $179a76b9823b36f3$export$d4b4ca0ba30ae29c = /*#__PURE__*/ function(TraceType) {
+    TraceType["message"] = "directlineMessage";
+    TraceType["utteranceStart"] = "utteranceStart";
+    TraceType["utteranceEnd"] = "utteranceEnd";
+    return TraceType;
+}($179a76b9823b36f3$export$d4b4ca0ba30ae29c || {});
 
 });
 
@@ -2061,9 +2062,6 @@ const $244e94971d503466$var$initialState = {
     visemeData: [],
     singleVisemeAdded: null,
     multiVisemesAdded: [],
-    currentReplyToId: undefined,
-    currentPlaying: undefined,
-    endedActivities: [],
     currentOrLastPlayedActivity: undefined,
     isMicrophoneAllowed: false,
     showMicrophoneModal: false,
@@ -2072,9 +2070,6 @@ const $244e94971d503466$var$initialState = {
     lastRecognitionInterim: '',
     streamingReplyToId: null,
     streamingQueue: [],
-    streamingQueueForText: [],
-    currentStreaming: null,
-    streamingQueueFullLength: 0,
     streamingReplyToIdToIgnore: null,
     speechRecognitionDynamicGrammars: [],
     externalTextToSpeech: undefined
@@ -2210,22 +2205,6 @@ const $244e94971d503466$var$createSpeechStore = (setRetorikEvent, getListStatus,
                         if (getListStatus() !== (0, $4ucVo.ListStatus).opened) setListStatus((0, $4ucVo.ListStatus).available);
                     }
                 },
-                setCurrentReplyToId: (value)=>{
-                    set({
-                        currentReplyToId: value
-                    });
-                },
-                setCurrentPlaying: (value)=>{
-                    set({
-                        currentPlaying: value
-                    });
-                    value && get().actions.setCurrentOrLastPlayedActivity(value);
-                },
-                setEndedActivities: (value)=>{
-                    set({
-                        endedActivities: value
-                    });
-                },
                 setIsMicrophoneAllowed: (value)=>{
                     set({
                         isMicrophoneAllowed: value
@@ -2287,72 +2266,45 @@ const $244e94971d503466$var$createSpeechStore = (setRetorikEvent, getListStatus,
                         streamingReplyToId: value
                     });
                 },
-                setStreamingQueue: (value)=>{
-                    set({
-                        streamingQueue: value,
-                        streamingQueueForText: value
-                    });
-                },
                 addToStreamingQueue: (value)=>{
-                    if (value.replyToId && value.replyToId !== get().streamingReplyToIdToIgnore) {
-                        // Set replyToId and new queue if replyToId is different from the current one
-                        if (get().streamingReplyToId !== value.replyToId) set({
-                            streamingQueueFullLength: 0,
-                            streamingReplyToId: value.replyToId,
-                            streamingQueue: [
-                                value
-                            ],
-                            streamingQueueForText: [
-                                value
-                            ]
-                        });
-                        else set({
-                            streamingQueue: [
-                                ...get().streamingQueue,
-                                value
-                            ],
-                            streamingQueueForText: [
-                                ...get().streamingQueueForText,
-                                value
-                            ]
-                        });
-                    }
+                    if (value.replyToId) {
+                        if (value.replyToId !== get().streamingReplyToIdToIgnore) {
+                            // Set replyToId and new queue if replyToId is different from the current one
+                            if (get().streamingReplyToId !== value.replyToId) set({
+                                streamingReplyToId: value.replyToId,
+                                streamingQueue: [
+                                    value
+                                ]
+                            });
+                            else set({
+                                streamingQueue: [
+                                    ...get().streamingQueue,
+                                    value
+                                ]
+                            });
+                        }
+                    } else set({
+                        streamingQueue: [
+                            ...get().streamingQueue,
+                            value
+                        ]
+                    });
                 },
-                removeFirstFromStreamingQueue: ()=>{
-                    if (get().streamingQueue.length) {
-                        const tempStreamingQueue = get().streamingQueue.slice();
-                        tempStreamingQueue.splice(0, 1);
-                        set({
-                            streamingQueue: tempStreamingQueue
-                        });
-                    }
+                // If "twice" parameter is true, let's remove 2 elements instead of one (used with the message at the end of a streaming that should not be spoken)
+                removeFirstFromStreamingQueue: (twice)=>{
+                    set((state)=>({
+                            streamingQueue: state.streamingQueue.slice(twice ? 2 : 1)
+                        }));
                 },
                 killCurrentStreaming: ()=>{
                     set({
-                        streamingReplyToId: null,
-                        streamingQueue: [],
-                        streamingQueueForText: [],
-                        currentStreaming: null,
-                        streamingQueueFullLength: 0,
-                        streamingReplyToIdToIgnore: get().streamingReplyToId
+                        streamingReplyToIdToIgnore: get().streamingReplyToId,
+                        streamingQueue: []
                     });
                 },
                 checkActivityReplyToId: (replyToId)=>{
                     get().streamingReplyToId !== replyToId && get().actions.killCurrentStreaming();
                 },
-                setCurrentStreaming: (value)=>{
-                    set({
-                        currentStreaming: value
-                    });
-                },
-                setStreamingQueueFullLength: (value, replyToId)=>{
-                    if (replyToId) replyToId === get().streamingReplyToId && set({
-                        streamingQueueFullLength: value
-                    });
-                    else set({
-                        streamingQueueFullLength: value
-                    });
-                },
                 addSpeechRecognitionDynamicGrammar: (value)=>{
                     const currentGrammars = get().speechRecognitionDynamicGrammars;
                     // For each value, verifiy if it doesn't exist in the array yet
@@ -2772,7 +2724,7 @@ const $1cd684302a8789ac$var$initialState = {
     queueLock: false
 };
 const $1cd684302a8789ac$var$regexDataCommand = /(\{data-command=")[\p{L}\p{N}\p{Po}\p{Pd}\p{Pc}\s\u0027\u2019]+("\})(<br\s\/>)?/gu;
-const $1cd684302a8789ac$var$createActivityStore = (localeRef, isUsedOnBorneRef, inputHintBehaviourRef, setCurrentId, setRestoreInputsState, addToStreamingQueue, setStreamingQueueFullLength, setMode, unlockClickedButton, setSubmitDelayBeforeSendingMessage, setIsWaitingForResponse, setSendBoxPlaceHolder)=>{
+const $1cd684302a8789ac$var$createActivityStore = (localeRef, isUsedOnBorneRef, inputHintBehaviourRef, setCurrentId, setRestoreInputsState, addToStreamingQueue, setMode, unlockClickedButton, setSubmitDelayBeforeSendingMessage, setIsWaitingForResponse, setSendBoxPlaceHolder)=>{
     return (0, $bZRJW$createStore)((set, get)=>{
         return {
             ...$1cd684302a8789ac$var$initialState,
@@ -2837,7 +2789,7 @@ const $1cd684302a8789ac$var$createActivityStore = (localeRef, isUsedOnBorneRef,
                         currentActivity.type === 'message' ? await get().actions.processAddBotMessage(currentActivity) : await get().actions.processAddBotEvent(currentActivity);
                         // Remove the first element from the queue (the one that got processed above) and process the queue once again
                         set({
-                            queue: get().queue.slice().splice(1)
+                            queue: get().queue.slice(1)
                         });
                         get().actions.processQueue();
                     } else set({
@@ -2847,9 +2799,9 @@ const $1cd684302a8789ac$var$createActivityStore = (localeRef, isUsedOnBorneRef,
                 processAddBotMessage: async (value)=>{
                     setCurrentId(undefined);
                     const processedActivity = await get().actions.processBotMessageActivity(value);
-                    // If this activity is the one concluding a streaming, let's set the amount of streams previously generated
-                    if (!get().retrievingConversation && value.value?.streamingCount) setStreamingQueueFullLength(value.value.streamingCount, value.replyToId);
                     const tempActivity = get().retrievingConversation ? undefined : processedActivity;
+                    // Add this activity to the streaming queue if we are not in conversation retrieval process
+                    !get().retrievingConversation && addToStreamingQueue(processedActivity);
                     set({
                         activities: [
                             ...get().activities,
@@ -2891,6 +2843,28 @@ const $1cd684302a8789ac$var$createActivityStore = (localeRef, isUsedOnBorneRef,
                     }
                 },
                 processAddBotEvent: async (value)=>{
+                    const streamingMap = new Map(get().botStreamingActivities);
+                    // Deal with streaming activities
+                    if (value.name?.toLowerCase() === 'davi.streammessageactivity') // Add this activity to the streaming queue if we are not in conversation retrieval process
+                    {
+                        if (value.text?.trim().length && !get().retrievingConversation) {
+                            // Create speak field from the text one
+                            const processedText = (0, $dklvz.processMarkdownAndSpeechMarkdown)(value.text, true);
+                            value.speak = processedText.text;
+                            value.htmlText = processedText.htmlText;
+                            addToStreamingQueue(value);
+                            // Set data in the Map for text display
+                            if (value.replyToId) {
+                                const currentStreamingData = streamingMap.get(value.replyToId);
+                                currentStreamingData ? streamingMap.set(value.replyToId, [
+                                    ...currentStreamingData,
+                                    value
+                                ]) : streamingMap.set(value.replyToId, [
+                                    value
+                                ]);
+                            }
+                        }
+                    }
                     set({
                         activities: [
                             ...get().activities,
@@ -2908,37 +2882,15 @@ const $1cd684302a8789ac$var$createActivityStore = (localeRef, isUsedOnBorneRef,
                         ],
                         lastBotEventActivity: value,
                         lastEventActivity: value,
+                        botStreamingActivities: streamingMap,
                         watermark: get().watermark + 1
                     });
                     Promise.resolve();
                 },
                 addBotEvent: async (value)=>{
                     if (get().actions.checkCurrentConversationId(value.id)) {
-                        if (value.name?.toLowerCase() === 'davi.streammessageactivity') {
-                            if (value.text?.trim().length && !get().retrievingConversation) {
-                                setIsWaitingForResponse(false);
-                                // Create speak field from the text one
-                                const processedText = (0, $dklvz.processMarkdownAndSpeechMarkdown)(value.text, true);
-                                value.speak = processedText.text;
-                                value.htmlText = processedText.htmlText;
-                                addToStreamingQueue(value);
-                                if (value.replyToId) {
-                                    const currentStreamingMap = new Map(get().botStreamingActivities);
-                                    const currentStreamingData = currentStreamingMap.get(value.replyToId);
-                                    currentStreamingData ? currentStreamingMap.set(value.replyToId, [
-                                        ...currentStreamingData,
-                                        value
-                                    ]) : currentStreamingMap.set(value.replyToId, [
-                                        value
-                                    ]);
-                                    set({
-                                        botStreamingActivities: currentStreamingMap,
-                                        watermark: get().watermark + 1
-                                    });
-                                }
-                                unlockClickedButton();
-                            }
-                        } else if (value.name?.toLowerCase() === 'switchtotextmode') {
+                        //
+                        if (value.name?.toLowerCase() === 'switchtotextmode') {
                             setMode((0, $4ucVo.Mode).text);
                             set({
                                 watermark: get().watermark + 1
@@ -3203,10 +3155,10 @@ const $1cd684302a8789ac$var$ActivityProvider = ({ children: children })=>{
     const isUsedOnBorneRef = (0, $bZRJW$useRef)(false);
     const inputHintBehaviourRef = (0, $bZRJW$useRef)(undefined);
     const { setCurrentId: setCurrentId, setRestoreInputsState: setRestoreInputsState } = (0, $jubFc.useAdaptiveCardStore)((state)=>state.actions);
-    const { addToStreamingQueue: addToStreamingQueue, setStreamingQueueFullLength: setStreamingQueueFullLength, setMode: setMode } = (0, $i1rfm.useSpeechStore)((state)=>state.actions);
+    const { addToStreamingQueue: addToStreamingQueue, setMode: setMode } = (0, $i1rfm.useSpeechStore)((state)=>state.actions);
     const unlockClickedButton = (0, $j67YK.useUtilsStore)((state)=>state.actions.unlockClickedButton);
     const { setSubmitDelayBeforeSendingMessage: setSubmitDelayBeforeSendingMessage, setIsWaitingForResponse: setIsWaitingForResponse, setSendBoxPlaceHolder: setSendBoxPlaceHolder } = (0, $1x02c.useRetorikStore)((state)=>state.actions);
-    const [store] = (0, $bZRJW$useState)(()=>$1cd684302a8789ac$var$createActivityStore(localeRef, isUsedOnBorneRef, inputHintBehaviourRef, setCurrentId, setRestoreInputsState, addToStreamingQueue, setStreamingQueueFullLength, setMode, unlockClickedButton, setSubmitDelayBeforeSendingMessage, setIsWaitingForResponse, setSendBoxPlaceHolder));
+    const [store] = (0, $bZRJW$useState)(()=>$1cd684302a8789ac$var$createActivityStore(localeRef, isUsedOnBorneRef, inputHintBehaviourRef, setCurrentId, setRestoreInputsState, addToStreamingQueue, setMode, unlockClickedButton, setSubmitDelayBeforeSendingMessage, setIsWaitingForResponse, setSendBoxPlaceHolder));
     (0, $bZRJW$useEffect)(()=>{
         localeRef.current = locale;
     }, [
@@ -4127,7 +4079,7 @@ const $ca466c72d380f23a$var$createDirectlineStore = (modeRef, recognitionStateRe
                     if (get().actions.checkIfHandlerAbortsActivity((0, $1ZPEZ.LegacyDirectLineActivityType).SEND_MESSAGE, tempActivity)) return;
                     get().directLine?.postActivity(tempActivity).subscribe();
                 },
-                sendEvent: (name, value)=>{
+                sendEvent: (name, value, callback)=>{
                     if (get().conversationPaused) return;
                     !name.toLowerCase().includes('davi.closewindow') && !$ca466c72d380f23a$var$eventsWithoutCancel.includes(name.toLowerCase()) && get().actions.checkMicrophoneAndCancel();
                     const locale = checkDumpedLocaleFallback();
@@ -4146,7 +4098,10 @@ const $ca466c72d380f23a$var$createDirectlineStore = (modeRef, recognitionStateRe
                     // Check if the event should be stopped in the external activity handler if there is one
                     if (get().actions.checkIfHandlerAbortsActivity((0, $1ZPEZ.LegacyDirectLineActivityType).POST_ACTIVITY, tempEvent)) return;
                     if (get().actions.checkIfHandlerAbortsActivity((0, $1ZPEZ.LegacyDirectLineActivityType).SEND_EVENT, tempEvent)) return;
-                    get().directLine?.postActivity(tempEvent).subscribe();
+                    get().directLine?.postActivity(tempEvent).subscribe({
+                        error: (error)=>console.log('Retorik Framework > error while sending event : ', error),
+                        complete: ()=>callback?.()
+                    });
                 },
                 sendTyping: ()=>{
                     if (get().conversationPaused) return;
@@ -4352,7 +4307,7 @@ var $c54ebc4ba0100ff1$export$2e2bcd8739ae039 = $c54ebc4ba0100ff1$var$activityMid
 });
 
 parcelRegister("iT1WI", function(module, exports) {
-module.exports = JSON.parse("{\"name\":\"@davi-ai/retorik-framework\",\"version\":\"3.2.3\",\"description\":\"Retorik Framework package\",\"author\":\"DAVI\",\"license\":\"MIT\",\"repository\":\"none\",\"main\":\"dist/index.js\",\"module\":\"dist/index.modern.js\",\"types\":\"dist/index.d.ts\",\"source\":\"src/index.tsx\",\"standalone\":\"standalone/index.js\",\"targets\":{\"standalone\":{\"context\":\"browser\",\"outputFormat\":\"esmodule\",\"distDir\":\"standalone\"},\"module\":{\"context\":\"browser\",\"outputFormat\":\"esmodule\",\"distDir\":\"dist\"}},\"engines\":{\"node\":\">=10\"},\"scripts\":{\"build\":\"parcel build\",\"start\":\"parcel watch\",\"test\":\"jest --env=jsdom --reporters=jest-junit\",\"test-console\":\"jest --env=jsdom\",\"test-update-snapshots\":\"jest --env=jsdom --updateSnapshot\",\"test-coverage-console\":\"jest --env=jsdom --reporters=jest-junit --coverage\",\"test-coverage\":\"jest --env=jsdom --reporters=jest-junit --coverage --coverageReporters=cobertura\",\"report\":\"npx parcel build src/index.tsx --reporter @parcel/reporter-bundle-analyzer\",\"credentials\":\"vsts-npm-auth -config .npmrc\"},\"peerDependencies\":{\"react\":\"18.3.1\",\"react-dom\":\"18.3.1\"},\"devDependencies\":{\"@babel/core\":\"^7.19.1\",\"@babel/plugin-proposal-decorators\":\"^7.24.7\",\"@babel/plugin-proposal-private-property-in-object\":\"^7.21.11\",\"@babel/preset-env\":\"^7.25.4\",\"@babel/preset-react\":\"^7.24.7\",\"@babel/preset-typescript\":\"^7.24.7\",\"@babel/runtime\":\"^7.23.8\",\"@parcel/packager-ts\":\"^2.13.2\",\"@parcel/reporter-bundle-analyzer\":\"^2.13.2\",\"@parcel/reporter-sourcemap-visualiser\":\"^2.13.2\",\"@parcel/transformer-inline-string\":\"^2.13.2\",\"@parcel/transformer-typescript-types\":\"^2.13.2\",\"@parcel/validator-eslint\":\"^2.13.2\",\"@parcel/validator-typescript\":\"^2.13.2\",\"@testing-library/dom\":\"^10.4.0\",\"@testing-library/jest-dom\":\"6.5.0\",\"@testing-library/react\":\"16.0.1\",\"@testing-library/react-hooks\":\"8.0.1\",\"@testing-library/user-event\":\"14.5.2\",\"@types/jest\":\"^27.5.1\",\"@types/leaflet\":\"^1.8.0\",\"@types/node\":\"^12.12.38\",\"@types/react\":\"18.3.12\",\"@types/react-dom\":\"18.3.1\",\"@types/testing-library__jest-dom\":\"^5.14.5\",\"@types/testing-library__react\":\"latest\",\"@typescript-eslint/eslint-plugin\":\"^8.19.0\",\"@typescript-eslint/parser\":\"^8.19.0\",\"autoprefixer\":\"^10.4.7\",\"babel-eslint\":\"^10.0.3\",\"babel-jest\":\"^29.7.0\",\"babel-loader\":\"^8.2.5\",\"buffer\":\"^5.7.1\",\"canvas\":\"^2.9.0\",\"cross-env\":\"^7.0.2\",\"crypto-browserify\":\"^3.12.0\",\"eslint\":\"^9.16.0\",\"eslint-config-prettier\":\"^9.1.0\",\"eslint-config-standard\":\"^17.1.0\",\"eslint-config-standard-react\":\"^13.0.0\",\"eslint-plugin-import\":\"^2.31.0\",\"eslint-plugin-node\":\"^11.1.0\",\"eslint-plugin-prettier\":\"^5.2.1\",\"eslint-plugin-promise\":\"^7.2.1\",\"eslint-plugin-react\":\"^7.37.2\",\"https-browserify\":\"^1.0.0\",\"jest\":\"^29.7.0\",\"jest-environment-jsdom\":\"^29.7.0\",\"jest-junit\":\"16.0.0\",\"npm-run-all\":\"^4.1.5\",\"parcel\":\"^2.13.2\",\"postcss\":\"^8.4.14\",\"postcss-url\":\"^10.1.3\",\"prettier\":\"^2.0.4\",\"process\":\"^0.11.10\",\"punycode\":\"^1.4.1\",\"querystring-es3\":\"^0.2.1\",\"react\":\"^18\",\"react-docgen-typescript-plugin\":\"^1.0.5\",\"react-dom\":\"18.3.1\",\"react-test-renderer\":\"^18.3.1\",\"resize-observer-polyfill\":\"^1.5.1\",\"stream-browserify\":\"^3.0.0\",\"stream-http\":\"^3.2.0\",\"string_decoder\":\"^1.3.0\",\"tailwindcss\":\"^3.1.0\",\"typescript\":\"5.3.2\",\"url\":\"^0.11.0\",\"util\":\"^0.12.4\"},\"files\":[\"dist\"],\"dependencies\":{\"@davi-ai/body-engine-sprite\":\"3.0.0\",\"@davi-ai/react-bodyengine-three\":\"1.0.6\",\"@davi-ai/retorik-weather\":\"2.0.0\",\"@davi-ai/speechmarkdown-davi-js\":\"2.0.1\",\"@davi-ai/web-speech-cognitive-services-davi\":\"2.0.10\",\"@lottiefiles/react-lottie-player\":\"^3.4.1\",\"@opentelemetry/api\":\"^1.9.0\",\"@opentelemetry/exporter-trace-otlp-http\":\"^0.200.0\",\"@opentelemetry/instrumentation\":\"^0.200.0\",\"@opentelemetry/instrumentation-document-load\":\"^0.45.0\",\"@opentelemetry/instrumentation-fetch\":\"^0.200.0\",\"@opentelemetry/resources\":\"^2.0.0\",\"@opentelemetry/sdk-trace-web\":\"^2.0.0\",\"@opentelemetry/semantic-conventions\":\"^1.32.0\",\"@react-spring/types\":\"^9.7.3\",\"@react-spring/web\":\"^9.7.3\",\"@swc/helpers\":\"^0.5.0\",\"@types/geojson\":\"^7946.0.10\",\"@types/jsdom\":\"^16.2.14\",\"@use-gesture/react\":\"^10.2.15\",\"adaptivecards\":\"3.0.1\",\"botframework-directlinejs\":\"^0.15.5\",\"classnames\":\"^2.3.1\",\"detect-gpu\":\"^5.0.70\",\"leaflet\":\"^1.9.2\",\"markdown-it\":\"14.1.0\",\"pdfjs-dist\":\"3.11.174\",\"postcss-copy\":\"^7.1.0\",\"qrcode\":\"^1.5.1\",\"react-device-detect\":\"^2.2.3\",\"react-error-boundary\":\"^4.0.10\",\"react-leaflet\":\"^4.1.0\",\"react-pdf\":\"7.7.1\",\"react-shadow\":\"^20.5.0\",\"swiper\":\"^8.4.5\",\"zustand\":\"^5.0.3\"},\"overrides\":{\"@davi-ai/web-speech-cognitive-services-davi\":\"$@davi-ai/web-speech-cognitive-services-davi\",\"zustand\":\"$zustand\"},\"@parcel/resolver-default\":{\"packageExports\":true}}");
+module.exports = JSON.parse("{\"name\":\"@davi-ai/retorik-framework\",\"version\":\"3.2.4\",\"description\":\"Retorik Framework package\",\"author\":\"DAVI\",\"license\":\"MIT\",\"repository\":\"none\",\"main\":\"dist/index.js\",\"module\":\"dist/index.modern.js\",\"types\":\"dist/index.d.ts\",\"source\":\"src/index.tsx\",\"standalone\":\"standalone/index.js\",\"targets\":{\"standalone\":{\"context\":\"browser\",\"outputFormat\":\"esmodule\",\"distDir\":\"standalone\"},\"module\":{\"context\":\"browser\",\"outputFormat\":\"esmodule\",\"distDir\":\"dist\"}},\"engines\":{\"node\":\">=10\"},\"scripts\":{\"build\":\"parcel build\",\"start\":\"parcel watch\",\"test\":\"jest --env=jsdom --reporters=jest-junit\",\"test-console\":\"jest --env=jsdom\",\"test-update-snapshots\":\"jest --env=jsdom --updateSnapshot\",\"test-coverage-console\":\"jest --env=jsdom --reporters=jest-junit --coverage\",\"test-coverage\":\"jest --env=jsdom --reporters=jest-junit --coverage --coverageReporters=cobertura\",\"report\":\"npx parcel build src/index.tsx --reporter @parcel/reporter-bundle-analyzer\",\"credentials\":\"vsts-npm-auth -config .npmrc\"},\"peerDependencies\":{\"react\":\"18.3.1\",\"react-dom\":\"18.3.1\"},\"devDependencies\":{\"@babel/core\":\"^7.19.1\",\"@babel/plugin-proposal-decorators\":\"^7.24.7\",\"@babel/plugin-proposal-private-property-in-object\":\"^7.21.11\",\"@babel/preset-env\":\"^7.25.4\",\"@babel/preset-react\":\"^7.24.7\",\"@babel/preset-typescript\":\"^7.24.7\",\"@babel/runtime\":\"^7.23.8\",\"@parcel/packager-ts\":\"^2.13.2\",\"@parcel/reporter-bundle-analyzer\":\"^2.13.2\",\"@parcel/reporter-sourcemap-visualiser\":\"^2.13.2\",\"@parcel/transformer-inline-string\":\"^2.13.2\",\"@parcel/transformer-typescript-types\":\"^2.13.2\",\"@parcel/validator-eslint\":\"^2.13.2\",\"@parcel/validator-typescript\":\"^2.13.2\",\"@testing-library/dom\":\"^10.4.0\",\"@testing-library/jest-dom\":\"6.5.0\",\"@testing-library/react\":\"16.0.1\",\"@testing-library/react-hooks\":\"8.0.1\",\"@testing-library/user-event\":\"14.5.2\",\"@types/jest\":\"^27.5.1\",\"@types/leaflet\":\"^1.8.0\",\"@types/node\":\"^12.12.38\",\"@types/react\":\"18.3.12\",\"@types/react-dom\":\"18.3.1\",\"@types/testing-library__jest-dom\":\"^5.14.5\",\"@types/testing-library__react\":\"latest\",\"@typescript-eslint/eslint-plugin\":\"^8.19.0\",\"@typescript-eslint/parser\":\"^8.19.0\",\"autoprefixer\":\"^10.4.7\",\"babel-eslint\":\"^10.0.3\",\"babel-jest\":\"^29.7.0\",\"babel-loader\":\"^8.2.5\",\"buffer\":\"^5.7.1\",\"canvas\":\"^2.9.0\",\"cross-env\":\"^7.0.2\",\"crypto-browserify\":\"^3.12.0\",\"eslint\":\"^9.16.0\",\"eslint-config-prettier\":\"^9.1.0\",\"eslint-config-standard\":\"^17.1.0\",\"eslint-config-standard-react\":\"^13.0.0\",\"eslint-plugin-import\":\"^2.31.0\",\"eslint-plugin-node\":\"^11.1.0\",\"eslint-plugin-prettier\":\"^5.2.1\",\"eslint-plugin-promise\":\"^7.2.1\",\"eslint-plugin-react\":\"^7.37.2\",\"https-browserify\":\"^1.0.0\",\"jest\":\"^29.7.0\",\"jest-environment-jsdom\":\"^29.7.0\",\"jest-junit\":\"16.0.0\",\"npm-run-all\":\"^4.1.5\",\"parcel\":\"^2.13.2\",\"postcss\":\"^8.4.14\",\"postcss-url\":\"^10.1.3\",\"prettier\":\"^2.0.4\",\"process\":\"^0.11.10\",\"punycode\":\"^1.4.1\",\"querystring-es3\":\"^0.2.1\",\"react\":\"^18\",\"react-docgen-typescript-plugin\":\"^1.0.5\",\"react-dom\":\"18.3.1\",\"react-test-renderer\":\"^18.3.1\",\"resize-observer-polyfill\":\"^1.5.1\",\"stream-browserify\":\"^3.0.0\",\"stream-http\":\"^3.2.0\",\"string_decoder\":\"^1.3.0\",\"tailwindcss\":\"^3.1.0\",\"typescript\":\"5.3.2\",\"url\":\"^0.11.0\",\"util\":\"^0.12.4\"},\"files\":[\"dist\"],\"dependencies\":{\"@davi-ai/body-engine-sprite\":\"3.0.0\",\"@davi-ai/react-bodyengine-three\":\"1.0.6\",\"@davi-ai/retorik-weather\":\"2.0.0\",\"@davi-ai/speechmarkdown-davi-js\":\"2.0.1\",\"@davi-ai/web-speech-cognitive-services-davi\":\"2.0.10\",\"@lottiefiles/react-lottie-player\":\"^3.4.1\",\"@opentelemetry/api\":\"^1.9.0\",\"@opentelemetry/exporter-trace-otlp-http\":\"^0.200.0\",\"@opentelemetry/instrumentation\":\"^0.200.0\",\"@opentelemetry/instrumentation-document-load\":\"^0.45.0\",\"@opentelemetry/instrumentation-fetch\":\"^0.200.0\",\"@opentelemetry/resources\":\"^2.0.0\",\"@opentelemetry/sdk-trace-web\":\"^2.0.0\",\"@opentelemetry/semantic-conventions\":\"^1.32.0\",\"@react-spring/types\":\"^9.7.3\",\"@react-spring/web\":\"^9.7.3\",\"@swc/helpers\":\"^0.5.0\",\"@types/geojson\":\"^7946.0.10\",\"@types/jsdom\":\"^16.2.14\",\"@use-gesture/react\":\"^10.2.15\",\"adaptivecards\":\"3.0.1\",\"botframework-directlinejs\":\"^0.15.5\",\"classnames\":\"^2.3.1\",\"detect-gpu\":\"^5.0.70\",\"leaflet\":\"^1.9.2\",\"markdown-it\":\"14.1.0\",\"pdfjs-dist\":\"3.11.174\",\"postcss-copy\":\"^7.1.0\",\"qrcode\":\"^1.5.1\",\"react-device-detect\":\"^2.2.3\",\"react-error-boundary\":\"^4.0.10\",\"react-leaflet\":\"^4.1.0\",\"react-pdf\":\"7.7.1\",\"react-shadow\":\"^20.5.0\",\"swiper\":\"^8.4.5\",\"zustand\":\"^5.0.3\"},\"overrides\":{\"@davi-ai/web-speech-cognitive-services-davi\":\"$@davi-ai/web-speech-cognitive-services-davi\",\"zustand\":\"$zustand\"},\"@parcel/resolver-default\":{\"packageExports\":true}}");
 
 });
 
@@ -5466,23 +5421,24 @@ const $04f538c5adcaba69$var$SendActivityEventListener = ({ isRetorikNews: isReto
             document.removeEventListener('retorikSetVisibility', handleEvents);
         };
     }, []);
-    (0, $bZRJW$useEffect)(()=>{
-        if (isRetorikNews || hasConversationCookie) setUserAlreadySet(true);
-        else if (!userAlreadySet && appAvailable && !displayGDPR && characterLoaded) {
-            setUserAlreadySet(true);
-            // Send mandatory events : setUser to start conversation, Davi.GDPRConsent for GDPR module
-            sendEvent('setUser', {
+    /**
+   * Send mandatory events : setUser to start conversation, Davi.GDPRConsent for GDPR module
+   */ const sendMandatoryEvents = async ()=>{
+        sendEvent('Davi.GDPRConsent', {
+            userConsent: userConsent
+        }, ()=>sendEvent('setUser', {
                 user: {
                     ...userData,
                     gdprConsent: true
                 },
                 skipWelcome: !!skipWelcome
-            });
-            setTimeout(()=>{
-                sendEvent('Davi.GDPRConsent', {
-                    userConsent: userConsent
-                });
-            }, 100);
+            }));
+    };
+    (0, $bZRJW$useEffect)(()=>{
+        if (isRetorikNews || hasConversationCookie) setUserAlreadySet(true);
+        else if (!userAlreadySet && appAvailable && !displayGDPR && characterLoaded) {
+            setUserAlreadySet(true);
+            sendMandatoryEvents();
         }
     }, [
         appAvailable,
@@ -7695,8 +7651,7 @@ const $2ec58e0e10234435$var$List = ({ activity: activity, onClose: onClose })=>{
         if (timerRef) {
             timerRef.current && clearTimeout(timerRef.current);
             timerRef.current = setTimeout(()=>{
-                sendEvent('Davi.CloseWindow', null);
-                sendEvent('Davi.CloseWindowList', null);
+                sendEvent('Davi.CloseWindow', null, ()=>sendEvent('Davi.CloseWindowList', null));
                 onClose?.();
                 setContent(undefined);
             }, $2ec58e0e10234435$var$springLeaveDuration);
@@ -7756,7 +7711,6 @@ const $2ec58e0e10234435$var$List = ({ activity: activity, onClose: onClose })=>{
     (0, $bZRJW$useEffect)(()=>{
         handleOpen();
         return ()=>{
-            console.log('in return');
             setListStatus((0, $4ucVo.ListStatus).closed);
             timerRef?.current && clearTimeout(timerRef.current);
         };
@@ -15295,17 +15249,17 @@ var $2ebe7b2fda999dc7$export$2e2bcd8739ae039 = $2ebe7b2fda999dc7$var$Grid;
 
 
 parcelRegister("6EXzm", function(module, exports) {
-module.exports = import("./HistoryList.5fd6aa12.js").then(()=>parcelRequire('2IZpO'));
+module.exports = import("./HistoryList.03a56119.js").then(()=>parcelRequire('2IZpO'));
 
 });
 
 parcelRegister("rAdI8", function(module, exports) {
-module.exports = import("./LanguageChoice.61e36c1d.js").then(()=>parcelRequire('4HBCW'));
+module.exports = import("./LanguageChoice.623ee802.js").then(()=>parcelRequire('4HBCW'));
 
 });
 
 parcelRegister("8y5Zs", function(module, exports) {
-module.exports = import("./AttachmentDetail.c6c297df.js").then(()=>parcelRequire('8QAGm'));
+module.exports = import("./AttachmentDetail.fdcd1737.js").then(()=>parcelRequire('8QAGm'));
 
 });
 
@@ -15315,17 +15269,17 @@ module.exports = import("./FullScreenImage.1fe27198.js").then(()=>parcelRequire(
 });
 
 parcelRegister("5Lxsr", function(module, exports) {
-module.exports = import("./Weather.fb22fba3.js").then(()=>parcelRequire('2pbjN'));
+module.exports = import("./Weather.cf58823d.js").then(()=>parcelRequire('2pbjN'));
 
 });
 
 parcelRegister("4tkZ7", function(module, exports) {
-module.exports = import("./CustomView.90d2a13d.js").then(()=>parcelRequire('5s7df'));
+module.exports = import("./CustomView.c24a0e74.js").then(()=>parcelRequire('5s7df'));
 
 });
 
 parcelRegister("i6zhG", function(module, exports) {
-module.exports = import("./Emergency.a21f837c.js").then(()=>parcelRequire('4zoun'));
+module.exports = import("./Emergency.0cf005ce.js").then(()=>parcelRequire('4zoun'));
 
 });
 
@@ -17104,6 +17058,11 @@ const $64c0a3f23b72e5d5$var$MicrophoneTextBubble = ({ showLoader: showLoader })=
     const [text, setText] = (0, $bZRJW$useState)();
     const [textUndefined, setTextUndefined] = (0, $bZRJW$useState)(false);
     const timerRef = (0, $bZRJW$useRef)(null);
+    (0, $bZRJW$useEffect)(()=>{
+        return ()=>{
+            timerRef.current && clearTimeout(timerRef.current);
+        };
+    }, []);
     (0, $bZRJW$useEffect)(()=>{
         setTextUndefined(speaking || showLoader || !botAnswerEnded || currentSubView !== (0, $4ucVo.CurrentSubView).none || dashboardOpened || retorikEvent === (0, $4ucVo.RetorikEvent).DetailViewOpen || listStatus === (0, $4ucVo.ListStatus).opened);
     }, [
@@ -17133,8 +17092,12 @@ const $64c0a3f23b72e5d5$var$MicrophoneTextBubble = ({ showLoader: showLoader })=
                 setText(isMobile || isLandscape && lastRecognitionInterim ? undefined : translation.microphone.listening);
                 break;
             case (0, $4ucVo.RecognitionState).Closed:
-                if (useContinuousRecognition) setText(textUndefined ? undefined : `<p>${translation.microphone.trigger}${isMobile ? ' ' : '<br />'}<strong>\xab ${agentData?.name} \xbb</strong></p>`);
-                else setText(textUndefined ? undefined : `<p>${translation.microphone.triggerwithoutname}</p>`);
+                let text = undefined;
+                if (!textUndefined) text = useContinuousRecognition ? `<p>${translation.microphone.trigger}${isMobile ? ' ' : '<br />'}<strong>\xab ${agentData?.name} \xbb</strong></p>` : `<p>${translation.microphone.triggerwithoutname}</p>`;
+                // Show the button only 1.5s after, to prevents it from appearing à fraction of second between several texts
+                timerRef.current = setTimeout(()=>{
+                    setText(text);
+                }, 1500);
                 break;
             case (0, $4ucVo.RecognitionState).Initializing:
             case (0, $4ucVo.RecognitionState).Closing:
@@ -18774,7 +18737,7 @@ var $af2bd3eba7cc813c$export$2e2bcd8739ae039 = $af2bd3eba7cc813c$var$DashboardIt
 
 
 parcelRegister("lNCSW", function(module, exports) {
-module.exports = import("./NewsContainer.67f04b19.js").then(()=>parcelRequire('dUXW6'));
+module.exports = import("./NewsContainer.05bb1b19.js").then(()=>parcelRequire('dUXW6'));
 
 });
 
@@ -22427,7 +22390,6 @@ const $74b038ce1f8fa939$export$6108075486421829 = ()=>{
 
 
 
-
 var $1x02c = parcelRequire("1x02c");
 
 var $aNpqK = parcelRequire("aNpqK");
@@ -22436,6 +22398,8 @@ var $9GPj7 = parcelRequire("9GPj7");
 
 var $cT90l = parcelRequire("cT90l");
 
+var $4ucVo = parcelRequire("4ucVo");
+
 var $iT1WI = parcelRequire("iT1WI");
 const $4551c1f557108aed$var$TelemetryContextDefaultValues = {
     enabled: true,
@@ -22449,19 +22413,41 @@ function $4551c1f557108aed$export$a15d15518a3ec33d() {
 }
 function $4551c1f557108aed$export$bb3ea6dd2428edb6({ enabled: enabled, children: children }) {
     const userId = (0, $aNpqK.useDirectlineStore)((state)=>state.userId);
+    const conversationId = (0, $9GPj7.useActivityStore)((state)=>state.conversationId);
     const addressData = (0, $1x02c.useRetorikStore)((state)=>state.addressData);
     const lastActivity = (0, $9GPj7.useActivityStore)((state)=>state.lastActivity);
     const botStreamingActivities = (0, $9GPj7.useActivityStore)((state)=>state.botStreamingActivities);
-    const [lastUserActivityData, setLastUserActivityData] = (0, $bZRJW$useState)();
+    const lastUserActivityRef = (0, $bZRJW$useRef)(null);
     const tracer = (0, $bZRJW$useMemo)(()=>{
-        if (enabled && userId) {
+        if (enabled && userId && conversationId) {
             const exporter = new (0, $bZRJW$OTLPTraceExporter)({
                 url: (0, $cT90l.telemetryAddress),
                 headers: {},
                 concurrencyLimit: 1
             });
+            let serviceNamespace = '';
+            switch(addressData.prefix){
+                case 'dev':
+                    serviceNamespace = 'retorik-dev';
+                    break;
+                case 'staging':
+                case 'preview':
+                    serviceNamespace = 'retorik-preview';
+                    break;
+                case 'experimental':
+                    serviceNamespace = 'retorik-experimental';
+                    break;
+                default:
+                    serviceNamespace = 'retorik-prod';
+                    break;
+            }
+            // Create resource with custom parameters used globally in uptrace
             const resource = (0, $bZRJW$defaultResource)().merge((0, $bZRJW$resourceFromAttributes)({
-                [(0, $bZRJW$ATTR_SERVICE_NAME)]: 'retorik-framework'
+                [(0, $bZRJW$ATTR_SERVICE_NAME)]: 'retorik-framework',
+                ['davi_retorik_activity_conversation_id']: conversationId,
+                ['service_namespace']: serviceNamespace,
+                ['retorik_framework_version']: (0, $iT1WI.version),
+                ['user_id']: userId
             }));
             const processor = new (0, $bZRJW$BatchSpanProcessor)(exporter);
             const provider = new (0, $bZRJW$WebTracerProvider)({
@@ -22474,28 +22460,8 @@ function $4551c1f557108aed$export$bb3ea6dd2428edb6({ enabled: enabled, children:
             // Add common attributes to each span for better tracing
             (0, $bZRJW$registerInstrumentations)({
                 instrumentations: [
-                    new (0, $bZRJW$FetchInstrumentation)({
-                        applyCustomAttributesOnSpan: (span)=>span.setAttributes({
-                                ...getCommonAttributes(),
-                                user_id: userId
-                            })
-                    }),
-                    new (0, $bZRJW$DocumentLoadInstrumentation)({
-                        applyCustomAttributesOnSpan: {
-                            documentLoad: (span)=>span.setAttributes({
-                                    ...getCommonAttributes(),
-                                    user_id: userId
-                                }),
-                            documentFetch: (span)=>span.setAttributes({
-                                    ...getCommonAttributes(),
-                                    user_id: userId
-                                }),
-                            resourceFetch: (span)=>span.setAttributes({
-                                    ...getCommonAttributes(),
-                                    user_id: userId
-                                })
-                        }
-                    })
+                    new (0, $bZRJW$FetchInstrumentation)(),
+                    new (0, $bZRJW$DocumentLoadInstrumentation)()
                 ]
             });
             return (0, $bZRJW$opentelemetryapi).trace.getTracer('retorik-framework');
@@ -22503,7 +22469,10 @@ function $4551c1f557108aed$export$bb3ea6dd2428edb6({ enabled: enabled, children:
         return undefined;
     }, [
         enabled,
-        userId
+        userId,
+        conversationId,
+        addressData,
+        (0, $iT1WI.version)
     ]);
     (0, $bZRJW$useEffect)(()=>{
         if (lastActivity) lastActivity.from.role === 'user' ? handleUserActivity(lastActivity) : handleBotActivity(lastActivity);
@@ -22511,48 +22480,45 @@ function $4551c1f557108aed$export$bb3ea6dd2428edb6({ enabled: enabled, children:
         lastActivity
     ]);
     (0, $bZRJW$useEffect)(()=>{
-        if (lastUserActivityData) {
-            const temp = botStreamingActivities.get(lastUserActivityData.id);
+        if (lastUserActivityRef.current) {
+            const temp = botStreamingActivities.get(lastUserActivityRef.current.id);
             temp?.length === 1 && handleBotActivity(temp[0]);
         }
     }, [
-        botStreamingActivities,
-        lastUserActivityData
+        botStreamingActivities
     ]);
-    const getCommonAttributes = ()=>{
-        let tenant = '';
-        if (addressData.tenant) tenant = addressData.prefix ? `${addressData.tenant} (${addressData.prefix})` : addressData.tenant;
-        return {
-            tenant: tenant,
-            current_URL: window.location.toString(),
-            os: `${0, $bZRJW$osName} ${0, $bZRJW$osVersion}`,
-            browser: `${0, $bZRJW$browserName} ${0, $bZRJW$browserVersion}`,
-            retorik_framework_version: (0, $iT1WI.version)
-        };
-    };
     const handleUserActivity = (activity)=>{
         // Only handle message activites and event activities waiting for an answer, nothing for typing ones
-        if (activity.type === 'message' || activity.type === 'event' && !(0, $cT90l.nonResponseInducingEvents).find((eventName)=>activity.name?.toLowerCase().includes(eventName))) setLastUserActivityData({
+        if (activity.type === 'message' || activity.type === 'event' && !(0, $cT90l.nonResponseInducingEvents).find((eventName)=>activity.name?.toLowerCase().includes(eventName))) lastUserActivityRef.current = {
             id: activity.id,
             time: Date.now()
-        });
+        };
     };
     const handleBotActivity = (activity)=>{
         // Do nothing for bring-up messages and non-streaming events
-        if (lastUserActivityData && (activity.type === 'message' || activity.name?.toLocaleLowerCase() === 'davi.streammessageactivity') && activity.label?.toLowerCase() !== 'davi.bringupmessage' && activity.replyToId === lastUserActivityData.id) {
-            sendTrace(lastUserActivityData.time);
-            setLastUserActivityData(undefined);
+        if (lastUserActivityRef.current && (activity.type === 'message' || activity.name?.toLocaleLowerCase() === 'davi.streammessageactivity') && activity.label?.toLowerCase() !== 'davi.bringupmessage' && activity.replyToId === lastUserActivityRef.current.id) {
+            sendTrace((0, $4ucVo.TraceType).message, lastUserActivityRef.current.time);
+            lastUserActivityRef.current = null;
         }
     };
-    const sendTrace = (beginningTimer)=>{
-        if (tracer) {
-            const span = tracer.startSpan('directlineMessage', {
-                startTime: beginningTimer
-            });
+    const sendTrace = (type, data)=>{
+        if (tracer && type) {
+            const parameters = {};
+            switch(type){
+                case (0, $4ucVo.TraceType).message:
+                    parameters.startTime = data;
+                    break;
+                case (0, $4ucVo.TraceType).utteranceStart:
+                    parameters.text = data;
+                    break;
+                case (0, $4ucVo.TraceType).utteranceEnd:
+                    parameters.text = data;
+                    break;
+            }
+            const span = tracer.startSpan(type, parameters);
             span.setStatus({
                 code: (0, $bZRJW$SpanStatusCode).OK
             });
-            span.setAttributes(getCommonAttributes());
             span.end();
         }
     };
@@ -22564,24 +22530,21 @@ function $4551c1f557108aed$export$bb3ea6dd2428edb6({ enabled: enabled, children:
                 code: (0, $bZRJW$SpanStatusCode).ERROR,
                 message: `${error.message}`
             });
-            span.setAttributes(getCommonAttributes());
             span.end();
         }
     };
     const value = (0, $bZRJW$useMemo)(()=>({
             enabled: enabled,
             tracer: tracer,
-            sendErrorTrace: sendErrorTrace,
-            sendTrace: sendTrace
+            sendTrace: sendTrace,
+            sendErrorTrace: sendErrorTrace
         }), [
         enabled,
         tracer
     ]);
-    return /*#__PURE__*/ (0, $bZRJW$jsx)((0, $bZRJW$react).Fragment, {
-        children: /*#__PURE__*/ (0, $bZRJW$jsx)($4551c1f557108aed$export$7b6b7bc4acb29126.Provider, {
-            value: value,
-            children: children
-        })
+    return /*#__PURE__*/ (0, $bZRJW$jsx)($4551c1f557108aed$export$7b6b7bc4acb29126.Provider, {
+        value: value,
+        children: children
     });
 }
 
@@ -23948,11 +23911,19 @@ var $f39384d6255fe275$export$2e2bcd8739ae039 = $f39384d6255fe275$var$BotResponse
 
 
 
+
+var $1x02c = parcelRequire("1x02c");
 parcelRequire("SZcIF");
 var $jwPbX = parcelRequire("jwPbX");
 const $3ff23eb3a82e4cf7$var$RetorikLogo = ()=>{
-    return /*#__PURE__*/ (0, $bZRJW$jsx)("a", {
-        href: "https://davi.ai/retorik",
+    const isUsedOnBorne = (0, $1x02c.useRetorikStore)((state)=>state.configuration.isUsedOnBorne);
+    return isUsedOnBorne ? /*#__PURE__*/ (0, $bZRJW$jsx)("div", {
+        className: "rf-hidden large:rf-block rf-relative rf-z-[1] ltr:rf-col-start-1 rtl:rf-col-end-1 rf-col-span-full rf-row-start-12 rf-row-span-1 ltr:rf-self-end rtl:rf-self-start rf-justify-self-start",
+        children: /*#__PURE__*/ (0, $bZRJW$jsx)((0, $jwPbX.default), {
+            className: "ltr:rf-ml-4 rtl:rf-mr-4 rf-mb-4 rf-h-14"
+        })
+    }) : /*#__PURE__*/ (0, $bZRJW$jsx)("a", {
+        href: "https://davi.ai",
         title: "Retorik by Davi",
         target: "_blank",
         rel: "noreferrer",
@@ -24220,8 +24191,6 @@ var $1x02c = parcelRequire("1x02c");
 
 var $9GPj7 = parcelRequire("9GPj7");
 
-var $i1rfm = parcelRequire("i1rfm");
-
 
 var $dklvz = parcelRequire("dklvz");
 
@@ -24337,8 +24306,6 @@ const $ec519e4becb3ec60$var$DisplayStandard = ({ currentQuestionId: currentQuest
     const endedActivities = (0, $9GPj7.useActivityStore)((state)=>state.endedActivities);
     const watermark = (0, $9GPj7.useActivityStore)((state)=>state.watermark);
     const forceMobileView = (0, $1x02c.useRetorikStore)((state)=>state.configuration.forceMobileView);
-    const cancel = (0, $i1rfm.useSpeechStore)((state)=>state.cancel);
-    const addEndedActivity = (0, $9GPj7.useActivityStore)((state)=>state.actions.addEndedActivity);
     const [displayData, setDisplayData] = (0, $bZRJW$useState)([]);
     const [currentDisplayDataIndex, setCurrentDisplayDataIndex] = (0, $bZRJW$useState)(0);
     const [ended, setEnded] = (0, $bZRJW$useState)(!activities.length || endedActivities.includes(activities[activities.length - 1]?.id));
@@ -24353,7 +24320,7 @@ const $ec519e4becb3ec60$var$DisplayStandard = ({ currentQuestionId: currentQuest
     ]);
     (0, $bZRJW$useEffect)(()=>{
         if (isWaitingForResponse) {
-            // Create temporary activity with the id of the nexxt one to prevent re-renders, in order to display waiting dots
+            // Create temporary activity with the id of the next one to prevent re-renders, in order to display waiting dots
             const nextActivityId = `${currentQuestionId.slice(0, currentQuestionId.length - watermark.toString().length)}${watermark.toString()}`;
             const tempActivity = {
                 id: nextActivityId,
@@ -24368,36 +24335,14 @@ const $ec519e4becb3ec60$var$DisplayStandard = ({ currentQuestionId: currentQuest
                     activity: tempActivity,
                     type: (0, $4ucVo.DisplayDataTypes).text,
                     isWaitingDots: true,
-                    canBeEnded: true
+                    canBeEnded: true,
+                    isEnded: false
                 }
             ]);
         }
     }, [
         isWaitingForResponse
     ]);
-    (0, $bZRJW$useEffect)(()=>{
-        if (cancel) {
-            activities.forEach((activity)=>{
-                addEndedActivity(activity.id);
-            });
-            displayData.forEach((data)=>{
-                addEndedActivity(data.activity.id);
-            });
-        }
-    }, [
-        cancel
-    ]);
-    (0, $bZRJW$useEffect)(()=>{
-        // End all current activities on component unmount
-        return ()=>{
-            activitiesRef.current.forEach((activity)=>{
-                addEndedActivity(activity.id);
-            });
-            displayDataRef.current.forEach((data)=>{
-                addEndedActivity(data.activity.id);
-            });
-        };
-    }, []);
     (0, $bZRJW$useEffect)(()=>{
         activitiesRef.current = [
             ...activities
@@ -24409,7 +24354,7 @@ const $ec519e4becb3ec60$var$DisplayStandard = ({ currentQuestionId: currentQuest
             let streamingTexts = [];
             activities.forEach((activity, index)=>{
                 let splitTextDataToAdd = [];
-                // Check the attachments, special case if this is the message activity after streaming : show attachments if the first streaming activcity didn't have any
+                // Check the attachments, special case if this is the message activity after streaming : show attachments if the first streaming activity didn't have any
                 let attachments = [];
                 if (activity.attachments?.length) {
                     if (activity.name?.toLowerCase() === 'davi.streammessageactivity') {
@@ -24418,14 +24363,16 @@ const $ec519e4becb3ec60$var$DisplayStandard = ({ currentQuestionId: currentQuest
                             {
                                 type: (0, $4ucVo.DisplayDataTypes).attachment,
                                 activity: activity,
-                                canBeEnded: true
+                                canBeEnded: true,
+                                isEnded: true
                             }
                         ];
                     } else if (!(activity.value?.streamingCount && streamingActivityHasAttachment) && !(0, $161354704eee0a17$export$7c55936a30618336)(activity)) attachments = [
                         {
                             type: (0, $4ucVo.DisplayDataTypes).attachment,
                             activity: activity,
-                            canBeEnded: true
+                            canBeEnded: true,
+                            isEnded: true
                         }
                     ];
                 }
@@ -24443,14 +24390,20 @@ const $ec519e4becb3ec60$var$DisplayStandard = ({ currentQuestionId: currentQuest
                                     ...currentFirstStreamingActivity,
                                     htmlText: (0, $dklvz.processMarkdownAndSpeechMarkdown)(streamingTexts.join(''), false).htmlText
                                 },
-                                canBeEnded: false
+                                canBeEnded: false,
+                                isEnded: false
                             }
                         ];
                     }
                 } else if (activity.value?.streamingCount) {
                     if (tempDisplayData.length) {
                         const lastStreamingIndex = tempDisplayData.findLastIndex((d)=>d.type === (0, $4ucVo.DisplayDataTypes).text);
-                        lastStreamingIndex !== -1 && (tempDisplayData[lastStreamingIndex].canBeEnded = true);
+                        if (lastStreamingIndex !== -1) {
+                            // Set canBeEnded for the previous streaming
+                            tempDisplayData[lastStreamingIndex].canBeEnded = true;
+                            // Set previous streaming ended if this activity is ended in speech synthesis
+                            tempDisplayData[lastStreamingIndex].isEnded = endedActivities.includes(activity.id);
+                        }
                     }
                     // Reset streaming data if the message containing all streaming data is received
                     currentFirstStreamingActivity = undefined;
@@ -24465,7 +24418,8 @@ const $ec519e4becb3ec60$var$DisplayStandard = ({ currentQuestionId: currentQuest
                             {
                                 type: (0, $4ucVo.DisplayDataTypes).text,
                                 activity: activity,
-                                canBeEnded: true
+                                canBeEnded: true,
+                                isEnded: endedActivities.includes(activity.id)
                             }
                         ];
                     }
@@ -24487,7 +24441,8 @@ const $ec519e4becb3ec60$var$DisplayStandard = ({ currentQuestionId: currentQuest
         }
     }, [
         currentQuestionId,
-        activities.length
+        activities.length,
+        endedActivities
     ]);
     (0, $bZRJW$useEffect)(()=>{
         displayDataRef.current = [
@@ -24510,7 +24465,6 @@ const $ec519e4becb3ec60$var$DisplayStandard = ({ currentQuestionId: currentQuest
         ended
     ]);
     const handleEnded = ()=>{
-        addEndedActivity(displayData[currentDisplayDataIndex]?.activity?.id);
         setCurrentDisplayDataIndex((current)=>current + 1);
         !ended && triggerScroll();
     };
@@ -24531,7 +24485,7 @@ const $ec519e4becb3ec60$var$DisplayStandard = ({ currentQuestionId: currentQuest
                     triggerScroll: triggerScroll,
                     onEnded: handleEnded,
                     canBeEnded: data.canBeEnded,
-                    isEnded: data.canBeEnded && endedActivities.includes(data.activity.id),
+                    isEnded: data.isEnded,
                     isWaitingDots: data.isWaitingDots
                 }, `${data.activity.id}-${key}`);
             }
@@ -25716,8 +25670,7 @@ const $52152cf5bb15b9c1$var$WarningBeforeNewsView = ()=>{
     const sendEvent = (0, $aNpqK.useDirectlineStore)((state)=>state.actions.sendEvent);
     const [waiting, setWaiting] = (0, $bZRJW$useState)(true);
     const handleClick = (goHome)=>{
-        sendEvent('Davi.CloseWindow', null);
-        sendEvent('Davi.CloseWindowNewsSoundActivated', null);
+        sendEvent('Davi.CloseWindow', null, ()=>sendEvent('Davi.CloseWindowNewsSoundActivated', null));
         goHome ? setRoute((0, $4ucVo.Routes).Home) : setWaiting(false);
     };
     return waiting ? /*#__PURE__*/ (0, $bZRJW$jsxs)("div", {
@@ -26085,29 +26038,6 @@ var $1x02c = parcelRequire("1x02c");
 var $aNpqK = parcelRequire("aNpqK");
 
 var $4ucVo = parcelRequire("4ucVo");
-/* Return codes:
-  0 => do nothing
-  1 => add to queue
-  2 => stop current activity + change to the one tested
-*/ const $98181c365642ebbf$var$checkLastbotActivity = (lastbotActivity, currentPlaying, currentReplyToId, queuedActivities, endedActivities)=>{
-    // Check if the activity is the one currently being played
-    if (lastbotActivity.id === currentPlaying.id) return 0;
-    // Check if the activity has already been ended
-    if (endedActivities.includes(lastbotActivity.id)) return 0;
-    // Check if the activity has the same replyToId than the one currently being played
-    if (lastbotActivity.replyToId === currentReplyToId) {
-        // Check if the activity is already in the queue
-        let count = 0;
-        if (queuedActivities.length > 0) queuedActivities.forEach((activity)=>{
-            if (activity.id === lastbotActivity.id) count++;
-        });
-        if (count === 0) return 1;
-        else return 0;
-    } else return 2;
-};
-var $98181c365642ebbf$export$2e2bcd8739ae039 = $98181c365642ebbf$var$checkLastbotActivity;
-
-
 
 
 
@@ -26699,7 +26629,8 @@ const $637384b103093c58$var$RetorikSpeech = ({ ponyfill: ponyfill, onEnd: onEnd,
     const microphoneCloseAudioRef = (0, $bZRJW$useRef)(null);
     const [DBReady, setDBReady] = (0, $bZRJW$useState)(false);
     const [playingBlob, setPlayingBlob] = (0, $bZRJW$useState)(false);
-    const [nextUtteranceData, setNextUtteranceData] = (0, $bZRJW$useState)(null);
+    const nextUtteranceDataRef = (0, $bZRJW$useRef)(null);
+    const nextUtteranceTextRef = (0, $bZRJW$useRef)(null);
     const nextUtteranceBoundariesRef = (0, $bZRJW$useRef)([]);
     const nextUtteranceVisemesRef = (0, $bZRJW$useRef)([]);
     const emptyTextUtteranceRef = (0, $bZRJW$useRef)(null);
@@ -26713,7 +26644,7 @@ const $637384b103093c58$var$RetorikSpeech = ({ ponyfill: ponyfill, onEnd: onEnd,
     const stopCurrentPlaying = ()=>{
         if (appAvailable || loaderClosed) {
             // Cancel synthesis if using synthesizer
-            if (!playingBlob) ponyfill && ponyfill.speechSynthesis.cancel();
+            if (!playingBlob) ponyfill.speechSynthesis.cancel();
             resetNextUtteranceData();
             if (audioRef.current && !audioRef.current?.paused) {
                 audioRef.current.pause();
@@ -26723,7 +26654,7 @@ const $637384b103093c58$var$RetorikSpeech = ({ ponyfill: ponyfill, onEnd: onEnd,
     };
     const attachEvents = (tempUtterance, isMainUtterance)=>{
         tempUtterance.onerror = (event)=>{
-            isMainUtterance ? handleError(event) : setNextUtteranceData(null);
+            isMainUtterance ? handleError(event) : nextUtteranceDataRef.current = null;
         };
         tempUtterance.onsynthesiscompleted = ()=>{
             const endBoundary = {
@@ -26790,29 +26721,33 @@ const $637384b103093c58$var$RetorikSpeech = ({ ponyfill: ponyfill, onEnd: onEnd,
         return tempUtterance;
     };
     const processNextData = (data)=>{
-        setNextUtteranceData(data?.byteLength ? {
-            speechData: data,
-            boundaries: nextUtteranceBoundariesRef.current,
-            visemes: nextUtteranceVisemesRef.current
-        } : null);
+        nextUtteranceDataRef.current = data?.byteLength && nextUtteranceTextRef.current ? {
+            text: nextUtteranceTextRef.current,
+            data: {
+                speechData: data,
+                boundaries: nextUtteranceBoundariesRef.current,
+                visemes: nextUtteranceVisemesRef.current
+            }
+        } : null;
         // Reset boundary / viseme data
         resetNextUtteranceData(true);
     };
     const resetNextUtteranceData = (keepArrayBufferData)=>{
-        !keepArrayBufferData && setNextUtteranceData(null);
+        !keepArrayBufferData && (nextUtteranceDataRef.current = null);
+        nextUtteranceTextRef.current = null;
         nextUtteranceBoundariesRef.current = [];
         nextUtteranceVisemesRef.current = [];
     };
     (0, $bZRJW$useEffect)(()=>{
         if (utterance) {
             if (utterance.text) {
-                if (ponyfill && audioRef?.current) {
-                    if (nextUtteranceData) {
-                        boundaryRef.current = nextUtteranceData.boundaries;
-                        setBoundaryData(nextUtteranceData.boundaries);
-                        setVisemeData(nextUtteranceData.visemes);
-                        processData(nextUtteranceData.speechData, true);
-                    } else // Play utterance whether by asking for a speech synthesis, or by retrieving data fro indexeddb
+                if (audioRef?.current) {
+                    if (nextUtteranceDataRef.current?.text === utterance.text && nextUtteranceDataRef.current.data) {
+                        boundaryRef.current = nextUtteranceDataRef.current.data.boundaries;
+                        setBoundaryData(nextUtteranceDataRef.current.data.boundaries);
+                        setVisemeData(nextUtteranceDataRef.current.data.visemes);
+                        processData(nextUtteranceDataRef.current.data.speechData, true);
+                    } else // Play utterance whether by asking for a speech synthesis, or by retrieving data from indexedDB
                     playUtterance(attachEvents(utterance, true));
                 } else stopCurrentPlaying();
             } else handleEmptyTextUtterance();
@@ -26821,8 +26756,10 @@ const $637384b103093c58$var$RetorikSpeech = ({ ponyfill: ponyfill, onEnd: onEnd,
         utterance
     ]);
     (0, $bZRJW$useEffect)(()=>{
-        if (nextUtterance?.text && ponyfill) {
+        // If there are data in nextUtteranceTextRef, this means the previous synthesis data retrieval is not finished, so we don't begin a new one
+        if (nextUtterance?.text && !nextUtteranceTextRef.current) {
             const tempUtterance = attachEvents(nextUtterance);
+            nextUtteranceTextRef.current = nextUtterance.text;
             ponyfill.speechSynthesis.synthesizeAndGetArrayData(tempUtterance, processNextData);
         } else resetNextUtteranceData();
     }, [
@@ -26830,14 +26767,14 @@ const $637384b103093c58$var$RetorikSpeech = ({ ponyfill: ponyfill, onEnd: onEnd,
     ]);
     const playUtterance = async (utt)=>{
         if (DBReady && enableSpeechCaching !== false && utt) {
-            const dataFromIndexedDB = await $637384b103093c58$var$DBManager.getSpeechData(`${locale}.${voice?.name}.${utt.text.replace($637384b103093c58$var$tagsRemoverRegex, '').substring(0, 50)}`);
+            const dataFromIndexedDB = await $637384b103093c58$var$DBManager.getSpeechData(`${locale}.${voice?.name}.${utt.text.replace($637384b103093c58$var$tagsRemoverRegex, '')}`);
             if (dataFromIndexedDB) {
                 boundaryRef.current = dataFromIndexedDB.boundaries;
                 setBoundaryData(dataFromIndexedDB.boundaries);
                 setVisemeData(dataFromIndexedDB.visemes || []);
                 processData(dataFromIndexedDB.value, true);
-            } else ponyfill?.speechSynthesis.synthesizeAndGetArrayData(utt, processData);
-        } else ponyfill?.speechSynthesis.synthesizeAndGetArrayData(utt, processData);
+            } else ponyfill.speechSynthesis.synthesizeAndGetArrayData(utt, processData);
+        } else ponyfill.speechSynthesis.synthesizeAndGetArrayData(utt, processData);
     };
     const processData = (data, alreadyExistsInDB)=>{
         if (data?.byteLength) {
@@ -26847,7 +26784,7 @@ const $637384b103093c58$var$RetorikSpeech = ({ ponyfill: ponyfill, onEnd: onEnd,
                 type: 'audio/mp3'
             });
             enableSpeechCaching !== false && !alreadyExistsInDB && DBReady && boundaryRef?.current && utterance && $637384b103093c58$var$DBManager.addSpeechData({
-                id: `${locale}.${voice?.name}.${utterance.text.replace($637384b103093c58$var$tagsRemoverRegex, '').substring(0, 50)}`,
+                id: `${locale}.${voice?.name}.${utterance.text.replace($637384b103093c58$var$tagsRemoverRegex, '')}`,
                 value: data,
                 boundaries: boundaryRef.current,
                 visemes: visemeRef.current || []
@@ -26872,13 +26809,13 @@ const $637384b103093c58$var$RetorikSpeech = ({ ponyfill: ponyfill, onEnd: onEnd,
     };
     const handleEnd = ()=>{
         if (appAvailable || loaderClosed) {
-            onEnd && onEnd();
+            onEnd?.();
             resetData();
         } else setLoaderClosed(true);
     };
     const handleError = (error)=>{
-        console.log('Error : ', error);
-        onError && onError();
+        console.log('Retorik Framework > speech synthesis error ', error);
+        onError?.();
         resetData();
     };
     const handleEmptyTextUtterance = ()=>{
@@ -26893,7 +26830,7 @@ const $637384b103093c58$var$RetorikSpeech = ({ ponyfill: ponyfill, onEnd: onEnd,
    *  - play 1 second muted sound to prime audio output
    *  - MANDATORY FOR SAFARI IN VOCAL MODE
    */ const primeRetorikSpeech = ()=>{
-        if (ponyfill && audioRef.current) {
+        if (audioRef.current) {
             audioRef.current.play().catch((e)=>console.warn(e));
             speechRecognitionAudioRef?.current && speechRecognitionAudioRef.current.play().catch((e)=>console.warn(e));
             // Send animation start event to secure animation not playing on safari if permissions are not sufficient
@@ -26903,13 +26840,6 @@ const $637384b103093c58$var$RetorikSpeech = ({ ponyfill: ponyfill, onEnd: onEnd,
     /**
    * Play sound on speech recognition activation if it isn't disabled in configuration
    */ (0, $bZRJW$useEffect)(()=>{
-        // if (
-        //   !!speechRecognitionOptions?.enableActivationSound &&
-        //   activeRecognitionState === RecognitionState.Listening
-        // ) {
-        //   speechRecognitionAudioRef?.current &&
-        //     speechRecognitionAudioRef.current.play().catch((e) => console.warn(e))
-        // }
         if (useOldRemote) {
             if (!!speechRecognitionOptions?.enableActivationSound && activeRecognitionState === (0, $4ucVo.RecognitionState).Listening) speechRecognitionAudioRef?.current?.play().catch((e)=>console.warn(e));
         } else if (!!speechRecognitionOptions?.enableActivationSound) switch(activeRecognitionState){
@@ -26966,11 +26896,7 @@ var $637384b103093c58$export$2e2bcd8739ae039 = $637384b103093c58$var$RetorikSpee
 
 const $0b8e5d756ffed1ac$var$SynthesisManager = ({ ponyfill: ponyfill, isRetorikNews: isRetorikNews })=>{
     const cancel = (0, $i1rfm.useSpeechStore)((state)=>state.cancel);
-    const streamingReplyToId = (0, $i1rfm.useSpeechStore)((state)=>state.streamingReplyToId);
     const streamingQueue = (0, $i1rfm.useSpeechStore)((state)=>state.streamingQueue);
-    const currentPlaying = (0, $i1rfm.useSpeechStore)((state)=>state.currentPlaying);
-    const currentReplyToId = (0, $i1rfm.useSpeechStore)((state)=>state.currentReplyToId);
-    const endedActivities = (0, $i1rfm.useSpeechStore)((state)=>state.endedActivities);
     const voice = (0, $i1rfm.useSpeechStore)((state)=>state.voice);
     const customVoice = (0, $i1rfm.useSpeechStore)((state)=>state.customVoice);
     const activeRecognitionState = (0, $i1rfm.useSpeechStore)((state)=>state.activeRecognitionState);
@@ -26983,24 +26909,17 @@ const $0b8e5d756ffed1ac$var$SynthesisManager = ({ ponyfill: ponyfill, isRetorikN
     const appAvailable = (0, $1x02c.useRetorikStore)((state)=>state.appAvailable);
     const preventExpectedInputHint = (0, $1x02c.useRetorikStore)((state)=>state.configuration.preventExpectedInputHint);
     const speechSynthesisOptions = (0, $1x02c.useRetorikStore)((state)=>state.configuration.speechSynthesisOptions);
-    const currentNewsActivity = (0, $j67YK.useUtilsStore)((state)=>state.currentNewsActivity);
-    const lastBotActivity = (0, $9GPj7.useActivityStore)((state)=>state.lastBotMessageActivity);
     const checkReplacementLocale = (0, $2fuDN.useLocaleStore)((state)=>state.actions.checkReplacementLocale);
     const setRetorikNewsEnded = (0, $j67YK.useUtilsStore)((state)=>state.actions.setRetorikNewsEnded);
-    const { resetCancelCurrentUtterance: resetCancelCurrentUtterance, setSpeaking: setSpeaking, setCurrentPlaying: setCurrentPlaying, setCurrentReplyToId: setCurrentReplyToId, setEndedActivities: setEndedActivities, setBoundaryData: setBoundaryData, removeFirstFromStreamingQueue: removeFirstFromStreamingQueue, setCurrentStreaming: setCurrentStreaming, killCurrentStreaming: killCurrentStreaming, askPermission: askPermission, toggleMicrophone: toggleMicrophone } = (0, $i1rfm.useSpeechStore)((state)=>state.actions);
+    const { setCurrentOrLastPlayedActivity: setCurrentOrLastPlayedActivity, resetCancelCurrentUtterance: resetCancelCurrentUtterance, setSpeaking: setSpeaking, setBoundaryData: setBoundaryData, removeFirstFromStreamingQueue: removeFirstFromStreamingQueue, killCurrentStreaming: killCurrentStreaming, askPermission: askPermission, toggleMicrophone: toggleMicrophone } = (0, $i1rfm.useSpeechStore)((state)=>state.actions);
     const addEndedActivity = (0, $9GPj7.useActivityStore)((state)=>state.actions.addEndedActivity);
     const dispatchMarkActivity = (0, $aNpqK.useDirectlineStore)((state)=>state.actions.dispatchMarkActivity);
     const [utterance, setUtterance] = (0, $bZRJW$useState)(null);
     const [nextUtterance, setNextUtterance] = (0, $bZRJW$useState)(null);
-    const cancelRef = (0, $bZRJW$useRef)(false);
-    const isSpeaking = (0, $bZRJW$useRef)(false);
     const isNewsViewRef = (0, $bZRJW$useRef)(!!isRetorikNews);
     const lastListTextPlayedRef = (0, $bZRJW$useRef)('');
-    const queuedActivitiesRef = (0, $bZRJW$useRef)([]);
+    const streamingQueueRef = (0, $bZRJW$useRef)([]);
     const currentActivityRef = (0, $bZRJW$useRef)(null);
-    const currentPlayingRef = (0, $bZRJW$useRef)(null);
-    const tempCurrentStreamingRef = (0, $bZRJW$useRef)(null);
-    const streamingRelatedMessageRef = (0, $bZRJW$useRef)(null);
     /**
    * Check activity locale in case of voice change during the speech, to keep the language defined in activity
    * instead of switching languages between answers that are written in the same language
@@ -27027,17 +26946,20 @@ const $0b8e5d756ffed1ac$var$SynthesisManager = ({ ponyfill: ponyfill, isRetorikN
         return (0, $66dccbb634d6ce27$export$f969af62bba9a48b)(params, speechSynthesisOptions?.sayAs);
     };
     const resetData = ()=>{
-        queuedActivitiesRef.current = [];
-        tempCurrentStreamingRef.current = null;
-        streamingRelatedMessageRef.current = null;
-        currentPlayingRef.current = null;
-        isSpeaking.current = false;
+        // Set all activities curretnly in the queue as ended
+        streamingQueueRef.current?.forEach((activity)=>{
+            addEndedActivity(activity.id);
+        });
+        streamingQueueRef.current = [];
+        killCurrentStreaming();
+        currentActivityRef.current = null;
         setUtterance(null);
         setNextUtterance(null);
         resetCancelCurrentUtterance();
+        setSpeaking(false);
+        setBoundaryData([]);
     };
-    const checkReplacementLocaleAndGetUtterance = (activity, checkReplacement = true, setCurrent = true)=>{
-        setCurrent && (currentActivityRef.current = activity);
+    const checkReplacementLocaleAndGetUtterance = (activity, checkReplacement = true)=>{
         const replacementLocale = checkReplacement ? checkReplacementLocale(activity.locale || locale) : locale;
         const params = {
             activity: activity,
@@ -27046,172 +26968,39 @@ const $0b8e5d756ffed1ac$var$SynthesisManager = ({ ponyfill: ponyfill, isRetorikN
         };
         return checkActivityAndCreateUtterance(params);
     };
-    const checkDictateState = ()=>{
+    /**
+   * Check if the microphone can be opened automatically
+   */ const checkDictateState = ()=>{
         if (!preventExpectedInputHint && mode === (0, $4ucVo.Mode).vocal && activeRecognitionState === (0, $4ucVo.RecognitionState).Closed) {
             if (!isMicrophoneAllowed) askPermission();
             else toggleMicrophone(true);
         }
     };
-    (0, $bZRJW$useEffect)(()=>{
-        if (isNewsViewRef.current) {
-            if (currentNewsActivity) {
-                setUtterance(checkReplacementLocaleAndGetUtterance(currentNewsActivity));
-                isSpeaking.current = true;
-            } else {
-                setUtterance(null);
-                isSpeaking.current = false;
-            }
-        }
-    }, [
-        currentNewsActivity,
-        ponyfill
-    ]);
     /**
-   * On ViewContext's route state change :
-   *  - when we toggle from a view to another, we reset the data related to speech
+   * On route change, reset all data and check if we are on the news view
    */ (0, $bZRJW$useEffect)(()=>{
-        setSpeaking(false);
-        setBoundaryData([]);
-        const ended = [
-            ...endedActivities
-        ];
-        if (currentPlaying) {
-            // Add played activity id to context's endedActivities
-            ended.length > 10 && ended.splice(0, 1);
-            if (currentPlaying.id) {
-                ended.push(currentPlaying.id);
-                addEndedActivity(currentPlaying.id);
-            }
-            setEndedActivities(ended);
-        }
-        setCurrentPlaying(undefined);
         resetData();
         if (!isRetorikNews) isNewsViewRef.current = route === (0, $4ucVo.Routes).News;
     }, [
         route
     ]);
     /**
-   * On RetorikContext's appAvailable state change :
-   *  - appAvailable is set to true after the user interacted with the loader and every needed element is loaded
-   *  - no utterance is created while appAvailable isn't true
-   *  - if during the waiting time, some activities were queued, when appAvailable comes to true, let's begin creating the utterances and playing them
-   */ (0, $bZRJW$useEffect)(()=>{
-        if (appAvailable && queuedActivitiesRef.current?.length) {
-            setUtterance(checkReplacementLocaleAndGetUtterance(queuedActivitiesRef.current[0]));
-            queuedActivitiesRef.current.splice(0, 1);
-            isSpeaking.current = true;
-        }
-    }, [
-        appAvailable
-    ]);
-    /**
-   * On speechCancelStore's cancel state change :
-   *  - if there is currently no utterance being played, reset cancel state to false
-   *  - if an utterance is being played, set it to null to stop playing and prevent data in queue from being played
-   *  - setting an utterance to null will trigger the handleUtteranceEnded method automatically
+   * On cancel call, reset all data and kill current streaming
    */ (0, $bZRJW$useEffect)(()=>{
-        cancelRef.current = cancel;
-        if (cancel) {
-            utterance ? setUtterance(null) : resetCancelCurrentUtterance();
-            isSpeaking.current = false;
-            setNextUtterance(null);
-            killCurrentStreaming();
-        }
+        cancel && resetData();
     }, [
         cancel
     ]);
     /**
-   *  - check if the ponyfill is created and the voices loaded
-   *  - if the activity doesn't have a replyToId value, put it in the queue (used for reminder process)
-   *  - if the app is not available yet, put the activity in the queue if it is not yet inside
-   *  - NB: an activity can be received once from the directline, but can be found several times in the activities in the botframework
-   *  this is because it is processed multiple times if there is something to speak (channelDate empty, then channelData with {speak: true})
-   *  - if an utterance is being played, process the new one (do nothing / put it in the queue / stop the current one and play the new one)
-   *  - if an utterance has to be created, create it and set the utterance state
+   * Play external speech immediately but don't add it to the history
    */ (0, $bZRJW$useEffect)(()=>{
-        if (voice && lastBotActivity?.id) {
-            let createNewUtterance = false;
-            if (!lastBotActivity.replyToId) {
-                if (isNewsViewRef.current) ;
-                else if (currentPlaying || queuedActivitiesRef.current?.length) queuedActivitiesRef.current = [
-                    ...queuedActivitiesRef.current,
-                    lastBotActivity
-                ];
-                else if (endedActivities.length === 0 || endedActivities[endedActivities.length - 1] !== lastBotActivity.id) createNewUtterance = true;
-            } else if (lastBotActivity.replyToId === streamingReplyToId) {
-                if (lastBotActivity.value?.streamingId) {
-                    setCurrentPlaying(lastBotActivity);
-                    currentPlayingRef.current = lastBotActivity;
-                    // Keep the message related to playing streaming activities to deal with when streaming is ended
-                    streamingRelatedMessageRef.current = lastBotActivity;
-                } else queuedActivitiesRef.current = [
-                    ...queuedActivitiesRef.current,
-                    lastBotActivity
-                ];
-            } else if (!appAvailable) {
-                if (!currentReplyToId) {
-                    setCurrentReplyToId(lastBotActivity.replyToId);
-                    queuedActivitiesRef.current = [
-                        lastBotActivity
-                    ];
-                } else {
-                    if (currentReplyToId === lastBotActivity.replyToId) {
-                        if (!queuedActivitiesRef.current?.find((act)=>act.id === lastBotActivity.id)) queuedActivitiesRef.current = [
-                            ...queuedActivitiesRef.current,
-                            lastBotActivity
-                        ];
-                    } else {
-                        setCurrentReplyToId(lastBotActivity.replyToId);
-                        queuedActivitiesRef.current = [
-                            lastBotActivity
-                        ];
-                    }
-                }
-            } else if (currentActivityRef?.current) switch((0, $98181c365642ebbf$export$2e2bcd8739ae039)(lastBotActivity, currentActivityRef.current, currentReplyToId, queuedActivitiesRef.current, endedActivities)){
-                case 0:
-                    break;
-                case 1:
-                    // Add the activity to the queue
-                    queuedActivitiesRef.current.push(lastBotActivity);
-                    break;
-                case 2:
-                    // Stop current activity and play the new one
-                    queuedActivitiesRef.current = [];
-                    createNewUtterance = true;
-                    break;
-            }
-            else createNewUtterance = !endedActivities.includes(lastBotActivity.id);
-            if (createNewUtterance) {
-                setCurrentReplyToId(lastBotActivity.replyToId || 'customReplyToIdIfNotPresent');
-                setUtterance(checkReplacementLocaleAndGetUtterance(lastBotActivity));
-                isSpeaking.current = true;
-            }
-        }
-    }, [
-        lastBotActivity,
-        ponyfill,
-        voice
-    ]);
-    (0, $bZRJW$useEffect)(()=>{
-        if (streamingReplyToId && streamingQueue.length) {
-            setUtterance(checkReplacementLocaleAndGetUtterance(streamingQueue[0], false, false));
-            isSpeaking.current = true;
-            setCurrentPlaying(undefined);
-            currentPlayingRef.current = null;
-            currentActivityRef.current = null;
-            tempCurrentStreamingRef.current = streamingQueue[0].text || null;
-            removeFirstFromStreamingQueue();
-        }
-    }, [
-        streamingReplyToId
-    ]);
-    (0, $bZRJW$useEffect)(()=>{
         if (externalTextToSpeech) {
-            setUtterance(checkReplacementLocaleAndGetUtterance({
+            const activity = {
                 speak: externalTextToSpeech,
                 locale: locale
-            }, false, false));
-            isSpeaking.current = true;
+            };
+            currentActivityRef.current = activity;
+            setUtterance(checkReplacementLocaleAndGetUtterance(activity, false));
         }
     }, [
         externalTextToSpeech
@@ -27221,92 +27010,75 @@ const $0b8e5d756ffed1ac$var$SynthesisManager = ({ ponyfill: ponyfill, isRetorikN
         document.dispatchEvent(speechEvent);
     };
     /**
-   * On call :
-   *  - set speaking state to true
-   *  - clear timerref timeout
-   *  - set currentPlaying and currentReplyToId states after a small delay to prevent make sure that the display will happen after the speech has begun
+   * Called when utterance's "start" event is fired
    */ const handleUtteranceStart = ()=>{
         setSpeaking(true);
         if (!isNewsViewRef.current && currentActivityRef?.current) {
-            setCurrentPlaying(currentActivityRef.current);
-            currentPlayingRef.current = currentActivityRef.current;
+            setCurrentOrLastPlayedActivity(currentActivityRef.current);
             currentActivityRef.current.id && dispatchMarkActivity(currentActivityRef.current.id, true);
         }
         dispatchSpeechEvent(true);
         // Set next utterance to prepare synthesis data in order to improve fluidity
-        if (streamingReplyToId && streamingQueue.length) {
-            const tempActivity = streamingQueue[0];
-            if (tempActivity.text) {
-                const tempUtterance = checkReplacementLocaleAndGetUtterance(streamingQueue[0], false, false);
-                tempUtterance.text !== nextUtterance?.text ? setNextUtterance(tempUtterance) : setNextUtterance(null);
-            } else setNextUtterance(null);
+        if (streamingQueueRef.current.length && !streamingQueueRef.current[0].value?.streamingCount) {
+            const utt = checkReplacementLocaleAndGetUtterance(streamingQueueRef.current[0], false);
+            setNextUtterance((current)=>utt.text === current?.text ? null : utt);
         } else setNextUtterance(null);
-        setCurrentStreaming(tempCurrentStreamingRef?.current);
     };
-    const handleUtteranceEnd = ()=>{
+    /**
+   * Called when utterance's "end" event is fired
+   */ const handleUtteranceEnd = ()=>{
         setSpeaking(false);
         dispatchSpeechEvent(false);
-        if (isNewsViewRef.current) setRetorikNewsEnded(true);
-        else if (cancelRef.current) resetData();
-        else handleEnded();
+        if (isNewsViewRef.current) {
+            setRetorikNewsEnded(true);
+            currentActivityRef.current = null;
+        } else handleEnded();
     };
-    /**
-   * On call :
-   *  - update the states related to the ende activity
-   *  - check if the end of the utterance was called by a cancel or not
-   *  - if it wasn't a cancel, deal with the queue
-   *  - if this was the last activity of the queue, check if the microphone has to be opened automatically (inputHint = expectingInput)
-   */ const handleEnded = ()=>{
-        let futureUtterance = null;
-        if (currentPlayingRef?.current) // Add played activity id to context's endedActivities
-        {
-            if (currentPlayingRef.current.id) {
-                addEndedActivity(currentPlayingRef.current.id);
-                dispatchMarkActivity(currentPlayingRef.current.id, false);
-            }
+    const handleEnded = ()=>{
+        // Add played activity id to context's endedActivities
+        if (currentActivityRef.current?.id) {
+            addEndedActivity(currentActivityRef.current.id);
+            dispatchMarkActivity(currentActivityRef.current.id, false);
         }
-        setCurrentPlaying(undefined);
-        if (streamingQueue.length) {
-            futureUtterance = checkReplacementLocaleAndGetUtterance(streamingQueue[0], false);
-            tempCurrentStreamingRef.current = streamingQueue[0].text || null;
-            removeFirstFromStreamingQueue();
-        } else {
-            // Launch next activity in the queue and remove it from the queue
-            if (queuedActivitiesRef.current?.length) {
-                futureUtterance = checkReplacementLocaleAndGetUtterance(queuedActivitiesRef.current[0]);
-                queuedActivitiesRef.current.splice(0, 1);
-                // If a streaming-related message activity is stored, set it as ended and flush it
-                if (streamingRelatedMessageRef.current) {
-                    addEndedActivity(streamingRelatedMessageRef.current.id);
-                    streamingRelatedMessageRef.current = null;
+        if (streamingQueueRef.current?.length) {
+            // Check if this is the message sent after streaming activities
+            if (streamingQueueRef.current[0].value?.streamingCount) {
+                addEndedActivity(streamingQueueRef.current[0].id);
+                // If there is another activity after this message, play it. If not, let's check if the microphone should be opened
+                if (streamingQueueRef.current?.length > 1) {
+                    const utt = checkReplacementLocaleAndGetUtterance(streamingQueueRef.current[1]);
+                    currentActivityRef.current = streamingQueueRef.current[1];
+                    setUtterance(utt);
+                    removeFirstFromStreamingQueue(true);
+                } else {
+                    streamingQueueRef.current[0].inputHint === 'expectingInput' && checkDictateState();
+                    currentActivityRef.current = null;
+                    setUtterance(null);
+                    setNextUtterance(null);
+                    removeFirstFromStreamingQueue();
                 }
-            } else if (streamingRelatedMessageRef.current) {
-                // Streaming-related message activity stored
-                streamingRelatedMessageRef.current.inputHint === 'expectingInput' && checkDictateState();
-                addEndedActivity(streamingRelatedMessageRef.current.id);
-                streamingRelatedMessageRef.current = null;
-            } else currentPlayingRef?.current?.inputHint === 'expectingInput' && checkDictateState();
+            } else {
+                const utt = checkReplacementLocaleAndGetUtterance(streamingQueueRef.current[0]);
+                currentActivityRef.current = streamingQueueRef.current[0];
+                setUtterance(utt);
+                removeFirstFromStreamingQueue();
+            }
+        } else {
+            currentActivityRef.current?.inputHint === 'expectingInput' && checkDictateState();
+            currentActivityRef.current = null;
+            setUtterance(null);
+            setNextUtterance(null);
         }
-        currentPlayingRef.current = null;
-        setUtterance(futureUtterance);
-        isSpeaking.current = !!futureUtterance;
     };
     /**
-   * If the previous audio stream ends before the next one is received, we relaunch the new stream as soon as it arrives.
+   * Wait for app loading and voice selection to begin playing speech
    */ (0, $bZRJW$useEffect)(()=>{
-        if (!isSpeaking.current) {
-            let futureUtterance = null;
-            setCurrentPlaying(undefined);
-            if (streamingQueue.length) {
-                futureUtterance = checkReplacementLocaleAndGetUtterance(streamingQueue[0], false, false);
-                tempCurrentStreamingRef.current = streamingQueue[0].text || null;
-                removeFirstFromStreamingQueue();
-            }
-            currentPlayingRef.current = null;
-            setUtterance(futureUtterance);
-            isSpeaking.current = !!futureUtterance;
-        }
+        // Set ref from the state to use in events
+        streamingQueueRef.current = streamingQueue;
+        if (appAvailable && voice && streamingQueue.length && !currentActivityRef.current) handleEnded();
     }, [
+        appAvailable,
+        voice,
         streamingQueue
     ]);
     return /*#__PURE__*/ (0, $bZRJW$jsx)((0, $637384b103093c58$export$2e2bcd8739ae039), {
@@ -27820,8 +27592,7 @@ const $9ab097b39dd0663e$var$typingTimer = 2000;
 const $9ab097b39dd0663e$var$SendTypingIndicator = ({ isRetorikNews: isRetorikNews })=>{
     const speaking = (0, $i1rfm.useSpeechStore)((state)=>state.speaking);
     const streamingQueue = (0, $i1rfm.useSpeechStore)((state)=>state.streamingQueue);
-    const streamingQueueFullLength = (0, $i1rfm.useSpeechStore)((state)=>state.streamingQueueFullLength);
-    const lastRecognitionInterim = (0, $i1rfm.useSpeechStore)((state)=>state.lastRecognitionInterim);
+    const activeRecognitionState = (0, $i1rfm.useSpeechStore)((state)=>state.activeRecognitionState);
     const route = (0, $1Qww3.useViewStore)((state)=>state.route);
     const loaderClosed = (0, $1x02c.useRetorikStore)((state)=>state.loaderClosed);
     const appAvailable = (0, $1x02c.useRetorikStore)((state)=>state.appAvailable);
@@ -27834,17 +27605,18 @@ const $9ab097b39dd0663e$var$SendTypingIndicator = ({ isRetorikNews: isRetorikNew
     const sendTyping = (0, $aNpqK.useDirectlineStore)((state)=>state.actions.sendTyping);
     const dataRef = (0, $bZRJW$useRef)(false);
     (0, $bZRJW$useEffect)(()=>{
+        // Don't send typing activity when we are receiving streaming events
+        const isReceivingStreamingData = !!streamingQueue.length && !!streamingQueue.find((activity)=>activity.name?.toLowerCase() === 'davi.streammessageactivity') && !streamingQueue.find((activity)=>activity.value?.streamingCount);
         dataRef.current = !isWaitingForResponse && // Don't send typing activity when we are receiving streaming events
-        !(streamingQueue.length && streamingQueueFullLength === 0) && (!loaderClosed || lastRecognitionInterim !== '' || userIsTyping || userIsSwiping || speaking || currentSubView !== (0, $4ucVo.CurrentSubView).none || route === (0, $4ucVo.Routes).News || retorikEvent === (0, $4ucVo.RetorikEvent).DetailViewOpen || listStatus === (0, $4ucVo.ListStatus).opened);
+        !isReceivingStreamingData && (!loaderClosed || activeRecognitionState !== (0, $4ucVo.RecognitionState).Closed || userIsTyping || userIsSwiping || speaking || currentSubView !== (0, $4ucVo.CurrentSubView).none || route === (0, $4ucVo.Routes).News || retorikEvent === (0, $4ucVo.RetorikEvent).DetailViewOpen || listStatus === (0, $4ucVo.ListStatus).opened);
     }, [
         appAvailable,
         loaderClosed,
-        lastRecognitionInterim,
+        activeRecognitionState,
         userIsTyping,
         userIsSwiping,
         speaking,
         streamingQueue,
-        streamingQueueFullLength,
         currentSubView,
         route,
         retorikEvent,