Fix submit form on enter key pressed (actualbudget#1634)

FlorianLang06 · Sep 5, 2023 · 1a22f5c · 1a22f5c
1 parent 5a58b30
commit 1a22f5c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/packages/desktop-client/src/components/common/Button.tsx b/packages/desktop-client/src/components/common/Button.tsx
@@ -143,8 +143,9 @@ const Button = forwardRef<HTMLButtonElement, ButtonProps>(
         {...(typeof as === 'string'
           ? // eslint-disable-next-line @typescript-eslint/no-explicit-any
             (css(buttonStyle) as any)
-          : { style: buttonStyle, type: isSubmit ? 'submit' : 'button' })}
+          : { style: buttonStyle })}
         disabled={disabled}
+        type={isSubmit ? 'submit' : 'button'}
         {...nativeProps}
       >
         {children}

diff --git a/packages/desktop-client/src/components/modals/FixEncryptionKey.js b/packages/desktop-client/src/components/modals/FixEncryptionKey.js
@@ -127,7 +127,7 @@ export default function FixEncryptionKey({
               <Button
                 style={{ marginRight: 10 }}
                 onClick={() => modalProps.onBack()}
-                type="button"
+                type="normal"
               >
                 Back
               </Button>

diff --git a/upcoming-release-notes/1634.md b/upcoming-release-notes/1634.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [syukronrm]
+---
+
+Fix pressing Enter on Encryption Key cancels entry instead of update the key