diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts
index 2fab89b7d..438106d26 100644
--- a/src/app/pages/search/search.page.ts
+++ b/src/app/pages/search/search.page.ts
@@ -258,11 +258,8 @@ export class SearchPage implements OnInit {
if(this.type == "Agenda" ){
-
- alert('agenda seach')
this.showLoader = true;
-
this.search.basicSearch(this.searchSubject, this.searchDocumentDate, this.searchSender
,this.searchOrganicEntiry, this.searchDocTypeId, '0').subscribe(res=>{
diff --git a/src/app/services/chat/chat-system.service.ts b/src/app/services/chat/chat-system.service.ts
index 17f212e13..0033dc89c 100644
--- a/src/app/services/chat/chat-system.service.ts
+++ b/src/app/services/chat/chat-system.service.ts
@@ -18,6 +18,7 @@ import { ChatMethodsService } from './chat-methods.service';
import { AESEncrypt } from '../aesencrypt.service'
import { AttachmentsService } from 'src/app/services/attachments.service';
import { NetworkServiceService} from 'src/app/services/network-service.service';
+import { JsonStore } from '../jsonStore.service';
@Injectable({
providedIn: 'root'
@@ -273,6 +274,7 @@ export class ChatSystemService {
}
}
+ this.loadingWholeList = false
await this.storage.set('Rooms', rooms);
setTimeout(() => {
@@ -284,7 +286,6 @@ export class ChatSystemService {
this.sortRoomList()
}, 10000)
- this.loadingWholeList = false
}
/**
@@ -575,9 +576,14 @@ export class ChatSystemService {
})[0]
if(roomName) {
- const firstName = capitalizeTxt(roomName.split('.')[0])
- const lastName = capitalizeTxt(roomName.split('.')[1])
- return firstName + ' ' + lastName
+ try {
+ const firstName = capitalizeTxt(roomName.split('.')[0])
+ const lastName = capitalizeTxt(roomName.split('.')[1])
+ return firstName + ' ' + lastName
+ } catch(e) {
+ return roomData['membersExcludeMe'][0].name
+ }
+
} else if(roomData.name) {
return roomData.name
} else {
diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html
index 133ba6497..aa24a3ecc 100644
--- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html
+++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html
@@ -210,7 +210,7 @@
+
diff --git a/src/app/shared/agenda/edit-event/edit-event.page.html b/src/app/shared/agenda/edit-event/edit-event.page.html
index 8008ac9af..a3d4b7129 100644
--- a/src/app/shared/agenda/edit-event/edit-event.page.html
+++ b/src/app/shared/agenda/edit-event/edit-event.page.html
@@ -162,7 +162,7 @@