Skip to content
This repository was archived by the owner on Jun 30, 2022. It is now read-only.

Commit 644d712

Browse files
committed
fix issue where roomId was getting changed and message alignment issue fixed
1 parent 197158b commit 644d712

File tree

4 files changed

+38
-4
lines changed

4 files changed

+38
-4
lines changed

size-plugin.json

+1-1
Large diffs are not rendered by default.

src/components/Messages/MessageList/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ export class MessageList extends MemoizedComponent {
129129
attachmentResolver={attachmentResolver}
130130
avatarResolver={avatarResolver}
131131
use='li'
132-
me={uid && message.u && uid === message.u._id}
132+
me={(uid && message.u && uid === message.u._id) || message.token}
133133
compact={nextMessage && message.u && nextMessage.u && message.u._id === nextMessage.u._id}
134134
conversationFinishedMessage={conversationFinishedMessage}
135135
{...message}

src/lib/main.js

+34
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,40 @@ export const loadConfig = async () => {
3838
});
3939
};
4040

41+
export const reloadConfig = async () => {
42+
const {
43+
token,
44+
room: { _id: roomId = null } = {},
45+
messages,
46+
typing,
47+
} = store.state;
48+
49+
Livechat.credentials.token = token;
50+
51+
const {
52+
agent,
53+
room,
54+
guest: user,
55+
resources: { sound: src = null } = {},
56+
queueInfo,
57+
...config
58+
} = await Livechat.config({
59+
token,
60+
...roomId && { roomId },
61+
});
62+
63+
await store.setState({
64+
config,
65+
agent: agent && agent.hiddenInfo ? { hiddenInfo: true } : agent, // TODO: revert it when the API is updated
66+
room,
67+
user,
68+
queueInfo,
69+
sound: { src, enabled: true, play: false },
70+
messages,
71+
typing,
72+
});
73+
};
74+
4175
export const processUnread = async () => {
4276
const { minimized, visible, messages } = store.state;
4377
if (minimized || !visible) {

src/lib/room.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { setCookies, upsert, canRenderMessage } from '../components/helpers';
55
import { store } from '../store';
66
import { normalizeAgent } from './api';
77
import Commands from './commands';
8-
import { loadConfig, processUnread } from './main';
8+
import { loadConfig, processUnread, reloadConfig } from './main';
99
import { parentCall } from './parentCall';
1010
import { normalizeMessage, normalizeMessages } from './threads';
1111
import { handleTranscript } from './transcript';
@@ -90,7 +90,7 @@ export const initRoom = async () => {
9090
token,
9191
room: { ...room, v: { _id, token, username } },
9292
});
93-
await loadConfig();
93+
await reloadConfig();
9494
});
9595

9696
setCookies(rid, token);

0 commit comments

Comments
 (0)