From a60cf39f96ff9c23f24a67b8530a0fcf9e869426 Mon Sep 17 00:00:00 2001
From: barshathakuri <barshathakuri708@gmail.com>
Date: Mon, 9 Dec 2024 16:03:12 +0545
Subject: [PATCH] Fix admin1 condition

---
 src/views/Home/AlertsTable/AlertActions/i18n.json | 3 ++-
 src/views/Home/AlertsTable/AlertActions/index.tsx | 2 +-
 src/views/NewSubscriptionModal/index.tsx          | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/views/Home/AlertsTable/AlertActions/i18n.json b/src/views/Home/AlertsTable/AlertActions/i18n.json
index 231b6a33..c11d5de1 100644
--- a/src/views/Home/AlertsTable/AlertActions/i18n.json
+++ b/src/views/Home/AlertsTable/AlertActions/i18n.json
@@ -1,6 +1,7 @@
 {
     "namespace": "alertActions",
     "strings": {
-        "alertTableViewDetailsTitle":"View Details"
+        "alertTableViewDetailsTitle": "View Details",
+        "alertCopyAlertURL": "Copy alert URL"
     }
 }
\ No newline at end of file
diff --git a/src/views/Home/AlertsTable/AlertActions/index.tsx b/src/views/Home/AlertsTable/AlertActions/index.tsx
index aa20e83a..950665dc 100644
--- a/src/views/Home/AlertsTable/AlertActions/index.tsx
+++ b/src/views/Home/AlertsTable/AlertActions/index.tsx
@@ -45,7 +45,7 @@ function AlertActions(props: Props) {
                 name={undefined}
                 onClick={handleClick}
                 variant="tertiary"
-                title="Copy alert URL"
+                title={strings.alertCopyAlertURL}
             >
                 <CopyLineIcon />
             </Button>
diff --git a/src/views/NewSubscriptionModal/index.tsx b/src/views/NewSubscriptionModal/index.tsx
index 9565d71f..3af7e941 100644
--- a/src/views/NewSubscriptionModal/index.tsx
+++ b/src/views/NewSubscriptionModal/index.tsx
@@ -288,6 +288,7 @@ function NewSubscriptionModal(props: Props) {
     }), [subscription]);
 
     const {
+        pristine,
         value,
         setFieldValue,
         error: formError,
@@ -315,11 +316,11 @@ function NewSubscriptionModal(props: Props) {
                 }
 
                 if (response.ok) {
-                    onCloseModal();
                     alert.show(
                         strings.newSubscriptionCreatedSuccessfully,
                         { variant: 'success' },
                     );
+                    onCloseModal();
                     if (onSuccess) {
                         onSuccess();
                     }
@@ -466,7 +467,7 @@ function NewSubscriptionModal(props: Props) {
                 <Button
                     name={undefined}
                     onClick={handleFormSubmit}
-                    disabled={isNotDefined(value.name) && loadingSubscription}
+                    disabled={pristine || loadingSubscription}
                 >
                     {strings.createNewSubscription}
                 </Button>
@@ -552,7 +553,6 @@ function NewSubscriptionModal(props: Props) {
                     value={value.filterAlertAdmin1s}
                     onChange={setFieldValue}
                     error={getErrorString(fieldError?.filterAlertAdmin1s)}
-                    withAsterisk
                 />
             </div>
             <Checkbox