From 9208caec8e1dc79ec559e4743e5bedc8cdc8b428 Mon Sep 17 00:00:00 2001
From: Sarthakkad05 <kadsarthak33@gmail.com>
Date: Sat, 20 Sep 2025 10:29:59 +0530
Subject: [PATCH 1/4] Fix: Make TOTP field detectable by KeePassXC

---
 .env                                                        | 6 ++++++
 apps/meteor/client/views/account/security/TwoFactorTOTP.tsx | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 .env

diff --git a/.env b/.env
new file mode 100644
index 0000000000000..053c81cd53438
--- /dev/null
+++ b/.env
@@ -0,0 +1,6 @@
+# MongoDB connection
+MONGO_URL=mongodb://localhost:27017/rocketchat
+MONGO_OPLOG_URL=mongodb://localhost:27017/local
+
+# Optional: port for local dev
+PORT=3000
diff --git a/apps/meteor/client/views/account/security/TwoFactorTOTP.tsx b/apps/meteor/client/views/account/security/TwoFactorTOTP.tsx
index 1c7bac0937d0a..cac2628788262 100644
--- a/apps/meteor/client/views/account/security/TwoFactorTOTP.tsx
+++ b/apps/meteor/client/views/account/security/TwoFactorTOTP.tsx
@@ -158,7 +158,7 @@ const TwoFactorTOTP = (props: TwoFactorTOTPProps): ReactElement => {
 						<Field>
 							<FieldLabel htmlFor={totpCodeId}>{t('Enter_code_provided_by_authentication_app')}</FieldLabel>
 							<FieldRow>
-								<TextInput id={totpCodeId} mie='8px' {...register('authCode')} />
+								<TextInput id={totpCodeId} mie='8px' {...register('authCode')} autoComplete="one-time-code"/>
 								<Button primary onClick={handleSubmit(handleVerifyCode)}>
 									{t('Verify')}
 								</Button>

From 4f9a0c8f9aed71ca690285ec1df2385c02d3a945 Mon Sep 17 00:00:00 2001
From: Sarthakkad05 <kadsarthak33@gmail.com>
Date: Sat, 20 Sep 2025 10:31:43 +0530
Subject: [PATCH 2/4] Fix: Make TOTP field detectable by a KeePassXC

---
 .env | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 .env

diff --git a/.env b/.env
deleted file mode 100644
index 053c81cd53438..0000000000000
--- a/.env
+++ /dev/null
@@ -1,6 +0,0 @@
-# MongoDB connection
-MONGO_URL=mongodb://localhost:27017/rocketchat
-MONGO_OPLOG_URL=mongodb://localhost:27017/local
-
-# Optional: port for local dev
-PORT=3000

From dac11c9abf525f22d97de7a2133d0af0f44f62aa Mon Sep 17 00:00:00 2001
From: Douglas Fabris <devfabris@gmail.com>
Date: Mon, 13 Apr 2026 14:59:17 -0300
Subject: [PATCH 3/4] fix: review

---
 .../components/TwoFactorModal/TwoFactorEmailModal.tsx  | 10 +++++++++-
 .../components/TwoFactorModal/TwoFactorTotpModal.tsx   |  2 +-
 .../client/views/account/security/TwoFactorTOTP.tsx    |  2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/apps/meteor/client/components/TwoFactorModal/TwoFactorEmailModal.tsx b/apps/meteor/client/components/TwoFactorModal/TwoFactorEmailModal.tsx
index 3ef9a75b91667..7880d2f375594 100644
--- a/apps/meteor/client/components/TwoFactorModal/TwoFactorEmailModal.tsx
+++ b/apps/meteor/client/components/TwoFactorModal/TwoFactorEmailModal.tsx
@@ -65,7 +65,15 @@ const TwoFactorEmailModal = ({ onConfirm, onClose, emailOrUsername, invalidAttem
 						{t('Enter_the_code_we_just_emailed_you')}
 					</FieldLabel>
 					<FieldRow>
-						<TextInput id={id} ref={ref} value={code} onChange={onChange} placeholder={t('Enter_code_here')} />
+						<TextInput
+							id={id}
+							ref={ref}
+							value={code}
+							onChange={onChange}
+							placeholder={t('Enter_code_here')}
+							autoComplete='one-time-code'
+							inputMode='numeric'
+						/>
 					</FieldRow>
 					{invalidAttempt && <FieldError>{t('Invalid_password')}</FieldError>}
 				</Field>
diff --git a/apps/meteor/client/components/TwoFactorModal/TwoFactorTotpModal.tsx b/apps/meteor/client/components/TwoFactorModal/TwoFactorTotpModal.tsx
index 263c4222f1d05..539f21a5e2960 100644
--- a/apps/meteor/client/components/TwoFactorModal/TwoFactorTotpModal.tsx
+++ b/apps/meteor/client/components/TwoFactorModal/TwoFactorTotpModal.tsx
@@ -49,7 +49,7 @@ const TwoFactorTotpModal = ({ onConfirm, onClose, onDismiss, invalidAttempt }: T
 						{t('Enter_the_code_provided_by_your_authentication_app_to_continue')}
 					</FieldLabel>
 					<FieldRow>
-						<TextInput id={id} ref={ref} value={code} onChange={onChange} placeholder={t('Enter_code_here')}></TextInput>
+						<TextInput id={id} ref={ref} value={code} onChange={onChange} placeholder={t('Enter_code_here')} autoComplete="one-time-code" inputMode="numeric" />
 					</FieldRow>
 					{invalidAttempt && <FieldError>{t('Invalid_password')}</FieldError>}
 				</Field>
diff --git a/apps/meteor/client/views/account/security/TwoFactorTOTP.tsx b/apps/meteor/client/views/account/security/TwoFactorTOTP.tsx
index cac2628788262..1c7bac0937d0a 100644
--- a/apps/meteor/client/views/account/security/TwoFactorTOTP.tsx
+++ b/apps/meteor/client/views/account/security/TwoFactorTOTP.tsx
@@ -158,7 +158,7 @@ const TwoFactorTOTP = (props: TwoFactorTOTPProps): ReactElement => {
 						<Field>
 							<FieldLabel htmlFor={totpCodeId}>{t('Enter_code_provided_by_authentication_app')}</FieldLabel>
 							<FieldRow>
-								<TextInput id={totpCodeId} mie='8px' {...register('authCode')} autoComplete="one-time-code"/>
+								<TextInput id={totpCodeId} mie='8px' {...register('authCode')} />
 								<Button primary onClick={handleSubmit(handleVerifyCode)}>
 									{t('Verify')}
 								</Button>

From defd1efab157fe02d30bacbea5f17cccc16335c6 Mon Sep 17 00:00:00 2001
From: Douglas Fabris <devfabris@gmail.com>
Date: Mon, 13 Apr 2026 18:55:14 -0300
Subject: [PATCH 4/4] fix: lint

---
 .../components/TwoFactorModal/TwoFactorTotpModal.tsx   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/apps/meteor/client/components/TwoFactorModal/TwoFactorTotpModal.tsx b/apps/meteor/client/components/TwoFactorModal/TwoFactorTotpModal.tsx
index 539f21a5e2960..ff678c68f0603 100644
--- a/apps/meteor/client/components/TwoFactorModal/TwoFactorTotpModal.tsx
+++ b/apps/meteor/client/components/TwoFactorModal/TwoFactorTotpModal.tsx
@@ -49,7 +49,15 @@ const TwoFactorTotpModal = ({ onConfirm, onClose, onDismiss, invalidAttempt }: T
 						{t('Enter_the_code_provided_by_your_authentication_app_to_continue')}
 					</FieldLabel>
 					<FieldRow>
-						<TextInput id={id} ref={ref} value={code} onChange={onChange} placeholder={t('Enter_code_here')} autoComplete="one-time-code" inputMode="numeric" />
+						<TextInput
+							id={id}
+							ref={ref}
+							value={code}
+							onChange={onChange}
+							placeholder={t('Enter_code_here')}
+							autoComplete='one-time-code'
+							inputMode='numeric'
+						/>
 					</FieldRow>
 					{invalidAttempt && <FieldError>{t('Invalid_password')}</FieldError>}
 				</Field>