From 108daedff5fe7c97e7505ead620a14e0f76d7118 Mon Sep 17 00:00:00 2001
From: Syukron Rifa'il Muttaqi <syukronrifai@gmail.com>
Date: Tue, 5 Sep 2023 14:34:34 +0700
Subject: [PATCH] Fix submit form on enter key pressed (#1634)
---
packages/desktop-client/src/components/common/Button.tsx | 3 ++-
.../src/components/modals/FixEncryptionKey.js | 2 +-
upcoming-release-notes/1634.md | 6 ++++++
3 files changed, 9 insertions(+), 2 deletions(-)
create mode 100644 upcoming-release-notes/1634.md
diff --git a/packages/desktop-client/src/components/common/Button.tsx b/packages/desktop-client/src/components/common/Button.tsx
index 6b5355d7e..a619b4d19 100644
--- 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
index 099bd3498..e8edc6237 100644
--- 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
new file mode 100644
index 000000000..0df21feae
--- /dev/null
+++ 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
--
GitLab