From 9656ec55234330c613f0301206d9ca7dc20fbbb3 Mon Sep 17 00:00:00 2001
From: Shivam Kumar Singh <shivamhere247@gmail.com>
Date: Thu, 2 Dec 2021 15:44:49 +0530
Subject: [PATCH 1/2] fix: #5886

---
 src/shared/components/Settings/Tools/Software/index.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shared/components/Settings/Tools/Software/index.jsx b/src/shared/components/Settings/Tools/Software/index.jsx
index a1bc02e312..42b5cdef39 100644
--- a/src/shared/components/Settings/Tools/Software/index.jsx
+++ b/src/shared/components/Settings/Tools/Software/index.jsx
@@ -380,7 +380,7 @@ export default class Software extends ConsentComponent {
                 <input disabled={!canModifyTrait} id="name" name="name" type="text" placeholder="Name" onChange={this.onUpdateInput} value={newSoftware.name} maxLength="64" required />
                 {
                   isSubmit && (
-                    <ErrorMessage invalid={_.isEmpty(newSoftware.name) && formInvalid} message="Name cannot be empty" />
+                    <ErrorMessage invalid={(_.isEmpty(newSoftware.name) && formInvalid) || (!_.isEmpty(newSoftware.name) && _.isEmpty(newSoftware.name.trim()))} message="Name cannot be empty" />
                   )
                 }
               </div>

From 1e5883ebbdbe5a8c3975f6df1e4a62a896a240cb Mon Sep 17 00:00:00 2001
From: Shivam Kumar Singh <shivamhere247@gmail.com>
Date: Fri, 3 Dec 2021 20:37:01 +0530
Subject: [PATCH 2/2] fix: #5886 trim software names

---
 src/shared/components/Settings/Tools/Software/index.jsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/shared/components/Settings/Tools/Software/index.jsx b/src/shared/components/Settings/Tools/Software/index.jsx
index 42b5cdef39..0ffad3a6e4 100644
--- a/src/shared/components/Settings/Tools/Software/index.jsx
+++ b/src/shared/components/Settings/Tools/Software/index.jsx
@@ -176,6 +176,8 @@ export default class Software extends ConsentComponent {
     const {
       newSoftware, personalizationTrait, isEdit, indexNo,
     } = this.state;
+    
+    newSoftware.name = newSoftware.name.trim();
 
     const {
       handle,