Prevent form submission on Enter

tahowallet · Dec 15, 2023 · c7bf65c · c7bf65c
1 parent 8316b24
commit c7bf65c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/ui/components/Shared/SharedButton.tsx b/ui/components/Shared/SharedButton.tsx
@@ -26,6 +26,7 @@ export type Props = {
    */
   iconPosition?: "left" | "right"
   onClick?: (event: React.MouseEvent<HTMLButtonElement>) => void
+  onKeyDown?: (event: React.KeyboardEvent<HTMLButtonElement>) => void
   isDisabled?: boolean
   hideEvents?: boolean
   linkTo?: History.LocationDescriptor<unknown>
@@ -45,6 +46,7 @@ export default function SharedButton(
     type,
     size,
     onClick,
+    onKeyDown,
     isDisabled = false,
     hideEvents = true,
     iconSmall,
@@ -107,6 +109,7 @@ export default function SharedButton(
         { center },
       )}
       onClick={handleClick}
+      onKeyDown={onKeyDown}
       style={style}
     >
       {isShowingLoadingSpinner && (

diff --git a/ui/pages/Onboarding/Tabbed/ViewOnlyWallet.tsx b/ui/pages/Onboarding/Tabbed/ViewOnlyWallet.tsx
@@ -65,6 +65,15 @@ export default function ViewOnlyWallet(): ReactElement {
     setRedirect(true)
   }, [dispatch, addressOnNetwork, isValidating])
 
+  const preventSubmitOnEnter = useCallback(
+    (event: React.KeyboardEvent<HTMLButtonElement>) => {
+      if (event.key === "Enter" && isValidating) {
+        event.preventDefault()
+      }
+    },
+    [isValidating],
+  )
+
   // Redirect to the final onboarding tab once an account is set
   if (redirect) {
     return <Redirect to={OnboardingRoutes.ONBOARDING_COMPLETE} />
@@ -102,7 +111,8 @@ export default function ViewOnlyWallet(): ReactElement {
             type="primary"
             size="large"
             onClick={handleSubmitViewOnlyAddress}
-            isDisabled={addressOnNetwork === undefined}
+            onKeyDown={preventSubmitOnEnter}
+            isDisabled={addressOnNetwork === undefined || isValidating}
             showLoadingOnClick
             center
             isFormSubmit