Fixe merge and improve sucess message

src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts

@@ -17,6 +17,7 @@ import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart
 import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
 import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component';
 import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component';
+import { ToastService } from 'src/app/services/toast.service';
 
 @Component({
   selector: 'app-expediente-detail',
@@ -49,6 +50,7 @@ export class ExpedienteDetailPage implements OnInit {
     private alertService: AlertService,
     public popoverController: PopoverController,
     private activatedRoute: ActivatedRoute,
+    private toastService: ToastService,
     ) {
       this.activatedRoute.queryParams.subscribe(params => {
         if(params["serialNumber"]) {
@@ -80,6 +82,10 @@ export class ExpedienteDetailPage implements OnInit {
     this.modalController.dismiss();
   }
 
+  showToast(){
+    this.toastService.presentToast('Não foi possível fazer login"');
+  }
+
   goBack(){
     let navigationExtras: NavigationExtras = {
       queryParams: {
@@ -219,21 +225,28 @@ export class ExpedienteDetailPage implements OnInit {
     });
     
     await modal.present();
-    modal.onDidDismiss().then(res=>{
+    modal.onDidDismiss().then( async (res)=>{
       console.log(res['data']);
       console.log(body);
 
       if(body == 'descartar'){
         if(res['data']== 'Yes'){
           let otherbody = {
-            "serialNumber": body.serialNumber,
+            "serialNumber": this.task.SerialNumber,
             "action": "Passivo",
             "ActionTypeId": 94,
             "dataFields": {
               "Note": "",
             }
           }
-          this.processes.CompleteTask(otherbody);
+
+          try {          
+            await this.processes.CompleteTask(otherbody).toPromise()
+            this.successMessage()
+          } catch (error) {
+            this.badRequest()
+          }
+
         }
         else if(res['data'] == 'No'){
           //Do nothing
@@ -241,14 +254,26 @@ export class ExpedienteDetailPage implements OnInit {
       }
       else{
         if(res['data']== 'Yes'){
-          this.processes.CompleteTask(body);
+          try {          
+            await this.processes.CompleteTask(body).toPromise()
+            this.successMessage()
+          } catch (error) {
+            this.badRequest()
+          }
+
           
           this.goBack();
         }
         else if(res['data'] == 'No'){
           console.log('Update');
           
-          this.processes.UpdateTaskStatus(this.task.FolderId);
+          
+          try {
+            await this.processes.UpdateTaskStatus(this.task.FolderId);
+            this.successMessage()
+          } catch (error) {
+            this.badRequest()
+          }
         }
       }
     });