diff --git a/src/app/pages/chat/edit-group/edit-group.page.ts b/src/app/pages/chat/edit-group/edit-group.page.ts index 206348eff..fad5bc5f5 100644 --- a/src/app/pages/chat/edit-group/edit-group.page.ts +++ b/src/app/pages/chat/edit-group/edit-group.page.ts @@ -37,7 +37,12 @@ export class EditGroupPage implements OnInit { this.chatService.getRoomInfo(this.roomId).subscribe(room=>{ this.room = room['room']; - this.groupName = this.room.name.split('-').join(' '); + try { + this.groupName = this.room.name.split('-').join(' '); + } catch(error) { + this.groupName = this.room.name; + } + }); } diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts index dee43b41c..49f1ef6a6 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.ts +++ b/src/app/pages/chat/group-messages/group-messages.page.ts @@ -381,7 +381,12 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { // console.log('ROOM',room) this.room = room['room']; if (this.room.name) { - this.roomName = this.room.name.split('-').join(' '); + try { + this.roomName = this.room.name.split('-').join(' '); + } catch (error) { + this.roomName = this.room.name; + } + } diff --git a/src/app/shared/chat/edit-group/edit-group.page.ts b/src/app/shared/chat/edit-group/edit-group.page.ts index dcd9ec80d..498b99b1a 100644 --- a/src/app/shared/chat/edit-group/edit-group.page.ts +++ b/src/app/shared/chat/edit-group/edit-group.page.ts @@ -42,7 +42,12 @@ export class EditGroupPage implements OnInit { this.chatService.getRoomInfo(this.roomId).subscribe(room=>{ this.room = room['room']; - this.groupName = this.room.name.split('-').join(' '); + try { + this.groupName = this.room.name.split('-').join(' '); + } catch (error) { + this.groupName = this.room.name; + } + }); } diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts index 4dee1f1e9..d6b9e08e8 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.ts +++ b/src/app/shared/chat/group-messages/group-messages.page.ts @@ -1,4 +1,4 @@ -import { Component, OnChanges, OnInit, Input, SimpleChanges, ChangeDetectorRef, Output, EventEmitter, ViewChild, ElementRef, AfterViewInit, OnDestroy } from '@angular/core'; +import { Component, OnChanges, OnInit, Input, SimpleChanges, ChangeDetectorRef, Output, EventEmitter, ViewChild, ElementRef, AfterViewInit, OnDestroy, ComponentFactoryResolver } from '@angular/core'; import { AnimationController, ModalController, PopoverController, Platform } from '@ionic/angular'; import { AlertService } from 'src/app/services/alert.service'; import { AuthService } from 'src/app/services/auth.service'; @@ -411,7 +411,12 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe // console.log('ROOM',room) this.room = room['room']; if (this.room.name) { - this.roomName = this.room.name.split('-').join(' '); + try { + this.roomName = this.room.name.split('-').join(' '); + } catch (error) { + this.roomName = this.room.name; + } + } @@ -591,7 +596,14 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe this.openEditGroupPage.emit(this.roomId); } else { - this.roomName = res.data.name.split('-').join(' '); + try { + this.roomName = res.data.name.split('-').join(' '); + } catch (error) { + console.log(error); + console.log(res.data) + this.roomName = res.data.name + + } }; diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts index 11af6dff5..490ff08b2 100644 --- a/src/app/shared/chat/messages/messages.page.ts +++ b/src/app/shared/chat/messages/messages.page.ts @@ -1139,7 +1139,12 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy // console.log('ROOM',room) this.room = room['room']; if (this.room.name) { - this.roomName = this.room.name.split('-').join(' '); + try { + this.roomName = this.room.name.split('-').join(' '); + } catch(error) { + this.roomName = this.room.name; + } + }