From ee8a77d1ec1bfdb3114136487db599a73d39b030 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Bonet=20=28via=20MelvinBot=29?=
 <infra+melvinbot@expensify.com>
Date: Fri, 29 May 2026 17:09:22 +0000
Subject: [PATCH 1/5] Don't disable AI prompt Save button when offline
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Nicolás Bonet <NicolasBonet@users.noreply.github.com>
---
 .../settings/Profile/AgentAIPromptSection.tsx | 50 ++++++++++++-------
 1 file changed, 31 insertions(+), 19 deletions(-)

diff --git a/src/pages/settings/Profile/AgentAIPromptSection.tsx b/src/pages/settings/Profile/AgentAIPromptSection.tsx
index dc8a219300a3..347793e27098 100644
--- a/src/pages/settings/Profile/AgentAIPromptSection.tsx
+++ b/src/pages/settings/Profile/AgentAIPromptSection.tsx
@@ -11,6 +11,7 @@ import TextInput from '@components/TextInput';
 import type {BaseTextInputRef} from '@components/TextInput/BaseTextInput/types';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
+import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import useThemeStyles from '@hooks/useThemeStyles';
 import {clearAgentPromptUpdateError, openProfilePage, updateAgentPrompt} from '@libs/actions/Agent';
@@ -47,6 +48,7 @@ function scrollInputIntoView(parentScrollViewRef: RefObject<RNScrollView | null>
 
 function AgentAIPromptSection({accountID, parentScrollViewRef}: AgentAIPromptSectionProps) {
     const {translate} = useLocalize();
+    const {isOffline} = useNetwork();
     const styles = useThemeStyles();
     const icons = useMemoizedLazyExpensifyIcons(['Checkmark']);
     const [agentPrompt] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${accountID}`);
@@ -95,19 +97,23 @@ function AgentAIPromptSection({accountID, parentScrollViewRef}: AgentAIPromptSec
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [agentPrompt?.promptErrors]);
 
+    const triggerSavedConfirmation = useCallback(() => {
+        setShowSavedConfirmation(true);
+        if (savedConfirmationTimerRef.current) {
+            clearTimeout(savedConfirmationTimerRef.current);
+        }
+        savedConfirmationTimerRef.current = setTimeout(() => {
+            setShowSavedConfirmation(false);
+            savedConfirmationTimerRef.current = null;
+        }, SAVED_CONFIRMATION_DURATION_MS);
+    }, []);
+
     useEffect(() => {
         if (wasSavingRef.current && !isSaving && !hasPromptErrors) {
-            setShowSavedConfirmation(true);
-            if (savedConfirmationTimerRef.current) {
-                clearTimeout(savedConfirmationTimerRef.current);
-            }
-            savedConfirmationTimerRef.current = setTimeout(() => {
-                setShowSavedConfirmation(false);
-                savedConfirmationTimerRef.current = null;
-            }, SAVED_CONFIRMATION_DURATION_MS);
+            triggerSavedConfirmation();
         }
         wasSavingRef.current = isSaving;
-    }, [isSaving, hasPromptErrors]);
+    }, [isSaving, hasPromptErrors, triggerSavedConfirmation]);
 
     useEffect(() => {
         return () => {
@@ -147,6 +153,12 @@ function AgentAIPromptSection({accountID, parentScrollViewRef}: AgentAIPromptSec
         }
         dismissInput();
         updateAgentPrompt(accountID, trimmed, agentPrompt?.prompt ?? '');
+
+        // Offline: treat the optimistic write as the final state for UX purposes. The request will be
+        // replayed on reconnect, so showing "Saved" immediately matches the queued-but-done intent.
+        if (isOffline) {
+            triggerSavedConfirmation();
+        }
     };
 
     const handleChangeText = (text: string) => {
@@ -192,17 +204,17 @@ function AgentAIPromptSection({accountID, parentScrollViewRef}: AgentAIPromptSec
                     testID="ai-prompt-input"
                     onFocus={handleInputFocus}
                 />
+                <Button
+                    success
+                    text={showSavedConfirmation ? translate('profilePage.aiPromptSection.saved') : translate('common.save')}
+                    icon={showSavedConfirmation ? icons.Checkmark : undefined}
+                    onPress={handleSave}
+                    isLoading={isSaving && !isOffline}
+                    isDisabled={hasHtmlTag || (isSaving && !isOffline)}
+                    style={[styles.alignSelfStart]}
+                    testID="save-prompt-button"
+                />
             </OfflineWithFeedback>
-            <Button
-                success
-                text={showSavedConfirmation ? translate('profilePage.aiPromptSection.saved') : translate('common.save')}
-                icon={showSavedConfirmation ? icons.Checkmark : undefined}
-                onPress={handleSave}
-                isLoading={isSaving}
-                isDisabled={hasHtmlTag || isSaving}
-                style={[styles.alignSelfStart]}
-                testID="save-prompt-button"
-            />
         </Section>
     );
 }

From 0a1e1aa9f3ae8e6b6609c6f242dc77294404e396 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Bonet=20=28via=20MelvinBot=29?=
 <infra+melvinbot@expensify.com>
Date: Mon, 1 Jun 2026 15:57:21 +0000
Subject: [PATCH 2/5] Keep Save button full-opacity offline and add 12px
 spacing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Wrap only the prompt text field in OfflineWithFeedback so the queued/faded
styling applies to the textarea but not the Save button. Render the error row
via a standalone ErrorMessageRow below the button with a 12px top margin, and
give the button a 12px gap above it.

Co-authored-by: Nicolás Bonet <NicolasBonet@users.noreply.github.com>
---
 .../settings/Profile/AgentAIPromptSection.tsx | 34 ++++++++++---------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/pages/settings/Profile/AgentAIPromptSection.tsx b/src/pages/settings/Profile/AgentAIPromptSection.tsx
index 347793e27098..e8f330b5ea14 100644
--- a/src/pages/settings/Profile/AgentAIPromptSection.tsx
+++ b/src/pages/settings/Profile/AgentAIPromptSection.tsx
@@ -5,6 +5,7 @@ import type {RefObject} from 'react';
 import type {ScrollView as RNScrollView, TextInputKeyPressEvent} from 'react-native';
 import {Keyboard} from 'react-native';
 import Button from '@components/Button';
+import ErrorMessageRow from '@components/ErrorMessageRow';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import Section from '@components/Section';
 import TextInput from '@components/TextInput';
@@ -184,11 +185,7 @@ function AgentAIPromptSection({accountID, parentScrollViewRef}: AgentAIPromptSec
             childrenStyles={styles.pt5}
             titleStyles={styles.accountSettingsSectionTitle}
         >
-            <OfflineWithFeedback
-                errors={agentPrompt?.promptErrors}
-                pendingAction={agentPrompt?.pendingAction}
-                onClose={() => clearAgentPromptUpdateError(accountID)}
-            >
+            <OfflineWithFeedback pendingAction={agentPrompt?.pendingAction}>
                 <TextInput
                     ref={inputRef}
                     label={translate('profilePage.aiPromptSection.prompt')}
@@ -200,21 +197,26 @@ function AgentAIPromptSection({accountID, parentScrollViewRef}: AgentAIPromptSec
                     autoGrowHeight
                     maxAutoGrowHeight={variables.lineHeightNormal * MAX_VISIBLE_PROMPT_LINES}
                     errorText={errorText}
-                    containerStyles={[styles.mb4]}
+                    containerStyles={[styles.mb3]}
                     testID="ai-prompt-input"
                     onFocus={handleInputFocus}
                 />
-                <Button
-                    success
-                    text={showSavedConfirmation ? translate('profilePage.aiPromptSection.saved') : translate('common.save')}
-                    icon={showSavedConfirmation ? icons.Checkmark : undefined}
-                    onPress={handleSave}
-                    isLoading={isSaving && !isOffline}
-                    isDisabled={hasHtmlTag || (isSaving && !isOffline)}
-                    style={[styles.alignSelfStart]}
-                    testID="save-prompt-button"
-                />
             </OfflineWithFeedback>
+            <Button
+                success
+                text={showSavedConfirmation ? translate('profilePage.aiPromptSection.saved') : translate('common.save')}
+                icon={showSavedConfirmation ? icons.Checkmark : undefined}
+                onPress={handleSave}
+                isLoading={isSaving && !isOffline}
+                isDisabled={hasHtmlTag || (isSaving && !isOffline)}
+                style={[styles.alignSelfStart]}
+                testID="save-prompt-button"
+            />
+            <ErrorMessageRow
+                errors={agentPrompt?.promptErrors}
+                errorRowStyles={[styles.mt3]}
+                onDismiss={() => clearAgentPromptUpdateError(accountID)}
+            />
         </Section>
     );
 }

From 3130188ea14e985511ae2989ab50480edc4ab7ea Mon Sep 17 00:00:00 2001
From: Nicolas Bonet <nicolas@expensify.com>
Date: Mon, 1 Jun 2026 14:11:00 -0500
Subject: [PATCH 3/5] Allow AI prompt re-save while offline

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 src/pages/settings/Profile/AgentAIPromptSection.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/settings/Profile/AgentAIPromptSection.tsx b/src/pages/settings/Profile/AgentAIPromptSection.tsx
index e8f330b5ea14..f71a4201bfdb 100644
--- a/src/pages/settings/Profile/AgentAIPromptSection.tsx
+++ b/src/pages/settings/Profile/AgentAIPromptSection.tsx
@@ -138,7 +138,7 @@ function AgentAIPromptSection({accountID, parentScrollViewRef}: AgentAIPromptSec
     }, [parentScrollViewRef]);
 
     const handleSave = () => {
-        if (isSaving) {
+        if (isSaving && !isOffline) {
             return;
         }
 

From 64ed76fb2489227059c38351de0cef9e7fb0aeaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Bonet=20=28via=20MelvinBot=29?=
 <infra+melvinbot@expensify.com>
Date: Mon, 1 Jun 2026 19:19:12 +0000
Subject: [PATCH 4/5] Add regression test for offline AI prompt re-save
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Covers the case where a queued offline save keeps pendingAction=update
(isSaving true) and a second offline edit must still call updateAgentPrompt
rather than being silently dropped.

Co-authored-by: Nicolás Bonet <NicolasBonet@users.noreply.github.com>
---
 tests/ui/ProfilePageTest.tsx | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/tests/ui/ProfilePageTest.tsx b/tests/ui/ProfilePageTest.tsx
index 304d0ffb6d7c..9a9b8bbd6c38 100644
--- a/tests/ui/ProfilePageTest.tsx
+++ b/tests/ui/ProfilePageTest.tsx
@@ -343,6 +343,32 @@ describe('ProfilePage - agent account', () => {
         expect(saveButtonProps.accessibilityState?.disabled).toBe(true);
     });
 
+    it('allows re-saving an edited prompt while offline even when a previous save is still pending', async () => {
+        const accountID = 123;
+        const mockUpdateAgentPrompt = jest.mocked(AgentActions.updateAgentPrompt);
+        await setupUser('agent_123@expensify.ai');
+
+        await act(async () => {
+            // Simulate a first offline save that is queued but not yet replayed: pendingAction stays 'update',
+            // so isSaving is true. The button is intentionally not disabled while offline.
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${accountID}`, {
+                prompt: 'First offline edit.',
+                pendingAction: 'update',
+            });
+            await Onyx.merge(ONYXKEYS.NETWORK, {shouldForceOffline: true});
+        });
+        await waitForBatchedUpdatesWithAct();
+
+        renderPageWithNavigation(SCREENS.SETTINGS.PROFILE.ROOT);
+        await waitForBatchedUpdatesWithAct();
+
+        fireEvent.changeText(screen.getByTestId('ai-prompt-input'), 'Second offline edit.');
+        fireEvent.press(screen.getByTestId('save-prompt-button'));
+        await waitForBatchedUpdatesWithAct();
+
+        expect(mockUpdateAgentPrompt).toHaveBeenCalledWith(accountID, 'Second offline edit.', 'First offline edit.');
+    });
+
     it('does not call updateAgentPrompt when saving blank prompt', async () => {
         const accountID = 123;
         const mockUpdateAgentPrompt = jest.mocked(AgentActions.updateAgentPrompt);

From 763f70e47eb9c07da7be4acf0b3cc1687eabff08 Mon Sep 17 00:00:00 2001
From: Nicolas Bonet <nicolas@expensify.com>
Date: Mon, 1 Jun 2026 14:23:33 -0500
Subject: [PATCH 5/5] Update dependencies in SearchPage to include
 currentSearchResults in useMemo dependencies

---
 src/pages/Search/SearchPage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Search/SearchPage.tsx b/src/pages/Search/SearchPage.tsx
index 7d003fa90d53..4c1d0fcb886c 100644
--- a/src/pages/Search/SearchPage.tsx
+++ b/src/pages/Search/SearchPage.tsx
@@ -143,7 +143,7 @@ function SearchPage({route}: SearchPageProps) {
         const total = shouldUseClientTotal ? selectedTransactionItems.reduce((acc, transaction) => acc - (transaction.groupAmount ?? -Math.abs(transaction.amount)), 0) : metadata?.total;
 
         return {count: numberOfExpense, total, currency};
-    }, [areAllMatchingItemsSelected, metadata?.count, metadata?.currency, metadata?.total, selectedTransactions, selectedTransactionsKeys, shouldAllowFooterTotals]);
+    }, [areAllMatchingItemsSelected, metadata?.count, metadata?.currency, metadata?.total, selectedTransactions, selectedTransactionsKeys, shouldAllowFooterTotals, currentSearchResults]);
 
     const onSortPressedCallback = useCallback(() => {
         setIsSorting(true);