Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger

projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html

@@ -181,6 +181,7 @@
     (fileDragLeave)="onFileDragLeave()"
   >
     <!-- CHAT MESSAGES -->
+    <button mat-stroked-button class=" icon-button text-accent-darkest"><i class="mid  mdi-arrow-collapse-down"></i></button>
 
     <ucap-chat-messages
       #chatMessages

projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.scss

@@ -115,6 +115,21 @@
   background: transparent;
   overflow: auto;
   -webkit-overflow-scrolling: touch;
+  .icon-button {
+    position: absolute;
+    right: 20px;
+    top: 14px;
+    z-index: 100;
+    padding: 0 0px;
+    line-height: unset;
+    min-width: 28px;
+    height: 28px;
+    background: #ffffff;
+    border-radius: 3px;
+    &:not([disabled]) {
+      box-shadow: 0 1px 2px 0px rgba(0, 0, 0, 0.2);
+    }
+  }
 
   .file-drop-zone-container {
     position: absolute;

projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.ts

@@ -165,8 +165,6 @@ export class IntegratedSearchDialogComponent implements OnInit, OnDestroy {
                       })
                     );
                   }
-
-                  console.log(this.searchUserInfos);
                 }
                 break;
             }

projects/ucap-webmessenger-app/src/app/services/notification.service.ts

@@ -481,19 +481,6 @@ export class AppNotificationService {
         tap(([notiOrRes, loginResInfo]) => {
           switch (notiOrRes.SSVC_TYPE) {
             case SSVC_TYPE_ROOM_INVITE_RES:
-              {
-                const noti = notiOrRes as InviteNotification;
-                this.logger.debug(
-                  'Notification::roomProtocolService::InviteNotification',
-                  noti
-                );
-                this.store.dispatch(
-                  RoomStore.inviteSuccess({
-                    roomSeq: noti.roomSeq
-                  })
-                );
-              }
-              break;
             case SSVC_TYPE_ROOM_INVITE_NOTI:
               {
                 const noti = notiOrRes as InviteNotification;

projects/ucap-webmessenger-app/src/app/store/messenger/room/effects.ts

@@ -273,7 +273,15 @@ export class Effects {
             })
             .pipe(
               map((res: InviteResponse) => {
-                return inviteSuccess(res);
+                // return inviteSuccess(res);
+                const loginInfo = this.sessionStorageService.get<LoginInfo>(
+                  KEY_LOGIN_INFO
+                );
+                return info({
+                  roomSeq: res.roomSeq,
+                  isDetail: true,
+                  localeCode: loginInfo.localeCode
+                });
               }),
               catchError(error => of(inviteFailure({ error })))
             );