Pull in upstream

NERC-CEH · Oct 14, 2024 · 0d27581 · 0d27581
2 parents ae0a138 + 1a1496d
commit 0d27581
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "id": "uk.ac.ceh.irecord.st.helena",
   "title": "iRecord St Helena App",
   "description": "iRecord mobile application.",
-  "version": "6.1.2",
+  "version": "6.1.3",
   "homepage": "https://irecordsthelena.edu.sh/",
   "scripts": {
     "prepare": "husky",

diff --git a/src/User/Login/Main.tsx b/src/User/Login/Main.tsx
@@ -43,6 +43,9 @@ const LoginMain = ({ onSubmit }: Props) => {
         </h2>
 
         <form onSubmit={handleSubmit(onSubmit)}>
+          {/* Fake onSubmit on Enter */}
+          <input type="submit" className="hidden" />
+
           <div className="rounded-list">
             <ControlledInput
               control={control}
@@ -78,7 +81,7 @@ const LoginMain = ({ onSubmit }: Props) => {
           <Button
             className={clsx('mx-auto mt-7', !formState.isValid && 'opacity-50')}
             color="primary"
-            type="submit"
+            onPress={() => handleSubmit(onSubmit)()}
           >
             Sign In
           </Button>

diff --git a/src/User/Register/Main.tsx b/src/User/Register/Main.tsx
@@ -40,7 +40,10 @@ const RegisterMain = ({ onSubmit }: Props) => {
           <T>Create a free account</T>
         </h1>
 
-        <form onSubmit={handleSubmit(onSubmit)} className="mt-8">
+        <form className="mt-8" onSubmit={handleSubmit(onSubmit)}>
+          {/* Fake onSubmit on Enter */}
+          <input type="submit" className="hidden" />
+
           <div className="rounded-list">
             <ControlledInput
               control={control}
@@ -96,7 +99,7 @@ const RegisterMain = ({ onSubmit }: Props) => {
               !formState.isValid && 'opacity-50'
             )}
             color="primary"
-            type="submit"
+            onPress={() => handleSubmit(onSubmit)()}
           >
             Sign Up
           </Button>

diff --git a/src/User/Reset/Main.tsx b/src/User/Reset/Main.tsx
@@ -29,6 +29,9 @@ const ResetMain = ({ onSubmit }: Props) => {
         </h2>
 
         <form onSubmit={handleSubmit(onSubmit)}>
+          {/* Fake onSubmit on Enter */}
+          <input type="submit" className="hidden" />
+
           <div className="rounded-list">
             <ControlledInput
               control={control}
@@ -42,7 +45,7 @@ const ResetMain = ({ onSubmit }: Props) => {
           <Button
             className={clsx('mx-auto my-8', !formState.isValid && 'opacity-50')}
             color="primary"
-            type="submit"
+            onPress={() => handleSubmit(onSubmit)()}
           >
             Reset
           </Button>