Merge pull request #194 from IFRCGo/fix/subscription-admin

Fix admin1 condition
IFRCGo · Dec 9, 2024 · 3ec6212 · 3ec6212
2 parents 115872f + a60cf39
commit 3ec6212
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git 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"
     }
 }
diff --git 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
@@ -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