diff --git a/src/app/infra/socket/signalR/signal-r.service.ts b/src/app/infra/socket/signalR/signal-r.service.ts index ca03c6f7e..5dc31bc98 100644 --- a/src/app/infra/socket/signalR/signal-r.service.ts +++ b/src/app/infra/socket/signalR/signal-r.service.ts @@ -10,7 +10,6 @@ import { ISignalRInput } from '../type'; const { App } = Plugins; - @Injectable({ providedIn: 'root' }) @@ -23,7 +22,6 @@ export class SignalRService { constructor(private platform: Platform) { - this.deadConnectionBackGround = new Subject() this.deadConnectionBackGround.pipe( switchMap(() => timer(150000)), // 2 minutes 30 seconds @@ -98,7 +96,7 @@ export class SignalRService { public getConnectionState(): Observable { return this.connectingSubject.asObservable(); } - + newConnection() { this.establishConnection() } diff --git a/src/app/module/chat/domain/chat-service.service.ts b/src/app/module/chat/domain/chat-service.service.ts index 6b4d1a073..7b1955bd7 100644 --- a/src/app/module/chat/domain/chat-service.service.ts +++ b/src/app/module/chat/domain/chat-service.service.ts @@ -82,9 +82,9 @@ export class ChatServiceService { private HttpListenToMessageLoadHistory: HttpListenToMessageLoadHistoryAdapter, private MessageSocketRepositoryService: MessageSocketRepositoryService, private BoldRemoveByRoomIdService: BoldRemoveByRoomIdService, - private MemberListHttpSyncUseCase: MemberListHttpSyncUseCase, - private RoomBoldSyncUseCaseService: RoomBoldSyncUseCaseService, - private RoomSetLastMessageService: RoomSetLastMessageService + private MemberListHttpSyncUseCase: MemberListHttpSyncUseCase, // dont remove + private RoomBoldSyncUseCaseService: RoomBoldSyncUseCaseService, // dont remove + private RoomSetLastMessageService: RoomSetLastMessageService // dont remove ) { this.MessageSocketRepositoryService.listenToDeleteMessages() .pipe() diff --git a/src/app/module/chat/domain/use-case/message/messages-send-offline-use-case.service.ts b/src/app/module/chat/domain/use-case/message/messages-send-offline-use-case.service.ts index b3e8045da..ebf9a24b0 100644 --- a/src/app/module/chat/domain/use-case/message/messages-send-offline-use-case.service.ts +++ b/src/app/module/chat/domain/use-case/message/messages-send-offline-use-case.service.ts @@ -76,18 +76,18 @@ export class SendLocalMessagesUseCaseService { roomId:message.roomId, currentUserId: SessionStore.user.UserId }) - if(getRoomMembers.isOk()) { + if(getRoomMembers.isOk() && getRoomMembers.value) { message.receiverId = getRoomMembers.value.wxUserId const DTO = MessageMapper.fromDomain(message, message.requestId) sendMessageResult = await this.messageSocketRepositoryService.sendGroupMessage(DTO) } else { - console.log('not found direct users', getRoomMembers.error) + console.error('direct users not found', getRoomMembers) } } } - if(sendMessageResult.isOk()) { + if(sendMessageResult?.isOk()) { if(sendMessageResult.value.sender == undefined || sendMessageResult.value.sender == null) { diff --git a/src/app/ui/chat/chat.module.ts b/src/app/ui/chat/chat.module.ts index 96719d6e5..b5f4c7d48 100644 --- a/src/app/ui/chat/chat.module.ts +++ b/src/app/ui/chat/chat.module.ts @@ -42,8 +42,7 @@ import { BoldLocalRepository } from 'src/app/module/chat/data/repository/bold/bo EmptyChatPageModule, NewEventPageModule, ImageCropperModule, - AttendeeModalPageModule, - ChatModule + AttendeeModalPageModule ], providers: [ diff --git a/src/app/ui/chat/component/group-messages/group-messages.page.ts b/src/app/ui/chat/component/group-messages/group-messages.page.ts index 410c87744..5201eca4b 100644 --- a/src/app/ui/chat/component/group-messages/group-messages.page.ts +++ b/src/app/ui/chat/component/group-messages/group-messages.page.ts @@ -532,7 +532,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe async openOptions(ev: any) { - console.trace(this.room) + // console.trace(this.room) const popover = await this.popoverController.create({ component: ChatPopoverPage, diff --git a/src/app/ui/chat/component/messages/messages.page.html b/src/app/ui/chat/component/messages/messages.page.html index c7dd69616..54d1a2610 100644 --- a/src/app/ui/chat/component/messages/messages.page.html +++ b/src/app/ui/chat/component/messages/messages.page.html @@ -9,7 +9,7 @@
-
- -
+