Fix order events

RocketChat · Feb 3, 2021 · d26ebcc · d26ebcc
1 parent a902fd5
commit d26ebcc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/client/lib/presence.ts b/client/lib/presence.ts
@@ -86,8 +86,8 @@ const update: Handler<UserPresence> = (update) => {
 };
 
 const listen = (uid: UserPresence['_id'], handler: Handler<UserPresence>): void => {
-	emitter.on(uid, handler);
 	emitter.on(uid, update);
+	emitter.on(uid, handler);
 	emitter.on('reset', handler);
 
 	if (store.has(uid)) {

diff --git a/client/views/room/contextualBar/OTR/OTR.js b/client/views/room/contextualBar/OTR/OTR.js
@@ -7,8 +7,8 @@ import OTRModal from './OTRModal';
 import { OTR as ORTInstance } from '../../../../../app/otr/client/rocketchat.otr';
 import { useTranslation } from '../../../../contexts/TranslationContext';
 import VerticalBar from '../../../../components/VerticalBar';
-import { usePresence } from '../../../../components/UserStatus';
 import { useReactiveValue } from '../../../../hooks/useReactiveValue';
+import { usePresence } from '../../../../hooks/usePresence';
 
 export const OTR = ({
 	isEstablishing,