Fix submit form on enter key pressed (#1634)

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}

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>

upcoming-release-notes/1634.md

+---
+category: Bugfix
+authors: [syukronrm]
+---
+
+Fix pressing Enter on Encryption Key cancels entry instead of update the key