Merge branch 'master' into banner-update

glific · Jul 10, 2024 · 687b3f9 · 687b3f9
2 parents 316e566 + 23c8ad1
commit 687b3f9
Show file tree

Hide file tree

Showing 10 changed files with 455 additions and 232 deletions.
diff --git a/.github/workflows/cypress-testing.yml b/.github/workflows/cypress-testing.yml
@@ -96,7 +96,7 @@ jobs:
           git clone https://github.com/glific/cypress-testing.git
           echo done. go to dir.
           cd cypress-testing
-          git checkout collections-management
+          git checkout main
           cd ..
           cp -r cypress-testing/cypress cypress
           yarn add cypress@13.6.2

diff --git a/src/containers/Form/FormLayout.tsx b/src/containers/Form/FormLayout.tsx
@@ -240,7 +240,7 @@ export const FormLayout = ({
       let itemUpdatedObject: any = Object.keys(data)[0];
       itemUpdatedObject = data[itemUpdatedObject];
       const updatedItem = itemUpdatedObject[listItem];
-      const { errors } = itemUpdatedObject;
+      const { errors, message } = itemUpdatedObject;
 
       if (errors) {
         if (customHandler) {
@@ -273,7 +273,7 @@ export const FormLayout = ({
         }
         // emit data after save
         if (afterSave) {
-          afterSave(data, saveClick);
+          afterSave(data, saveClick, message);
         }
       }
       onSaveClick(false);

diff --git a/src/containers/InteractiveMessage/InteractiveMessage.module.css b/src/containers/InteractiveMessage/InteractiveMessage.module.css
@@ -11,3 +11,7 @@
 .Simulator > div {
   top: 200px !important;
 }
+
+.DialogContent {
+  text-align: center;
+}