fix: fix issue with empty contact screen (#888)

* fixed issue with not trimmed names for contacts * minor fix * minor code improvements --------- Co-authored-by: ost-ptk <[email protected]> Co-authored-by: Vynnyk Dmytro <[email protected]>
make-software · Dec 13, 2023 · aaa5122 · aaa5122
1 parent ce0b3dc
commit aaa5122
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/src/apps/popup/pages/add-contact/index.tsx b/src/apps/popup/pages/add-contact/index.tsx
@@ -37,7 +37,11 @@ export const AddContactPage = () => {
     const lastModified = new Date().toISOString();
 
     dispatchToMainStore(
-      newContactAdded({ name, publicKey, lastModified: lastModified })
+      newContactAdded({
+        name: name.trim(),
+        publicKey,
+        lastModified
+      })
     ).finally(() => {
       setShowSuccessScreen(true);
     });

diff --git a/src/apps/popup/pages/contact-details/index.tsx b/src/apps/popup/pages/contact-details/index.tsx
@@ -91,9 +91,9 @@ export const ContactDetailsPage = () => {
     dispatchToMainStore(
       contactUpdated({
         oldName: contact.name,
-        name: newName,
-        publicKey: publicKey,
-        lastModified: lastModified
+        name: newName.trim(),
+        publicKey,
+        lastModified
       })
     ).finally(() => {
       navigate(RouterPath.ContactList);

diff --git a/src/libs/ui/forms/contact.ts b/src/libs/ui/forms/contact.ts
@@ -20,7 +20,8 @@ export const useContactForm = (
 ) => {
   const newContactFormSchema = Yup.object().shape({
     name: useContactNameRule(
-      value => value != null && !existingContactNames.includes(value)
+      value =>
+        value?.trim() != null && !existingContactNames.includes(value?.trim())
     ),
     publicKey: useContactPublicKeyRule()
   });