Skip to content

Commit 5f34fc0

Browse files
committed
some more
1 parent f9c01e9 commit 5f34fc0

File tree

4 files changed

+4
-7
lines changed

4 files changed

+4
-7
lines changed

app/lib/methods/getRoles.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ export function getRoles(): Promise<void> {
7474
return new Promise(async resolve => {
7575
try {
7676
// RC 0.70.0
77-
const result = await sdk.get('roles.list');
77+
const result = await sdk.get('/v1/roles.list');
7878

7979
if (!result.success) {
8080
return resolve();

app/lib/methods/loadMissedMessages.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { getSubscriptionByRoomId } from '../database/services/Subscription';
88
const count = 50;
99

1010
const syncMessages = async ({ roomId, next, type }: { roomId: string; next: number; type: 'UPDATED' | 'DELETED' }) => {
11-
const { result } = await sdk.get('/v1/chat.syncMessages', { roomId, next, count, type });
11+
const { result } = await sdk.get('/v1/chat.syncMessages', { roomId, next: next.toString(), count, type });
1212
return result;
1313
};
1414

app/views/LivechatEditView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ const LivechatEditView = ({ user, navigation, route, theme }: ILivechatEditViewP
7979

8080
const handleGetCustomFields = async () => {
8181
const result = await getCustomFields();
82-
if (result.success && result.customFields?.length) {
82+
if (result.customFields?.length) {
8383
const visitorCustomFields = result.customFields
8484
.filter(field => field.visibility !== 'hidden' && field.scope === 'visitor')
8585
.map(field => ({ [field._id]: (visitor.livechatData && visitor.livechatData[field._id]) || '' }))

app/views/RoomInfoView/index.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ const RoomInfoView = (): React.ReactElement => {
166166
try {
167167
const roomUserId = getUidDirectMessage({ ...(room || { rid, t }), itsMe });
168168
const result = await getUserInfo(roomUserId);
169-
if (result) {
169+
if (result && result.user) {
170170
const { user } = result;
171171
const r = handleRoles(user);
172172
setRoomUser({ ...user, roles: r });
@@ -183,7 +183,6 @@ const RoomInfoView = (): React.ReactElement => {
183183
const loadRoom = async () => {
184184
const permissionToEdit = isLivechat ? [editOmnichannelContact, editLivechatRoomCustomfields] : [editRoomPermission];
185185
const permissions = await hasPermission(permissionToEdit, rid);
186-
console.log('channel.edit-2', editRoomPermission, permissions)
187186
const canEdit = permissions.some(Boolean);
188187
const subRoom = await getSubscriptionByRoomId(rid);
189188
if (!subRoom && isDirect && fromRid) {
@@ -198,14 +197,12 @@ const RoomInfoView = (): React.ReactElement => {
198197
const sub = subRoom.observe();
199198
subscription.current = sub.subscribe(changes => {
200199
setRoom(changes.asPlain());
201-
console.log('channel.edit', roomType, canEdit)
202200
setHeader(roomType === SubscriptionType.DIRECT ? false : canEdit);
203201
});
204202
} else {
205203
try {
206204
if (!isDirect) {
207205
const result = await getRoomInfo(rid);
208-
console.log('room', result)
209206
if (result) setRoom({ ...room, ...(result.room as unknown as ISubscription) });
210207
}
211208
} catch (e) {

0 commit comments

Comments
 (0)