Skip to content

Commit 4ff4738

Browse files
authored
Merge pull request Expensify#97635 from Eskalifer1/fix-edit-agent-name-autofocus
fix: Add missing autofocus to agents EditNamePage
2 parents 7c85114 + ff44df8 commit 4ff4738

2 files changed

Lines changed: 6 additions & 0 deletions

File tree

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import HeaderWithBackButton from '@components/HeaderWithBackButton';
55
import ScreenWrapper from '@components/ScreenWrapper';
66
import TextInput from '@components/TextInput';
77

8+
import useAutoFocusInput from '@hooks/useAutoFocusInput';
89
import useLocalize from '@hooks/useLocalize';
910
import useOnyx from '@hooks/useOnyx';
1011
import useThemeStyles from '@hooks/useThemeStyles';
@@ -30,6 +31,8 @@ function EditNamePage({route}: EditNamePageProps) {
3031
const accountID = route.params.accountID;
3132
const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: (list) => list?.[accountID]});
3233

34+
const {inputCallbackRef} = useAutoFocusInput();
35+
3336
const handleSubmit = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.EDIT_AGENT_NAME_FORM>) => {
3437
updateAgentName(accountID, values[INPUT_IDS.FIRST_NAME].trim(), personalDetails?.displayName ?? '');
3538
Navigation.goBack(ROUTES.SETTINGS_AGENTS_EDIT.getRoute(accountID));
@@ -63,6 +66,7 @@ function EditNamePage({route}: EditNamePageProps) {
6366
autoCapitalize="words"
6467
spellCheck={false}
6568
defaultValue={personalDetails?.displayName ?? ''}
69+
ref={inputCallbackRef}
6670
/>
6771
</FormProvider>
6872
</ScreenWrapper>

tests/unit/pages/settings/EditNamePageTest.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ jest.mock('@react-navigation/native', () => {
4949
...actual,
5050
useIsFocused: () => true,
5151
useRoute: jest.fn(() => ({name: '', key: '', params: {}})),
52+
useNavigation: jest.fn(() => ({addListener: jest.fn(() => jest.fn())})),
53+
useFocusEffect: jest.fn(),
5254
};
5355
});
5456

0 commit comments

Comments
 (0)