diff --git a/client/src/containers/Customers/CustomerFormPrimarySection.js b/client/src/containers/Customers/CustomerFormPrimarySection.js
index 46afad8a1..d29410a23 100644
--- a/client/src/containers/Customers/CustomerFormPrimarySection.js
+++ b/client/src/containers/Customers/CustomerFormPrimarySection.js
@@ -12,12 +12,14 @@ import {
import CustomerTypeRadioField from 'containers/Customers/CustomerTypeRadioField';
import { CLASSES } from 'common/classes';
import { inputIntent } from 'utils';
+import { useAutofocus } from 'hooks';
/**
* Customer form primary section.
*/
-export default function CustomerFormPrimarySection({
-}) {
+export default function CustomerFormPrimarySection({}) {
+ const firstNameFieldRef = useAutofocus();
+
return (
{/**-----------Customer type. -----------*/}
@@ -54,6 +56,7 @@ export default function CustomerFormPrimarySection({
placeholder={'First Name'}
intent={inputIntent({ error, touched })}
className={classNames('input-group--first-name')}
+ inputRef={(ref) => (firstNameFieldRef.current = ref)}
{...field}
/>
)}
diff --git a/client/src/containers/Dialogs/AccountFormDialog/AccountFormDialogContent.js b/client/src/containers/Dialogs/AccountFormDialog/AccountFormDialogContent.js
index 310343e1a..c90d5f999 100644
--- a/client/src/containers/Dialogs/AccountFormDialog/AccountFormDialogContent.js
+++ b/client/src/containers/Dialogs/AccountFormDialog/AccountFormDialogContent.js
@@ -1,8 +1,8 @@
-import React, { useCallback, useMemo, useEffect } from 'react';
+import React, { useCallback } from 'react';
import { Intent } from '@blueprintjs/core';
import { Formik } from 'formik';
import { FormattedMessage as T, useIntl } from 'react-intl';
-import { pick, omit } from 'lodash';
+import { omit } from 'lodash';
import { useQuery, queryCache } from 'react-query';
import { AppToaster, DialogContent } from 'components';
diff --git a/client/src/containers/Dialogs/AccountFormDialog/AccountFormDialogFields.js b/client/src/containers/Dialogs/AccountFormDialog/AccountFormDialogFields.js
index e4eecc585..68f8b4178 100644
--- a/client/src/containers/Dialogs/AccountFormDialog/AccountFormDialogFields.js
+++ b/client/src/containers/Dialogs/AccountFormDialog/AccountFormDialogFields.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect } from 'react';
import { Form, FastField, Field, ErrorMessage, useFormikContext } from 'formik';
import classNames from 'classnames';
import { FormattedMessage as T } from 'react-intl';
@@ -22,6 +22,7 @@ import withAccounts from 'containers/Accounts/withAccounts';
import { inputIntent } from 'utils';
import { compose } from 'redux';
+import { useAutofocus } from 'hooks';
/**
* Account form dialogs fields.
@@ -36,6 +37,7 @@ function AccountFormDialogFields({
accountsTypes,
}) {
const { values, isSubmitting } = useFormikContext();
+ const accountNameFieldRef = useAutofocus();
return (