Fix cyclic dependency in initMatrix

Signed-off-by: Ajay Bura <ajbura@gmail.com>

diff --git a/src/app/templates/client/Client.jsx b/src/app/templates/client/Client.jsx
index b322360be2da46c88a0d457bd7e09a65e51211c7..1342db55fce04e45b4f113361f56f0db89e56117 100644 (file)
--- a/src/app/templates/client/Client.jsx
+++ b/src/app/templates/client/Client.jsx
@@ -1,6 +1,9 @@
 import React, { useState, useEffect } from 'react';
 import './Client.scss';
 
+import { initHotkeys } from '../../../client/event/hotkeys';
+import { initRoomListListener } from '../../../client/event/roomList';
+
 import Text from '../../atoms/text/Text';
 import Spinner from '../../atoms/spinner/Spinner';
 import Navigation from '../../organisms/navigation/Navigation';
@@ -38,6 +41,8 @@ function Client() {
     }, 15000);
     initMatrix.once('init_loading_finished', () => {
       clearInterval(iId);
+      initHotkeys();
+      initRoomListListener(initMatrix.roomList);
       changeLoading(false);
     });
     initMatrix.init();

diff --git a/src/client/initMatrix.js b/src/client/initMatrix.js
index bcf5c2840ef7dbbc331234334db7a20b160aa63c..f6fc9eb2a6116eb904aecd51a74f338b9b5494db 100644 (file)
--- a/src/client/initMatrix.js
+++ b/src/client/initMatrix.js
@@ -7,8 +7,6 @@ import RoomList from './state/RoomList';
 import AccountData from './state/AccountData';
 import RoomsInput from './state/RoomsInput';
 import Notifications from './state/Notifications';
-import { initHotkeys } from './event/hotkeys';
-import { initRoomListListener } from './event/roomList';
 
 global.Olm = require('@matrix-org/olm');
 
@@ -66,8 +64,6 @@ class InitMatrix extends EventEmitter {
           this.accountData = new AccountData(this.roomList);
           this.roomsInput = new RoomsInput(this.matrixClient);
           this.notifications = new Notifications(this.roomList);
-          initHotkeys();
-          initRoomListListener(this.roomList);
           this.emit('init_loading_finished');
         }
       },