From f72a62be05a816f60569c60c0d6d077dc37f7ea5 Mon Sep 17 00:00:00 2001
From: Josh <37798644+joshuaellis@users.noreply.github.com>
Date: Thu, 8 Jun 2023 09:59:10 +0100
Subject: [PATCH] fix: error message improvements (#16949)

---
 .../admin/admin/src/content-manager/pages/EditView/index.js     | 1 +
 .../core/content-manager/server/controllers/collection-types.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/core/admin/admin/src/content-manager/pages/EditView/index.js b/packages/core/admin/admin/src/content-manager/pages/EditView/index.js
index b4eb94d62e..8edea8fc74 100644
--- a/packages/core/admin/admin/src/content-manager/pages/EditView/index.js
+++ b/packages/core/admin/admin/src/content-manager/pages/EditView/index.js
@@ -53,6 +53,7 @@ const EditView = ({ allowedActions, isSingleType, goBack, slug, id, origin, user
       toggleNotification({
         type: 'warning',
         message: location.state.error,
+        timeout: 5000,
       });
     }
   });
diff --git a/packages/core/content-manager/server/controllers/collection-types.js b/packages/core/content-manager/server/controllers/collection-types.js
index d9068c2c3c..0f29a661ee 100644
--- a/packages/core/content-manager/server/controllers/collection-types.js
+++ b/packages/core/content-manager/server/controllers/collection-types.js
@@ -169,7 +169,7 @@ module.exports = {
     // and model has unique or relational fields
     if (isEmpty(body) && hasProhibitedCloningFields(model)) {
       throw new ApplicationError(
-        'Failed to clone entity. There are prohibited fields to be manually addressed.'
+        'Entity could not be cloned as it has unique and/or relational fields. Please edit those fields manually and save to complete the cloning.'
       );
     }