Update after merge

This commit is contained in:
Jaco Greeff
2017-10-05 15:04:45 +02:00
parent 290060e6c4
commit 21c95bbec5
9 changed files with 490 additions and 571 deletions

View File

@@ -34,13 +34,11 @@ import Requests from '../Requests';
import Snackbar from '../Snackbar';
import Status from '../Status';
import UpgradeParity from '../UpgradeParity';
import SyncWarning, { showSyncWarning } from '../SyncWarning';
import Store from './store';
import styles from './application.css';
const inFrame = window.parent !== window && window.parent.frames.length !== 0;
const doShowSyncWarning = showSyncWarning();
@observer
class Application extends Component {
@@ -83,11 +81,6 @@ class Application extends Component {
? this.renderMinimized()
: this.renderApp()
}
{
doShowSyncWarning
? <SyncWarning />
: null
}
<Connection />
<DappRequests />
{