merge made

src/app/pages/publications/new-publication/new-publication.page.ts

@@ -397,7 +397,13 @@ export class NewPublicationPage implements OnInit {
 
 
   close() {
-    alert('close');
+
+    alert('this.PublicationFromMvService.form.send'+ this.PublicationFromMvService.form.send)
+    if(this.PublicationFromMvService.form.send == false) {
+      this.PublicationFromMvService.cancel()
+      this.PublicationFromMvService.ObjectMergeNotification.close()
+    }
+
     this.modalController.dismiss(this.PublicationFromMvService.form).then(() => {
       this.showLoader = true;
     });

src/app/shared/publication/new-publication/new-publication.page.ts

@@ -87,7 +87,7 @@ export class NewPublicationPage implements OnInit {
     private SocketConnectionMCRService: SocketConnectionMCRService,
     private videoconvertService: VideoconvertService,
     public UploadStreamingService: UploadStreamingService,
-    private modalController: ModalController,
+    private modalController: ModalController
   ) {
     this.publicationTitle = 'Nova Publicação';
     this.PublicationFromMvService.clear()
@@ -380,6 +380,10 @@ export class NewPublicationPage implements OnInit {
 
 
   close() {
+    if(this.PublicationFromMvService.form.send == false) {
+      this.PublicationFromMvService.cancel()
+      this.PublicationFromMvService.ObjectMergeNotification.close()
+    }
     this.goBack();
   }
 

src/app/shared/publication/upload/publication-from-mv.service.ts

@@ -33,6 +33,7 @@ export class PublicationFromMvService {
   folderId: string
 
 
+
   constructor(
     private publications: PublicationsService,
     private toastService: ToastService,
@@ -41,6 +42,7 @@ export class PublicationFromMvService {
     private CMAPIService: CMAPIService,
     public publicationFolderService: PublicationFolderService,
     private platform: Platform,
+    private modalController: ModalController,
   ) {}
 
 
@@ -226,7 +228,6 @@ export class PublicationFromMvService {
 
   }
 
-
   closeApp() {
     if (window["sharedContent"]) {
       alert('close android')
@@ -236,6 +237,11 @@ export class PublicationFromMvService {
       } else {
         window["sharedContent"] = null
       }
+
+      if (this.platform.is('ios')) {
+        this.modalController.dismiss(this.form).then(() => {
+        });
+      }
     }
   }