Merge pull request Expensify#90702 from Expensify/chore/89355-nabs

[No QA] chore: some minor code improvements to edit agent

Author: yuwenmemon

src/pages/settings/Agents/AgentInfoRow.tsx

@@ -18,10 +18,10 @@ type AgentInfoRowProps = {
     login: string;
 
     /** Whether the agent is pending deletion */
-    isDeleted?: boolean;
+    isPendingDeletion?: boolean;
 };
 
-function AgentInfoRow({accountID, displayName, login, isDeleted = false}: AgentInfoRowProps) {
+function AgentInfoRow({accountID, displayName, login, isPendingDeletion = false}: AgentInfoRowProps) {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
 
@@ -36,13 +36,13 @@ function AgentInfoRow({accountID, displayName, login, isDeleted = false}: AgentI
             <View style={[styles.flex1, styles.gap1]}>
                 <Text
                     numberOfLines={1}
-                    style={[styles.textStrong, isDeleted ? styles.offlineFeedbackDeleted : {}]}
+                    style={[styles.textStrong, isPendingDeletion ? styles.offlineFeedbackDeleted : {}]}
                 >
                     {displayName}
                 </Text>
                 <Text
                     numberOfLines={1}
-                    style={[styles.mutedNormalTextLabel, isDeleted ? styles.offlineFeedbackDeleted : {}]}
+                    style={[styles.mutedNormalTextLabel, isPendingDeletion ? styles.offlineFeedbackDeleted : {}]}
                 >
                     {login}
                 </Text>

src/pages/settings/Agents/AgentsListRow.tsx

@@ -45,7 +45,7 @@ function AgentsListRow({accountID, displayName, login, pendingAction, errors, on
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const icons = useMemoizedLazyExpensifyIcons(['DotIndicator']);
 
-    const isDeleted = pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
+    const isPendingDeletion = pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
     const navigateToEdit = () => Navigation.navigate(ROUTES.SETTINGS_AGENTS_EDIT.getRoute(accountID));
 
     return (
@@ -63,13 +63,13 @@ function AgentsListRow({accountID, displayName, login, pendingAction, errors, on
                     accessibilityLabel={displayName}
                     role={CONST.ROLE.BUTTON}
                     sentryLabel="AgentsListRow-Edit"
-                    disabled={isDeleted}
+                    disabled={isPendingDeletion}
                 >
                     <AgentInfoRow
                         accountID={accountID}
                         displayName={displayName}
                         login={login}
-                        isDeleted={isDeleted}
+                        isPendingDeletion={isPendingDeletion}
                     />
                     {!!brickRoadIndicator && (
                         <Icon
@@ -84,7 +84,7 @@ function AgentsListRow({accountID, displayName, login, pendingAction, errors, on
                         accountID={accountID}
                         displayName={displayName}
                         login={login}
-                        isDeleted={isDeleted}
+                        isPendingDeletion={isPendingDeletion}
                     />
                     {!!brickRoadIndicator && (
                         <Icon
@@ -96,7 +96,7 @@ function AgentsListRow({accountID, displayName, login, pendingAction, errors, on
                         small
                         text={translate('common.edit')}
                         onPress={navigateToEdit}
-                        isDisabled={isDeleted}
+                        isDisabled={isPendingDeletion}
                     />
                 </View>
             )}

src/pages/settings/Agents/AgentsPage.tsx

@@ -59,14 +59,15 @@ function AgentsPage() {
             if (!details) {
                 return null;
             }
+            const hasNameErrors = Object.keys(agentPrompt?.nameErrors ?? {}).length > 0;
+            const hasPromptErrors = Object.keys(agentPrompt?.promptErrors ?? {}).length > 0;
             return {
                 accountID,
                 displayName: details.displayName ?? details.login ?? '',
                 login: details.login ?? '',
                 pendingAction: agentPrompt?.pendingAction,
                 errors: agentPrompt?.errors,
-                hasUpdateErrors:
-                    !!(agentPrompt?.nameErrors && Object.keys(agentPrompt.nameErrors).length > 0) || !!(agentPrompt?.promptErrors && Object.keys(agentPrompt.promptErrors).length > 0),
+                hasUpdateErrors: hasNameErrors || hasPromptErrors,
             };
         })
         .filter(Boolean) as AgentItem[];

src/pages/settings/Agents/Fields/EditPromptPage.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import {View} from 'react-native';
+import {Platform, View} from 'react-native';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
 import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
@@ -42,6 +42,10 @@ function EditPromptPage({route}: EditPromptPageProps) {
     };
 
     useKeyboardShortcut(CONST.KEYBOARD_SHORTCUTS.CTRL_ENTER, (e) => {
+        if (Platform.OS !== 'web') {
+            return;
+        }
+
         const textarea = e?.target as HTMLTextAreaElement;
 
         if (!textarea) {