Rebased code and fixed API

RocketChat · Aug 14, 2019 · b84e045 · b84e045
1 parent bbdbd24
commit b84e045
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 380 deletions.
diff --git a/src/components/App/index.js b/src/components/App/index.js
@@ -2,7 +2,6 @@ import { Component } from 'preact';
 import { Router, route } from 'preact-router';
 import queryString from 'query-string';
 
-import { Livechat } from '../../api';
 import { locationUpdate, userSessionPresence } from '../../lib/location';
 import history from '../../history';
 import Chat from '../../routes/Chat';
@@ -137,7 +136,8 @@ export class App extends Component {
 
 	async initialize() {
 		// TODO: split these behaviors into composable components
-		await Connection.init();
+    await Connection.init();
+    locationUpdate();
 		this.handleTriggers();
 		CustomFields.init();
 		Hooks.init();
@@ -150,7 +150,8 @@ export class App extends Component {
 
 	async finalize() {
 		CustomFields.reset();
-		userPresence.reset();
+    userPresence.reset();
+    userSessionPresence.reset();
 		visibility.removeListener(this.handleVisibilityChange);
 		I18n.off('change', this.handleLanguageChange);
 	}

diff --git a/src/lib/main.js b/src/lib/main.js
@@ -12,7 +12,6 @@ export const loadConfig = async () => {
 
   Livechat.credentials.token = token;
 
-<<<<<<< HEAD
 	const {
 		agent,
 		room,
@@ -35,28 +34,6 @@ export const loadConfig = async () => {
 		visible: true,
 		unread: null,
 	});
-=======
-  const {
-    agent,
-    room,
-    guest: user,
-    resources: { sound: src = null } = {},
-    ...config
-  } = await Livechat.config({ token });
-
-  await store.setState({
-    config,
-    agent,
-    room,
-    user,
-    sound: { src, enabled: true, play: false },
-    messages: [],
-    typing: [],
-    noMoreMessages: false,
-    visible: true,
-    unread: null,
-  });
->>>>>>> Rebased code
 };
 
 export const getToken = () => {