Merge pull request Expensify#91015 from Expensify/claude-fixAgentDeleteBackNavigation

Fix back navigation after agent deletion

Author: Gonals

src/libs/actions/Agent.ts

@@ -282,7 +282,7 @@ function deleteAgent(accountID: number) {
     ];
 
     write(WRITE_COMMANDS.DELETE_AGENT, {agentAccountID: accountID}, {optimisticData, successData, failureData});
-    Navigation.navigate(ROUTES.SETTINGS_AGENTS);
+    Navigation.goBack(ROUTES.SETTINGS_AGENTS);
 }
 
 export {

src/pages/settings/Agents/EditAgentPage.tsx

@@ -17,6 +17,7 @@ import {clearAgentAvatarUpdateError, clearAgentNameUpdateError, clearAgentPrompt
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
+import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -29,9 +30,11 @@ function EditAgentPage({route}: EditAgentPageProps) {
     const styles = useThemeStyles();
     const icons = useMemoizedLazyExpensifyIcons(['Trashcan']);
     const accountID = route.params.accountID;
-    const [agent] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${accountID}`);
-    const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: (list) => list?.[accountID]});
+    const [agent, agentMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${accountID}`);
+    const [personalDetails, personalDetailsMetadata] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: (list) => list?.[accountID]});
     const {showConfirmModal} = useConfirmModal();
+    const isOnyxLoaded = agentMetadata.status === 'loaded' && personalDetailsMetadata.status === 'loaded';
+    const shouldShowNotFoundPage = isOnyxLoaded && !agent && !personalDetails;
 
     const handleBackPress = () => Navigation.goBack();
     const handleEditAvatarPress = () => Navigation.navigate(ROUTES.SETTINGS_AGENTS_EDIT_AVATAR.getRoute(accountID));
@@ -44,13 +47,18 @@ function EditAgentPage({route}: EditAgentPageProps) {
             confirmText: translate('common.delete'),
             cancelText: translate('common.cancel'),
             danger: true,
+            shouldHandleNavigationBack: false,
         });
         if (result.action !== ModalActions.CONFIRM) {
             return;
         }
         deleteAgent(accountID);
     };
 
+    if (shouldShowNotFoundPage) {
+        return <NotFoundPage onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_AGENTS)} />;
+    }
+
     return (
         <ScreenWrapper
             testID={EditAgentPage.displayName}

tests/unit/AgentActionTest.ts

@@ -8,10 +8,10 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import type {AnyOnyxUpdate} from '@src/types/onyx/Request';
 
 jest.mock('@libs/API');
-jest.mock('@libs/Navigation/Navigation', () => ({navigate: jest.fn()}));
+jest.mock('@libs/Navigation/Navigation', () => ({navigate: jest.fn(), goBack: jest.fn()}));
 
 const mockWrite = jest.mocked(write);
-const mockNavigate = jest.mocked(Navigation.navigate);
+const mockGoBack = jest.mocked(Navigation.goBack);
 
 function getWriteOptions(): {optimisticData: AnyOnyxUpdate[]; successData: AnyOnyxUpdate[]; failureData: AnyOnyxUpdate[]} {
     const options = mockWrite.mock.calls.at(0)?.at(2);
@@ -386,10 +386,10 @@ describe('deleteAgent', () => {
         expect((promptUpdate?.value as Record<string, unknown>)?.errors).toBeTruthy();
     });
 
-    it('calls Navigation.navigate after issuing the write', () => {
+    it('calls Navigation.goBack after issuing the write', () => {
         deleteAgent(TEST_ACCOUNT_ID);
 
-        expect(mockNavigate).toHaveBeenCalledTimes(1);
+        expect(mockGoBack).toHaveBeenCalledTimes(1);
     });
 });
 

tests/unit/pages/settings/EditAgentPageTest.tsx

@@ -131,6 +131,13 @@ jest.mock('@components/ReportActionAvatars', () => {
     return MockReportActionAvatars;
 });
 
+jest.mock('@pages/ErrorPage/NotFoundPage', () => {
+    function MockNotFoundPage() {
+        return 'notFound.notHere';
+    }
+    return MockNotFoundPage;
+});
+
 const mockUseOnyx = jest.mocked(useOnyx);
 
 const TEST_ACCOUNT_ID = 12345;
@@ -144,7 +151,15 @@ const mockNavigation = {} as EditAgentPageNavigation;
 describe('EditAgentPage', () => {
     beforeEach(() => {
         jest.clearAllMocks();
-        mockUseOnyx.mockReturnValue([undefined, {status: 'loaded'}]);
+        mockUseOnyx.mockImplementation((key, options) => {
+            if (key === ONYXKEYS.PERSONAL_DETAILS_LIST && options?.selector) {
+                return [{displayName: 'Default Agent'}, {status: 'loaded'}];
+            }
+            if (typeof key === 'string' && key.startsWith(ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT)) {
+                return [{prompt: 'Default prompt'}, {status: 'loaded'}];
+            }
+            return [undefined, {status: 'loaded'}];
+        });
     });
 
     it('renders agent name from personalDetails', () => {
@@ -229,4 +244,32 @@ describe('EditAgentPage', () => {
 
         expect(JSON.stringify(toJSON())).toContain('agentsPage.error.updatePrompt');
     });
+
+    it('renders NotFoundPage when agent and personalDetails are both missing after Onyx is loaded', () => {
+        mockUseOnyx.mockReturnValue([undefined, {status: 'loaded'}]);
+
+        const {toJSON} = render(
+            <EditAgentPage
+                route={mockRoute}
+                navigation={mockNavigation}
+            />,
+        );
+
+        const serialized = JSON.stringify(toJSON());
+        expect(serialized).toContain('notFound.notHere');
+        expect(serialized).not.toContain('editAgentPage.deleteAgent');
+    });
+
+    it('does not render NotFoundPage while Onyx is still loading', () => {
+        mockUseOnyx.mockReturnValue([undefined, {status: 'loading'}]);
+
+        const {toJSON} = render(
+            <EditAgentPage
+                route={mockRoute}
+                navigation={mockNavigation}
+            />,
+        );
+
+        expect(JSON.stringify(toJSON())).not.toContain('notFound.notHere');
+    });
 });