multi meeting bug fix.

show username and meeting name TODO: - white board in multi meeting
FLECT-DEV-TEAM · Jun 30, 2020 · f0731cf · f0731cf
1 parent cd5c110
commit f0731cf
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/components/LobbyMeetingRoom.tsx b/src/components/LobbyMeetingRoom.tsx
@@ -6,6 +6,7 @@ import MainOverlayVideoElement from './meetingComp/MainOverlayVideoElement';
 import { getTileId } from './utils';
 import { AppState } from './App';
 import OverlayVideoElement from './meetingComp/OverlayVideoElement';
+import { getSendingStatus } from './WebsocketApps/FileTransfer';
 
 
 
@@ -53,11 +54,15 @@ class MainScreen extends React.Component{
     render(){
         const props = this.props as any
         const appState = props.appState as AppState
+        const gs = this.props as GlobalState
+
         const thisAttendeeId = props.thisAttendeeId as string
         const thisMeetingId  = props.thisMeetingId as string
         const attendeeInfo = appState.joinedMeetings[thisMeetingId].roster[thisAttendeeId]
         let attendeeName = "no focused"
-        let meetingShortId = thisMeetingId.substr(0,5)
+        //let meetingShortId = thisMeetingId.substr(0,5)
+        const meetingName = gs.meetings.filter((x)=>{return x.meetingId === thisMeetingId})[0].meetingName
+
 
         let muted = <div/>
         if(attendeeInfo === undefined){
@@ -83,7 +88,7 @@ class MainScreen extends React.Component{
                         </div>
                         <span>
                             {muted}
-                            {attendeeName} @ {meetingShortId}
+                            {attendeeName} @ {meetingName}
                         </span>
                         <span style={{paddingLeft:"30px"}}>
                             <Icon name="pencil" color={this.state.enableDrawing? "red":"grey"}
@@ -130,11 +135,14 @@ class TileScreenTile extends React.Component{
     render(){
         const props = this.props as any
         const appState = props.appState as AppState
+        const gs = this.props as GlobalState
+
         const thisAttendeeId = props.thisAttendeeId as string
         const thisMeetingId  = props.thisMeetingId as string
         const attendeeInfo = appState.joinedMeetings[thisMeetingId].roster[thisAttendeeId]
         let attendeeName = "loading...."
-        let meetingShortId = thisMeetingId.substr(0,5)
+        //let meetingShortId = thisMeetingId.substr(0,5)
+        const meetingName = gs.meetings.filter((x)=>{return x.meetingId === thisMeetingId})[0].meetingName
         let muted = <span/>
         let paused = <span/>
         let focusIcon = <span/>
@@ -173,7 +181,7 @@ class TileScreenTile extends React.Component{
                 {paused}
                 </span>
                 {focusIcon}
-                {attendeeName} @ {meetingShortId}
+                {attendeeName} @ {meetingName}
             </Grid.Column>
         )
     }

diff --git a/src/reducers/index.ts b/src/reducers/index.ts
@@ -229,7 +229,7 @@ const reducer = (state: GlobalState = initialState, action: any) => {
             const meetingId  = action.payload[0]
             const attendeeId = action.payload[1]
             const baseAttendeeId = action.payload[2]
-            const name = action.payload[2]
+            const name = action.payload[3]
             if(gs.storeRosters[meetingId]===undefined){
                 gs.storeRosters[meetingId] = {}
             }