From a1c7f5c2f90cd374e0ab2c8f6d01d729100edf0f Mon Sep 17 00:00:00 2001
From: Martin Schoeler <martin.schoeler@rocket.chat>
Date: Mon, 20 Nov 2023 13:55:04 -0300
Subject: [PATCH] fix: Livechat Reactivity issues with createOrUpdateGuest
 (6.4.8 version) (#30993)

---
 packages/livechat/src/lib/hooks.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/livechat/src/lib/hooks.js b/packages/livechat/src/lib/hooks.js
index 79535831217..311cf0b2a00 100644
--- a/packages/livechat/src/lib/hooks.js
+++ b/packages/livechat/src/lib/hooks.js
@@ -14,6 +14,7 @@ const createOrUpdateGuest = async (guest) => {
 	token && (await store.setState({ token }));
 	const { visitor: user } = await Livechat.grantVisitor({ visitor: { ...guest } });
 	store.setState({ user });
+	await loadConfig();
 };
 
 const updateIframeGuestData = (data) => {
@@ -141,8 +142,7 @@ const api = {
 		if (token === localToken) {
 			return;
 		}
-		createOrUpdateGuest({ token });
-		await loadConfig();
+		await createOrUpdateGuest({ token });
 	},
 
 	setGuestName(name) {
@@ -153,8 +153,8 @@ const api = {
 		updateIframeGuestData({ email });
 	},
 
-	registerGuest(data = {}) {
-		if (typeof data !== 'object') {
+	async registerGuest(data) {
+		if (!data || typeof data !== 'object') {
 			return;
 		}
 
@@ -166,7 +166,9 @@ const api = {
 			api.setDepartment(data.department);
 		}
 
-		createOrUpdateGuest(data);
+		Livechat.unsubscribeAll();
+
+		await createOrUpdateGuest(data);
 	},
 
 	async setLanguage(language) {