status-im
/
status-js-desktop
mirror of https://github.com/status-im/status-js-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove use lazy for chatroom + bump material-ui

This commit is contained in:
Barry Gitarts 2018-11-18 08:22:39 -05:00
parent dcf023f730
commit 34e07c9bcb
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/components/Home.js
View File

@ -1,18 +1,17 @@
// @flow // @flow
import React, { PureComponent, Fragment, lazy, Suspense } from 'react'; import React, { PureComponent, Fragment } from 'react';
import StatusJS from 'status-js-api'; import StatusJS from 'status-js-api';
import { isNil } from 'lodash'; import { isNil } from 'lodash';
import Grid from '@material-ui/core/Grid'; import Grid from '@material-ui/core/Grid';
import routes from '../constants/routes'; import routes from '../constants/routes';
import ChatRoom from './ChatRoom';
import ContextPanel from './ContextPanel'; import ContextPanel from './ContextPanel';
import Login from './Login'; import Login from './Login';
import { User } from '../utils/actors'; import { User } from '../utils/actors';
import { ChatContext } from '../context'; import { ChatContext } from '../context';
import { isContactCode } from '../utils/parsers'; import { isContactCode } from '../utils/parsers';
import { getKeyData, createVault, restoreVault, wipeVault } from '../utils/keyManagement'; import { getKeyData, createVault, restoreVault, wipeVault } from '../utils/keyManagement';
import { FullScreenLoader, FullScreenGridLoader } from './Loaders'; import { FullScreenLoader } from './Loaders';
const ChatRoom = lazy(() => import('./ChatRoom'));
const typingNotificationsTimestamp = {}; const typingNotificationsTimestamp = {};
@ -262,7 +261,6 @@ export default class Home extends PureComponent<Props> {
joinConversation={this.joinConversation} />} joinConversation={this.joinConversation} />}
</Grid> </Grid>
<Grid item xs={9}> <Grid item xs={9}>
<Suspense fallback={<FullScreenGridLoader />}>
<ChatRoom <ChatRoom
messages={messages} messages={messages}
sendMessage={this.sendMessage} sendMessage={this.sendMessage}
@ -272,7 +270,6 @@ export default class Home extends PureComponent<Props> {
channelUsers={channelUsers} channelUsers={channelUsers}
allUsers={users} allUsers={users}
/> />
</Suspense>
</Grid> </Grid>
</Grid>} </Grid>}
</Fragment>} </Fragment>}

2
package.json
View File

@ -256,7 +256,7 @@
}, },
"dependencies": { "dependencies": {
"@fortawesome/fontawesome-free": "^5.2.0", "@fortawesome/fontawesome-free": "^5.2.0",
"@material-ui/core": "^3.4.0", "@material-ui/core": "^3.5.1",
"@material-ui/icons": "^3.0.1", "@material-ui/icons": "^3.0.1",
"autoscroll-react": "^3.2.0", "autoscroll-react": "^3.2.0",
"devtron": "^1.4.0", "devtron": "^1.4.0",

13
yarn.lock
View File

@ -955,11 +955,12 @@
version "5.4.2" version "5.4.2"
resolved "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.4.2.tgz#b2d782da69c45ea61954291e2615a8f7741c96b2" resolved "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.4.2.tgz#b2d782da69c45ea61954291e2615a8f7741c96b2"
"@material-ui/core@^3.4.0": "@material-ui/core@^3.5.1":
version "3.4.0" version "3.5.1"
resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-3.4.0.tgz#b33c00a3c20e856ed7a4700dd398f128647beb4a" resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-3.5.1.tgz#365d1c392d3df3b37295db0548f4cca501034e69"
dependencies: dependencies:
"@babel/runtime" "7.1.2" "@babel/runtime" "7.1.2"
"@material-ui/utils" "^3.0.0-alpha.0"
"@types/jss" "^9.5.6" "@types/jss" "^9.5.6"
"@types/react-transition-group" "^2.0.8" "@types/react-transition-group" "^2.0.8"
brcast "^3.0.1" brcast "^3.0.1"
@ -993,6 +994,12 @@
"@babel/runtime" "7.0.0" "@babel/runtime" "7.0.0"
recompose "^0.29.0" recompose "^0.29.0"
"@material-ui/utils@^3.0.0-alpha.0":
version "3.0.0-alpha.0"
resolved "https://registry.yarnpkg.com/@material-ui/utils/-/utils-3.0.0-alpha.0.tgz#506fcaf531a9a8f58a73ff2d3dfaa36c0f238506"
dependencies:
"@babel/runtime" "7.1.2"
"@mrmlnc/readdir-enhanced@^2.2.1": "@mrmlnc/readdir-enhanced@^2.2.1":
version "2.2.1" version "2.2.1"
resolved "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde" resolved "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"