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

Merge branch 'develop' into develop_UrlInPinned

This commit is contained in:
Samay Kothari 2022-04-19 02:06:03 +05:30 committed by GitHub
parent 99ab3f3ef7 3c53d48a3e
commit 1d6e3aaac8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/views/RoomActionsView/index.tsx
View File

@ -16,7 +16,15 @@ import RoomTypeIcon from '../../containers/RoomTypeIcon';
import SafeAreaView from '../../containers/SafeAreaView'; import SafeAreaView from '../../containers/SafeAreaView';
import Status from '../../containers/Status'; import Status from '../../containers/Status';
import StatusBar from '../../containers/StatusBar'; import StatusBar from '../../containers/StatusBar';
import { IApplicationState, IBaseScreen, IRoom, ISubscription, IUser, TSubscriptionModel } from '../../definitions'; import {
IApplicationState,
IBaseScreen,
IRoom,
ISubscription,
IUser,
SubscriptionType,
TSubscriptionModel
} from '../../definitions';
import { withDimensions } from '../../dimensions'; import { withDimensions } from '../../dimensions';
import I18n from '../../i18n'; import I18n from '../../i18n';
import database from '../../lib/database'; import database from '../../lib/database';
@ -33,6 +41,7 @@ import styles from './styles';
import { ERoomType } from '../../definitions/ERoomType'; import { ERoomType } from '../../definitions/ERoomType';
import { E2E_ROOM_TYPES, SWITCH_TRACK_COLOR, themes } from '../../lib/constants'; import { E2E_ROOM_TYPES, SWITCH_TRACK_COLOR, themes } from '../../lib/constants';
import { compareServerVersion } from '../../lib/methods/helpers/compareServerVersion'; import { compareServerVersion } from '../../lib/methods/helpers/compareServerVersion';
import { getSubscriptionByRoomId } from '../../lib/database/services/Subscription';
interface IRoomActionsViewProps extends IBaseScreen<ChatsStackParamList, 'RoomActionsView'> { interface IRoomActionsViewProps extends IBaseScreen<ChatsStackParamList, 'RoomActionsView'> {
userId: string; userId: string;
@ -139,15 +148,24 @@ class RoomActionsView extends React.Component<IRoomActionsViewProps, IRoomAction
this.mounted = true; this.mounted = true;
const { room, member } = this.state; const { room, member } = this.state;
if (room.rid) { if (room.rid) {
if (!room.id && !this.isOmnichannelPreview) { if (!room.id) {
try { if (room.t === SubscriptionType.OMNICHANNEL) {
const result = await RocketChat.getChannelInfo(room.rid); if (!this.isOmnichannelPreview) {
if (result.success) { const result = await getSubscriptionByRoomId(room.rid);
// @ts-ignore if (result) {
this.setState({ room: { ...result.channel, rid: result.channel._id } }); this.setState({ room: result });
}
}
} else {
try {
const result = await RocketChat.getChannelInfo(room.rid);
if (result.success) {
// @ts-ignore
this.setState({ room: { ...result.channel, rid: result.channel._id } });
}
} catch (e) {
log(e);
} }
} catch (e) {
log(e);
} }
} }