fix merge

This commit is contained in:
Peter Maquiran
2023-03-10 11:47:53 +01:00
28 changed files with 113 additions and 37 deletions
@@ -5,6 +5,9 @@ import { ToastService } from 'src/app/services/toast.service';
import { ThemeService } from 'src/app/services/theme.service'
import { SetRoomOwnerPage } from 'src/app/modals/set-room-owner/set-room-owner.page';
import { ChatSystemService } from 'src/app/services/chat/chat-system.service';
import { HttpErrorResponse } from '@angular/common/http';
import { SessionStore } from 'src/app/store/session.service';
import { GroupContactsPage } from '../../chat/group-messages/group-contacts/group-contacts.page';
@Component({
@@ -17,6 +20,7 @@ export class ChatPopoverPage implements OnInit {
room: any;
members:any;
isAdmin = false;
isGroupCreated: boolean;
constructor(
private popoverController: PopoverController,