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

@@ -14,4 +14,4 @@
// You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
export default, { showSyncWarning } from './syncWarning';
export default from './syncWarning';

View File

@@ -36,7 +36,3 @@
margin: 0.5em 0;
}
}
.status {
font-size: 4rem;
}

View File

@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
import React, { Component } from 'react';
import React from 'react';
import PropTypes from 'prop-types';
import { connect } from 'react-redux';
@@ -22,47 +22,38 @@ import StatusIndicator from '@parity/ui/StatusIndicator';
import styles from './syncWarning.css';
class SyncWarning extends Component {
static propTypes = {
className: PropTypes.string,
isOk: PropTypes.bool.isRequired,
health: PropTypes.object.isRequired
};
function SyncWarning ({ className, isOk, health }) {
console.log('SyncWarning', isOk, health);
render () {
const { className, isOk, health } = this.props;
if (isOk) {
return null;
}
return (
<div className={ className }>
<div className={ styles.body }>
<div className={ styles.status }>
<StatusIndicator
type='signal'
id='healthWarning.indicator'
status={ health.overall.status }
/>
</div>
{
health.overall.message.map((message) => (
<p key={ message }>
{ message }
</p>
))
}
</div>
</div>
);
if (isOk) {
return null;
}
return (
<div className={ className }>
<div className={ styles.body }>
{
health.overall.message.map((message) => (
<p key={ message }>
{ message }
</p>
))
}
</div>
</div>
);
}
SyncWarning.propTypes = {
className: PropTypes.string,
isOk: PropTypes.bool.isRequired,
health: PropTypes.object.isRequired
};
function mapStateToProps (state) {
const { health } = state.nodeStatus;
const isNotAvailableYet = health.overall.isNotReady;
const isOk = isNotAvailableYet || health.overall.status === 'ok';
const isOk = !isNotAvailableYet && health.overall.status === 'ok';
return {
isOk,