Merge branch 'developer' into feature/chat

src/app/pages/chat/new-group/new-group.page.html

@@ -3,7 +3,9 @@
     <div class="main-header">
       <div class="title-content">
         <div class="left">
-          <ion-icon (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+          <button class="btn-no-color" (click)="close()">
+            <ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+          </button>
         </div>
         <div class="middle">
           <ion-label class="title">Novo Grupo</ion-label>

src/app/pages/login/login.page.ts

@@ -11,7 +11,7 @@ import { PhotoService } from 'src/app/services/photo.service';
 import { NotificationsService } from 'src/app/services/notifications.service';
 import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
 import { Token } from '../../models/token.model';
-import { FCM } from 'cordova-plugin-fcm-with-dependecy-updated/ionic/ngx';
+//import { FCM } from 'cordova-plugin-fcm-with-dependecy-updated/ionic/ngx';
 
 /* import { Plugins, PushNotification, PushNotificationToken, PushNotificationActionPerformed } from '@capacitor/core';
 
@@ -40,7 +40,8 @@ export class LoginPage implements OnInit {
     private toastService: ToastService,
     private photoService: PhotoService,
     public alertController: AlertController,
-    private fcm: FCM) { }
+    //private fcm: FCM
+    ) { }
 
   ngOnInit() {