fix issue where roomId was getting changed and message alignment issu…

…e fixed

src/components/Messages/MessageList/index.js

@@ -129,7 +129,7 @@ export class MessageList extends MemoizedComponent {
 					attachmentResolver={attachmentResolver}
 					avatarResolver={avatarResolver}
 					use='li'
-					me={uid && message.u && uid === message.u._id}
+					me={(uid && message.u && uid === message.u._id) || message.token}
 					compact={nextMessage && message.u && nextMessage.u && message.u._id === nextMessage.u._id}
 					conversationFinishedMessage={conversationFinishedMessage}
 					{...message}

src/lib/main.js

@@ -38,6 +38,40 @@ export const loadConfig = async () => {
 	});
 };
 
+export const reloadConfig = async () => {
+	const {
+		token,
+		room: { _id: roomId = null } = {},
+		messages,
+		typing,
+	} = store.state;
+
+	Livechat.credentials.token = token;
+
+	const {
+		agent,
+		room,
+		guest: user,
+		resources: { sound: src = null } = {},
+		queueInfo,
+		...config
+	} = await Livechat.config({
+		token,
+		...roomId && { roomId },
+	});
+
+	await store.setState({
+		config,
+		agent: agent && agent.hiddenInfo ? { hiddenInfo: true } : agent, // TODO: revert it when the API is updated
+		room,
+		user,
+		queueInfo,
+		sound: { src, enabled: true, play: false },
+		messages,
+		typing,
+	});
+};
+
 export const processUnread = async () => {
 	const { minimized, visible, messages } = store.state;
 	if (minimized || !visible) {

src/lib/room.js

@@ -5,7 +5,7 @@ import { setCookies, upsert, canRenderMessage } from '../components/helpers';
 import { store } from '../store';
 import { normalizeAgent } from './api';
 import Commands from './commands';
-import { loadConfig, processUnread } from './main';
+import { loadConfig, processUnread, reloadConfig } from './main';
 import { parentCall } from './parentCall';
 import { normalizeMessage, normalizeMessages } from './threads';
 import { handleTranscript } from './transcript';
@@ -90,7 +90,7 @@ export const initRoom = async () => {
 			token,
 			room: { ...room, v: { _id, token, username } },
 		});
-		await loadConfig();
+		await reloadConfig();
 	});
 
 	setCookies(rid, token);