From bc2a5aaf96db069828e79c866e9100717637be22 Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Fri, 16 Jun 2023 08:13:08 -0500
Subject: [PATCH] Fix #19619 - Submit the account creation form when pressing
 enter (#19620)

---
 .../create-account/create-account.js          | 62 ++++++++++---------
 1 file changed, 33 insertions(+), 29 deletions(-)

diff --git a/ui/components/multichain/create-account/create-account.js b/ui/components/multichain/create-account/create-account.js
index 71d951176..de380d982 100644
--- a/ui/components/multichain/create-account/create-account.js
+++ b/ui/components/multichain/create-account/create-account.js
@@ -54,36 +54,35 @@ export const CreateAccount = ({ onActionComplete }) => {
     }
   };
 
-  return (
-    <Box
-      as="form"
-      onSubmit={async (event) => {
-        event.preventDefault();
+  const onSubmit = async (event) => {
+    event.preventDefault();
 
-        try {
-          await onCreateAccount(newAccountName || defaultAccountName);
-          onActionComplete(true);
-          trackEvent({
-            category: MetaMetricsEventCategory.Accounts,
-            event: MetaMetricsEventName.AccountAdded,
-            properties: {
-              account_type: MetaMetricsEventAccountType.Default,
-              location: 'Home',
-            },
-          });
-          history.push(mostRecentOverviewPage);
-        } catch (error) {
-          trackEvent({
-            category: MetaMetricsEventCategory.Accounts,
-            event: MetaMetricsEventName.AccountAddFailed,
-            properties: {
-              account_type: MetaMetricsEventAccountType.Default,
-              error: error.message,
-            },
-          });
-        }
-      }}
-    >
+    try {
+      await onCreateAccount(newAccountName || defaultAccountName);
+      onActionComplete(true);
+      trackEvent({
+        category: MetaMetricsEventCategory.Accounts,
+        event: MetaMetricsEventName.AccountAdded,
+        properties: {
+          account_type: MetaMetricsEventAccountType.Default,
+          location: 'Home',
+        },
+      });
+      history.push(mostRecentOverviewPage);
+    } catch (error) {
+      trackEvent({
+        category: MetaMetricsEventCategory.Accounts,
+        event: MetaMetricsEventName.AccountAddFailed,
+        properties: {
+          account_type: MetaMetricsEventAccountType.Default,
+          error: error.message,
+        },
+      });
+    }
+  };
+
+  return (
+    <Box as="form" onSubmit={onSubmit}>
       <FormTextField
         autoFocus
         label={t('accountName')}
@@ -91,6 +90,11 @@ export const CreateAccount = ({ onActionComplete }) => {
         onChange={(event) => setNewAccountName(event.target.value)}
         helpText={errorMessage}
         error={!isValidAccountName}
+        onKeyPress={(e) => {
+          if (e.key === 'Enter') {
+            onSubmit(e);
+          }
+        }}
       />
       <Box display={Display.Flex} marginTop={6} gap={2}>
         <ButtonSecondary onClick={() => onActionComplete()} block>