From 7b8f60561e39a991bb46edc2b6128fd604224460 Mon Sep 17 00:00:00 2001
From: ndolidze <n.dolidze@noxtton.com>
Date: Wed, 10 Jun 2026 11:46:04 +0400
Subject: [PATCH] Fix keyboard closing when user inputs hidden message

---
 .../CreateOrEditCreditCardContent.tsx         | 73 ++++++++-----------
 .../CreateOrEditIdentityContent.tsx           | 65 +++++++----------
 .../CreateRecord/CreateOrEditLoginContent.tsx | 63 +++++++---------
 .../CreateOrEditWifiPasswordContent.tsx       | 67 +++++++----------
 4 files changed, 107 insertions(+), 161 deletions(-)

diff --git a/src/screens/CreateRecord/CreateOrEditCreditCardContent.tsx b/src/screens/CreateRecord/CreateOrEditCreditCardContent.tsx
index 2d92cedc..1196f46e 100644
--- a/src/screens/CreateRecord/CreateOrEditCreditCardContent.tsx
+++ b/src/screens/CreateRecord/CreateOrEditCreditCardContent.tsx
@@ -136,7 +136,9 @@ export const CreateOrEditCreditCardContent = ({
         securityCode: initialRecord?.data?.securityCode ?? '',
         pinCode: initialRecord?.data?.pinCode ?? '',
         note: initialRecord?.data?.note ?? '',
-        customFields: initialRecord?.data?.customFields ?? [],
+        customFields: initialRecord?.data?.customFields?.length
+          ? initialRecord.data.customFields
+          : [{ type: 'note', note: '' }],
         folder: selectedFolder ?? initialRecord?.folder,
         attachments: getRecordAttachments(initialRecord)
       },
@@ -203,10 +205,6 @@ export const CreateOrEditCreditCardContent = ({
     removeItem: removeCustomField
   } = registerArray('customFields')
 
-  const handleFirstHiddenMessageChange = (value: string) => {
-    setValue('customFields', value ? [{ type: 'note', note: value }] : [])
-  }
-
   const handleExpireDateChange = (inputValue: string) => {
     let value = inputValue.replace(/\D/g, '')
 
@@ -385,45 +383,32 @@ export const CreateOrEditCreditCardContent = ({
           }
           testID="hidden-messages-multi-slot-input"
         >
-          {values.customFields.length
-            ? values.customFields.map(
-              (field, index) => (
-                <PasswordField
-                  key={index}
-                  label={t`Hidden Message`}
-                  value={field.note ?? ''}
-                  placeholder={t`Enter Hidden Message`}
-                  onChangeText={(val) =>
-                    setValue(`customFields[${index}].note`, val)
-                  }
-                  isGrouped
-                  testID={`hidden-messages-multi-slot-input-slot-${index}`}
-                  rightSlot={
-                    values.customFields.length > 1 ? (
-                      <Button
-                        size="small"
-                        variant="tertiary"
-                        aria-label="Delete hidden message"
-                        iconBefore={
-                          <TrashOutlined color={theme.colors.colorTextPrimary} />
-                        }
-                        onClick={() => removeCustomField(index)}
-                      />
-                    ) : undefined
-                  }
-                />
-              )
-            )
-            : (
-              <PasswordField
-                label={t`Hidden Message`}
-                value=""
-                placeholder={t`Enter Hidden Message`}
-                onChangeText={handleFirstHiddenMessageChange}
-                isGrouped
-                testID="hidden-messages-multi-slot-input-slot-0"
-              />
-            )}
+          {values.customFields.map((field, index) => (
+            <PasswordField
+              key={index}
+              label={t`Hidden Message`}
+              value={field.note ?? ''}
+              placeholder={t`Enter Hidden Message`}
+              onChangeText={(val) =>
+                setValue(`customFields[${index}].note`, val)
+              }
+              isGrouped
+              testID={`hidden-messages-multi-slot-input-slot-${index}`}
+              rightSlot={
+                values.customFields.length > 1 ? (
+                  <Button
+                    size="small"
+                    variant="tertiary"
+                    aria-label="Delete hidden message"
+                    iconBefore={
+                      <TrashOutlined color={theme.colors.colorTextPrimary} />
+                    }
+                    onClick={() => removeCustomField(index)}
+                  />
+                ) : undefined
+              }
+            />
+          ))}
         </MultiSlotInput>
       </View>
     </Layout>
diff --git a/src/screens/CreateRecord/CreateOrEditIdentityContent.tsx b/src/screens/CreateRecord/CreateOrEditIdentityContent.tsx
index 6e95e534..8d3de41a 100644
--- a/src/screens/CreateRecord/CreateOrEditIdentityContent.tsx
+++ b/src/screens/CreateRecord/CreateOrEditIdentityContent.tsx
@@ -263,7 +263,9 @@ export const CreateOrEditIdentityContent = ({
       region: initialRecord?.data?.region ?? '',
       country: initialRecord?.data?.country ?? '',
       note: initialRecord?.data?.note ?? '',
-      customFields: initialRecord?.data?.customFields ?? [],
+      customFields: initialRecord?.data?.customFields?.length
+          ? initialRecord.data.customFields
+          : [{ type: 'note', note: '' }],
       folder: selectedFolder ?? initialRecord?.folder ?? '',
       passportFullName: initialRecord?.data?.passportFullName ?? '',
       passportNumber: initialRecord?.data?.passportNumber ?? '',
@@ -318,10 +320,6 @@ export const CreateOrEditIdentityContent = ({
     removeItem: removeCustomField
   } = registerArray('customFields')
 
-  const handleFirstHiddenMessageChange = (value: string) => {
-    setValue('customFields', value ? [{ type: 'note', note: value }] : [])
-  }
-
   const identityAttachmentSources = useMemo(
     () =>
       buildIdentityAttachmentSources({
@@ -739,45 +737,34 @@ export const CreateOrEditIdentityContent = ({
           }
           testID="hidden-messages-multi-slot-input"
         >
-          {(values.customFields as Array<{ type: string; note?: string }>).length
-            ? (values.customFields as Array<{ type: string; note?: string }>).map(
-                (field, index) => (
-                  <PasswordField
-                    key={`${field.type}-${index}`}
-                    label={t`Hidden Message`}
-                    value={field.note ?? ''}
-                    placeholder={t`Enter Hidden Message`}
-                    onChangeText={(val) =>
-                      setValue(`customFields[${index}].note`, val)
-                    }
-                    isGrouped
-                    testID={`hidden-messages-multi-slot-input-slot-${index}`}
-                    rightSlot={
-                      (values.customFields as Array<{ type: string; note?: string }>).length > 1 ? (
-                        <Button
-                          size="small"
-                          variant="tertiary"
-                          aria-label="Delete hidden message"
-                          iconBefore={
-                            <TrashOutlined color={theme.colors.colorTextPrimary} />
-                          }
-                          onClick={() => removeCustomField(index)}
-                        />
-                      ) : undefined
-                    }
-                  />
-                )
-              )
-            : (
+          {(values.customFields as Array<{ type: string; note?: string }>).map(
+            (field, index) => (
               <PasswordField
+                key={`${field.type}-${index}`}
                 label={t`Hidden Message`}
-                value=""
+                value={field.note ?? ''}
                 placeholder={t`Enter Hidden Message`}
-                onChangeText={handleFirstHiddenMessageChange}
+                onChangeText={(val) =>
+                  setValue(`customFields[${index}].note`, val)
+                }
                 isGrouped
-                testID="hidden-messages-multi-slot-input-slot-0"
+                testID={`hidden-messages-multi-slot-input-slot-${index}`}
+                rightSlot={
+                  (values.customFields as Array<{ type: string; note?: string }>).length > 1 ? (
+                    <Button
+                      size="small"
+                      variant="tertiary"
+                      aria-label="Delete hidden message"
+                      iconBefore={
+                        <TrashOutlined color={theme.colors.colorTextPrimary} />
+                      }
+                      onClick={() => removeCustomField(index)}
+                    />
+                  ) : undefined
+                }
               />
-            )}
+            )
+          )}
         </MultiSlotInput>
       </View>
     </Layout>
diff --git a/src/screens/CreateRecord/CreateOrEditLoginContent.tsx b/src/screens/CreateRecord/CreateOrEditLoginContent.tsx
index 4229e8b2..7355b4ee 100644
--- a/src/screens/CreateRecord/CreateOrEditLoginContent.tsx
+++ b/src/screens/CreateRecord/CreateOrEditLoginContent.tsx
@@ -178,7 +178,9 @@ export const CreateOrEditLoginContent = ({
         websites: initialRecord?.data?.websites?.length
           ? initialRecord.data.websites.map((website) => ({ website }))
           : [{ website: '' }],
-        customFields: initialRecord?.data?.customFields ?? [],
+        customFields: initialRecord?.data?.customFields?.length
+          ? initialRecord.data.customFields
+          : [{ type: 'note', note: '' }],
         folder: selectedFolder ?? initialRecord?.folder,
         attachments: getRecordAttachments(initialRecord),
         credential: initialRecord?.data?.credential?.id ?? '',
@@ -268,10 +270,6 @@ export const CreateOrEditLoginContent = ({
     removeItem: removeCustomField
   } = registerArray('customFields')
 
-  const handleFirstHiddenMessageChange = (value: string) => {
-    setValue('customFields', value ? [{ type: 'note', note: value }] : [])
-  }
-
   const openPasswordGenerator = () => {
     Keyboard.dismiss()
     navigation.navigate('CreatePasswordItem', {
@@ -505,39 +503,28 @@ export const CreateOrEditLoginContent = ({
           errorMessage={(errors as Record<string, { error?: { note?: string } }[]>)?.customFields?.find(Boolean)?.error?.note}
           testID="hidden-messages-multi-slot-input"
         >
-          {values.customFields.length
-            ? values.customFields.map((field, index) => (
-              <PasswordField
-                key={index}
-                label={t`Hidden Message`}
-                value={field.note ?? ''}
-                placeholder={t`Enter Hidden Message`}
-                onChangeText={(val) => setValue(`customFields[${index}].note`, val)}
-                isGrouped
-                testID={`hidden-messages-multi-slot-input-slot-${index}`}
-                rightSlot={
-                  values.customFields.length > 1 ? (
-                    <Button
-                      size='small'
-                      variant="tertiary"
-                      aria-label="Delete hidden message"
-                      iconBefore={<TrashOutlined color={theme.colors.colorTextPrimary} />}
-                      onClick={() => removeCustomField(index)}
-                    />
-                  ) : undefined
-                }
-              />
-            ))
-            : (
-              <PasswordField
-                label={t`Hidden Message`}
-                value=""
-                placeholder={t`Enter Hidden Message`}
-                onChangeText={handleFirstHiddenMessageChange}
-                isGrouped
-                testID="hidden-messages-multi-slot-input-slot-0"
-              />
-            )}
+          {values.customFields.map((field, index) => (
+            <PasswordField
+              key={index}
+              label={t`Hidden Message`}
+              value={field.note ?? ''}
+              placeholder={t`Enter Hidden Message`}
+              onChangeText={(val) => setValue(`customFields[${index}].note`, val)}
+              isGrouped
+              testID={`hidden-messages-multi-slot-input-slot-${index}`}
+              rightSlot={
+                values.customFields.length > 1 ? (
+                  <Button
+                    size='small'
+                    variant="tertiary"
+                    aria-label="Delete hidden message"
+                    iconBefore={<TrashOutlined color={theme.colors.colorTextPrimary} />}
+                    onClick={() => removeCustomField(index)}
+                  />
+                ) : undefined
+              }
+            />
+          ))}
         </MultiSlotInput>
       </View>
     </Layout>
diff --git a/src/screens/CreateRecord/CreateOrEditWifiPasswordContent.tsx b/src/screens/CreateRecord/CreateOrEditWifiPasswordContent.tsx
index 88427313..8d1c0f41 100644
--- a/src/screens/CreateRecord/CreateOrEditWifiPasswordContent.tsx
+++ b/src/screens/CreateRecord/CreateOrEditWifiPasswordContent.tsx
@@ -96,7 +96,9 @@ export const CreateOrEditWifiPasswordContent = ({
         title: initialRecord?.data?.title ?? '',
         password: initialRecord?.data?.password ?? '',
         note: initialRecord?.data?.note ?? '',
-        customFields: initialRecord?.data?.customFields ?? [],
+        customFields: initialRecord?.data?.customFields?.length
+          ? initialRecord.data.customFields
+          : [{ type: 'note', note: '' }],
         folder: selectedFolder ?? initialRecord?.folder
       },
       validate: (formValues) => schema.validate(formValues)
@@ -149,10 +151,6 @@ export const CreateOrEditWifiPasswordContent = ({
     removeItem: removeCustomField
   } = registerArray('customFields')
 
-  const handleFirstHiddenMessageChange = (value: string) => {
-    setValue('customFields', value ? [{ type: 'note', note: value }] : [])
-  }
-
   const openPasswordGenerator = () => {
     Keyboard.dismiss()
     navigation.navigate('CreatePasswordItem', {
@@ -254,46 +252,35 @@ export const CreateOrEditWifiPasswordContent = ({
           }
           testID="hidden-messages-multi-slot-input"
         >
-          {(values.customFields as Array<{ type: string; note: string }>).length
-            ? (values.customFields as Array<{ type: string; note: string }>).map(
-              (field, index) => (
-                <PasswordField
-                  key={index}
-                  label={t`Hidden Message`}
-                  value={field.note ?? ''}
-                  placeholder={t`Enter Hidden Message`}
-                  onChangeText={(val) =>
-                    setValue(`customFields[${index}].note`, val)
-                  }
-                  isGrouped
-                  testID={`hidden-messages-multi-slot-input-slot-${index}`}
-                  rightSlot={
-                    (values.customFields as Array<{ type: string; note: string }>)
-                      .length > 1 ? (
-                      <Button
-                        size="small"
-                        variant="tertiary"
-                        aria-label="Delete hidden message"
-                        iconBefore={
-                          <TrashOutlined color={theme.colors.colorTextPrimary} />
-                        }
-                        onClick={() => removeCustomField(index)}
-                      />
-                    ) : undefined
-                  }
-                />
-              )
-            )
-            : (
+          {(values.customFields as Array<{ type: string; note: string }>).map(
+            (field, index) => (
               <PasswordField
+                key={index}
                 label={t`Hidden Message`}
-                value=""
+                value={field.note ?? ''}
                 placeholder={t`Enter Hidden Message`}
-                onChangeText={handleFirstHiddenMessageChange}
+                onChangeText={(val) =>
+                  setValue(`customFields[${index}].note`, val)
+                }
                 isGrouped
-                testID="hidden-messages-multi-slot-input-slot-0"
+                testID={`hidden-messages-multi-slot-input-slot-${index}`}
+                rightSlot={
+                  (values.customFields as Array<{ type: string; note: string }>)
+                    .length > 1 ? (
+                    <Button
+                      size="small"
+                      variant="tertiary"
+                      aria-label="Delete hidden message"
+                      iconBefore={
+                        <TrashOutlined color={theme.colors.colorTextPrimary} />
+                      }
+                      onClick={() => removeCustomField(index)}
+                    />
+                  ) : undefined
+                }
               />
-            )}
+            )
+          )}
         </MultiSlotInput>
       </View>
     </Layout>