From a9732657959a2a055ea67a2a045a50c2067ee10d Mon Sep 17 00:00:00 2001
From: Tagaishi <tagaishi@hotmail.ch>
Date: Sun, 13 Aug 2023 22:24:46 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=8C=90=20App=20validation=20errors?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/locales/en/layout/modals/add-app.json         |  8 +++++++-
 .../Dashboard/Modals/EditAppModal/EditAppModal.tsx   | 12 ++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/public/locales/en/layout/modals/add-app.json b/public/locales/en/layout/modals/add-app.json
index 6a7670617..683ba8724 100644
--- a/public/locales/en/layout/modals/add-app.json
+++ b/public/locales/en/layout/modals/add-app.json
@@ -99,6 +99,12 @@
 		}
 	},
 	"validation": {
-		"popover": "Your form contains invalid data. Hence, it can't be saved. Please resolve all issues and click this button again to save your changes"
+		"popover": "Your form contains invalid data. Hence, it can't be saved. Please resolve all issues and click this button again to save your changes",
+		"name": "Name is required",
+		"noUrl": "Url is required",
+		"invalidUrl": "Value is not a valid url",
+		"noIconUrl": "This field is required",
+		"noExternalUri": "External URI is required",
+		"invalidExternalUri": "External URI is not a valid uri"
 	}
 }
diff --git a/src/components/Dashboard/Modals/EditAppModal/EditAppModal.tsx b/src/components/Dashboard/Modals/EditAppModal/EditAppModal.tsx
index 34ab62500..782cc047e 100644
--- a/src/components/Dashboard/Modals/EditAppModal/EditAppModal.tsx
+++ b/src/components/Dashboard/Modals/EditAppModal/EditAppModal.tsx
@@ -47,14 +47,14 @@ export const EditAppModal = ({
   const form = useForm<AppType>({
     initialValues: innerProps.app,
     validate: {
-      name: (name) => (!name ? 'Name is required' : null),
+      name: (name) => (!name ? t('validation.name') : null),
       url: (url) => {
         if (!url) {
-          return 'Url is required';
+          return t('validation.noUrl');
         }
 
         if (!url.match(appUrlRegex)) {
-          return 'Value is not a valid url';
+          return t('validation.invalidUrl');
         }
 
         return null;
@@ -62,7 +62,7 @@ export const EditAppModal = ({
       appearance: {
         iconUrl: (url: string) => {
           if (url.length < 1) {
-            return 'This field is required';
+            return t('validation.noIconUrl');
           }
 
           return null;
@@ -71,11 +71,11 @@ export const EditAppModal = ({
       behaviour: {
         externalUrl: (url: string) => {
           if (url === undefined || url.length < 1) {
-            return 'External URI is required';
+            return t('validation.noExternalUri');
           }
 
           if (!url.match(appUrlWithAnyProtocolRegex)) {
-            return 'External URI is not a valid uri';
+            return t('validation.invalidExternalUri');
           }
 
           return null;