Merge pull request #88747 from Expensify/chirag-AZ-indicator-changes

[Payment due @ahmedGaber93] Remove optimistic Concierge thinking indicator

Author: chiragsalian

src/ONYXKEYS.ts

@@ -600,9 +600,6 @@ const ONYXKEYS = {
     /** Company cards custom names */
     NVP_EXPENSIFY_COMPANY_CARDS_CUSTOM_NAMES: 'nvp_expensify_ccCustomNames',
 
-    /** Whether to kick off the "Concierge is thinking" indicator when AgentZeroStatusGate mounts */
-    CONCIERGE_THINKING_KICKOFF: 'conciergeThinkingKickoff',
-
     /** The user's Concierge reportID */
     CONCIERGE_REPORT_ID: 'conciergeReportID',
 
@@ -1527,7 +1524,6 @@ type OnyxValuesMapping = {
     [ONYXKEYS.LAST_ROUTE]: string;
     [ONYXKEYS.IS_USING_IMPORTED_STATE]: boolean;
     [ONYXKEYS.NVP_EXPENSIFY_COMPANY_CARDS_CUSTOM_NAMES]: Record<string, string>;
-    [ONYXKEYS.CONCIERGE_THINKING_KICKOFF]: boolean;
     [ONYXKEYS.CONCIERGE_REPORT_ID]: string;
     [ONYXKEYS.SELF_DM_REPORT_ID]: string;
     [ONYXKEYS.SHARE_UNKNOWN_USER_DETAILS]: Participant;

src/components/Search/SearchRouter/useAskConcierge.tsx

@@ -4,7 +4,7 @@ import useOnyx from '@hooks/useOnyx';
 import useOpenConciergeAnywhere from '@hooks/useOpenConciergeAnywhere';
 import useSidePanelReportID from '@hooks/useSidePanelReportID';
 import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
-import {addComment, setConciergeThinkingKickoff} from '@userActions/Report';
+import {addComment} from '@userActions/Report';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 
@@ -26,7 +26,6 @@ function useAskConcierge() {
         if (!targetReport || !targetReportID) {
             return;
         }
-        setConciergeThinkingKickoff();
         addComment({
             report: targetReport,
             notifyReportID: targetReportID,

src/libs/actions/Report/index.ts

@@ -7581,14 +7581,6 @@ function setOptimisticTransactionThread(reportID?: string, parentReportID?: stri
     });
 }
 
-function setConciergeThinkingKickoff() {
-    Onyx.set(ONYXKEYS.CONCIERGE_THINKING_KICKOFF, true);
-}
-
-function clearConciergeThinkingKickoff() {
-    Onyx.set(ONYXKEYS.CONCIERGE_THINKING_KICKOFF, null);
-}
-
 export type {Video, GuidedSetupData, TaskForParameters, IntroSelected, OpenReportActionParams, ParticipantInfo};
 
 export {
@@ -7707,6 +7699,4 @@ export {
     prepareOnyxDataForCleanUpOptimisticParticipants,
     getGuidedSetupDataForOpenReport,
     getReportChannelName,
-    setConciergeThinkingKickoff,
-    clearConciergeThinkingKickoff,
 };

src/pages/inbox/AgentZeroStatusContext.tsx

@@ -1,10 +1,9 @@
 import {getReportChatType} from '@selectors/Report';
 import agentZeroProcessingIndicatorSelector from '@selectors/ReportNameValuePairs';
 import React, {createContext, useContext, useEffect, useRef, useState} from 'react';
-import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
-import {clearConciergeThinkingKickoff, getReportChannelName} from '@libs/actions/Report';
+import {getReportChannelName} from '@libs/actions/Report';
 import Log from '@libs/Log';
 import Pusher from '@libs/Pusher';
 import CONST from '@src/CONST';
@@ -17,7 +16,7 @@ type ReasoningEntry = {
 };
 
 type AgentZeroStatusState = {
-    /** Whether AgentZero is actively working — true when the server sent a processing label or we're optimistically waiting */
+    /** Whether AgentZero is actively working — true when the server has sent a processing label */
     isProcessing: boolean;
 
     /** Chronological list of reasoning steps streamed via Pusher during the current processing request */
@@ -27,23 +26,13 @@ type AgentZeroStatusState = {
     statusLabel: string;
 };
 
-type AgentZeroStatusActions = {
-    /** Sets optimistic "thinking" state immediately after the user sends a message, before the server responds */
-    kickoffWaitingIndicator: () => void;
-};
-
 const defaultState: AgentZeroStatusState = {
     isProcessing: false,
     reasoningHistory: [],
     statusLabel: '',
 };
 
-const defaultActions: AgentZeroStatusActions = {
-    kickoffWaitingIndicator: () => {},
-};
-
 const AgentZeroStatusStateContext = createContext<AgentZeroStatusState>(defaultState);
-const AgentZeroStatusActionsContext = createContext<AgentZeroStatusActions>(defaultActions);
 
 /**
  * Cheap outer guard — only subscribes to the scalar CONCIERGE_REPORT_ID.
@@ -77,59 +66,33 @@ function AgentZeroStatusProvider({reportID, children}: React.PropsWithChildren<{
 const MIN_DISPLAY_TIME = 300; // ms
 // Debounce delay for server label updates
 const DEBOUNCE_DELAY = 150; // ms
-const OPTIMISTIC_TIMEOUT = 120000; // 2 minutes
 
 /**
- * Inner gate — all Pusher, reasoning, label, and processing state.
- * Only mounted when reportID matches the Concierge report.
+ * Inner gate — all Pusher, reasoning, and label state.
+ * Only mounted for AgentZero chats (Concierge DMs or policy #admins rooms).
  * Remounted via key prop when reportID changes, so all state resets automatically.
  */
 function AgentZeroStatusGate({reportID, children}: React.PropsWithChildren<{reportID: string}>) {
     // Server-driven processing label from report name-value pairs (e.g. "Looking up categories...")
+    // Backend only writes this when AgentZero is actually handling the chat — the client no longer
+    // sets an optimistic label on send, so if AZ short-circuits (chat job exists, human responded
+    // within R2LR_TIME) nothing renders.
     const [serverLabel] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${reportID}`, {selector: agentZeroProcessingIndicatorSelector});
 
-    // Timestamp set when the user sends a message, before the server label arrives — shows "Concierge is thinking..."
-    const [optimisticStartTime, setOptimisticStartTime] = useState<number | null>(null);
     // Debounced label shown to the user — smooths rapid server label changes
     const displayedLabelRef = useRef<string>('');
     const [displayedLabel, setDisplayedLabel] = useState<string>('');
     // Chronological list of reasoning steps streamed via Pusher during a single processing request
     const [reasoningHistory, setReasoningHistory] = useState<ReasoningEntry[]>([]);
-    const {translate} = useLocalize();
     // Timer for debounced label updates — ensures a minimum display time before switching
     const updateTimerRef = useRef<NodeJS.Timeout | null>(null);
     // Timestamp of the last label update — used to enforce MIN_DISPLAY_TIME
     const lastUpdateTimeRef = useRef<number>(0);
     const {isOffline} = useNetwork();
 
-    // Auto-kickoff "thinking" indicator when opened from search (where kickoffWaitingIndicator isn't accessible)
-    const [shouldKickoff] = useOnyx(ONYXKEYS.CONCIERGE_THINKING_KICKOFF);
-    useEffect(() => {
-        if (!shouldKickoff) {
-            return;
-        }
-        clearConciergeThinkingKickoff();
-        // eslint-disable-next-line react-hooks/set-state-in-effect -- one-shot kickoff from search; Onyx flag is cleared immediately so it cannot cascade
-        setOptimisticStartTime(Date.now());
-    }, [shouldKickoff]);
-
     // Tracks the current agentZeroRequestID so the Pusher callback can detect new requests
     const agentZeroRequestIDRef = useRef('');
 
-    // Clear optimistic state once server label arrives — the server has taken over
-    if (serverLabel && optimisticStartTime) {
-        setOptimisticStartTime(null);
-    }
-
-    // Clear optimistic state when coming back online — stale optimism from offline
-    const [prevIsOffline, setPrevIsOffline] = useState(isOffline);
-    if (prevIsOffline !== isOffline) {
-        setPrevIsOffline(isOffline);
-        if (!isOffline && optimisticStartTime) {
-            setOptimisticStartTime(null);
-        }
-    }
-
     // Clear reasoning when processing ends (server label transitions from truthy → falsy)
     const [prevServerLabel, setPrevServerLabel] = useState(serverLabel);
     if (prevServerLabel !== serverLabel) {
@@ -190,12 +153,7 @@ function AgentZeroStatusGate({reportID, children}: React.PropsWithChildren<{repo
     // Synchronize the displayed label with debounce and minimum display time.
     // displayedLabelRef mirrors state so the effect can check the current value without depending on displayedLabel.
     useEffect(() => {
-        let targetLabel = '';
-        if (serverLabel) {
-            targetLabel = serverLabel;
-        } else if (optimisticStartTime) {
-            targetLabel = translate('common.thinking');
-        }
+        const targetLabel = serverLabel ?? '';
 
         if (displayedLabelRef.current === targetLabel) {
             return;
@@ -213,7 +171,6 @@ function AgentZeroStatusGate({reportID, children}: React.PropsWithChildren<{repo
         // Immediate update when enough time has passed or when clearing the label
         if (remainingMinTime === 0 || targetLabel === '') {
             displayedLabelRef.current = targetLabel;
-
             setDisplayedLabel(targetLabel);
             lastUpdateTimeRef.current = now;
         } else {
@@ -233,52 +190,23 @@ function AgentZeroStatusGate({reportID, children}: React.PropsWithChildren<{repo
             }
             clearTimeout(updateTimerRef.current);
         };
-    }, [serverLabel, optimisticStartTime, translate]);
-
-    // Pusher updates carrying the server label can be silently dropped, leaving the optimistic indicator stuck forever.
-    useEffect(() => {
-        if (!optimisticStartTime) {
-            return;
-        }
-        const elapsed = Date.now() - optimisticStartTime;
-        const remaining = Math.max(0, OPTIMISTIC_TIMEOUT - elapsed);
-        const timer = setTimeout(() => {
-            setOptimisticStartTime(null);
-        }, remaining);
-        return () => clearTimeout(timer);
-    }, [optimisticStartTime]);
-
-    const kickoffWaitingIndicator = () => {
-        setOptimisticStartTime(Date.now());
-    };
+    }, [serverLabel]);
 
-    // True when AgentZero is actively working — either the server sent a label or we're optimistically waiting
-    const isProcessing = !isOffline && (!!serverLabel || !!optimisticStartTime);
+    // True when AgentZero is actively working — the server has sent a label
+    const isProcessing = !isOffline && !!serverLabel;
 
     const stateValue: AgentZeroStatusState = {
         isProcessing,
         reasoningHistory,
         statusLabel: displayedLabel,
     };
 
-    const actionsValue: AgentZeroStatusActions = {
-        kickoffWaitingIndicator,
-    };
-
-    return (
-        <AgentZeroStatusActionsContext.Provider value={actionsValue}>
-            <AgentZeroStatusStateContext.Provider value={stateValue}>{children}</AgentZeroStatusStateContext.Provider>
-        </AgentZeroStatusActionsContext.Provider>
-    );
+    return <AgentZeroStatusStateContext.Provider value={stateValue}>{children}</AgentZeroStatusStateContext.Provider>;
 }
 
 function useAgentZeroStatus(): AgentZeroStatusState {
     return useContext(AgentZeroStatusStateContext);
 }
 
-function useAgentZeroStatusActions(): AgentZeroStatusActions {
-    return useContext(AgentZeroStatusActionsContext);
-}
-
-export {AgentZeroStatusProvider, useAgentZeroStatus, useAgentZeroStatusActions};
-export type {AgentZeroStatusState, AgentZeroStatusActions, ReasoningEntry};
+export {AgentZeroStatusProvider, useAgentZeroStatus};
+export type {AgentZeroStatusState, ReasoningEntry};

src/pages/inbox/report/ReportActionCompose/useComposerSubmit.ts

@@ -20,7 +20,6 @@ import {addDomainToShortMention} from '@libs/ParsingUtils';
 import {getFilteredReportActionsForReportView, getOneTransactionThreadReportID, isSentMoneyReportAction} from '@libs/ReportActionsUtils';
 import {startSpan} from '@libs/telemetry/activeSpans';
 import {generateAccountID} from '@libs/UserUtils';
-import {useAgentZeroStatusActions} from '@pages/inbox/AgentZeroStatusContext';
 import {ActionListContext} from '@pages/inbox/ReportScreenContext';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -30,7 +29,6 @@ import useSidePanelContext from './useSidePanelContext';
 
 function useComposerSubmit(reportID: string): (comment: string) => void {
     const {isOffline} = useNetwork();
-    const {kickoffWaitingIndicator} = useAgentZeroStatusActions();
     const currentUserPersonalDetails = useCurrentUserPersonalDetails();
     const personalDetails = usePersonalDetails();
     const {availableLoginsList} = useShortMentionsList();
@@ -63,7 +61,6 @@ function useComposerSubmit(reportID: string): (comment: string) => void {
 
     return (newComment: string) => {
         const newCommentTrimmed = newComment.trim();
-        kickoffWaitingIndicator();
 
         if (attachmentFileRef.current) {
             addAttachmentWithComment({