verdnatura-mirror
/
verdnatura-chat
forked from verdnatura-mirror/Rocket.Chat.ReactNative
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Regression: Room header not showing room type when not joined (#4427)

This commit is contained in:
Reinaldo Neto 2022-08-11 15:29:24 -03:00 committed by Diego Mello
parent 07766f3c06
commit f01555a473
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/views/RoomView/index.tsx
View File

@ -550,8 +550,6 @@ class RoomView extends React.Component<IRoomViewProps, IRoomViewState> {
parentTitle = getRoomTitle(room); parentTitle = getRoomTitle(room);
} }
let subtitle: string | undefined; let subtitle: string | undefined;
let t: string;
let teamMain: boolean | undefined;
let teamId: string | undefined; let teamId: string | undefined;
let encrypted: boolean | undefined; let encrypted: boolean | undefined;
let userId: string | undefined; let userId: string | undefined;
@ -562,8 +560,6 @@ class RoomView extends React.Component<IRoomViewProps, IRoomViewState> {
let departmentId: string | undefined; let departmentId: string | undefined;
if ('id' in room) { if ('id' in room) {
subtitle = room.topic; subtitle = room.topic;
t = room.t;
teamMain = room.teamMain;
teamId = room.teamId; teamId = room.teamId;
encrypted = room.encrypted; encrypted = room.encrypted;
({ id: userId, token } = user); ({ id: userId, token } = user);
@ -573,11 +569,12 @@ class RoomView extends React.Component<IRoomViewProps, IRoomViewState> {
} }
if ('source' in room) { if ('source' in room) {
t = room.t;
sourceType = room.source; sourceType = room.source;
visitor = room.visitor; visitor = room.visitor;
} }
const t = room?.t;
const teamMain = 'teamMain' in room ? room?.teamMain : false;
const omnichannelPermissions = { canForwardGuest, canReturnQueue, canPlaceLivechatOnHold }; const omnichannelPermissions = { canForwardGuest, canReturnQueue, canPlaceLivechatOnHold };
navigation.setOptions({ navigation.setOptions({