diff --git a/react/src/components/dashboard/coindDownModal/coindDownModal.js b/react/src/components/dashboard/coindDownModal/coindDownModal.js index 7d082a2..518f326 100644 --- a/react/src/components/dashboard/coindDownModal/coindDownModal.js +++ b/react/src/components/dashboard/coindDownModal/coindDownModal.js @@ -1,12 +1,13 @@ import React from 'react'; +import { connect } from 'react-redux'; import { toggleCoindDownModal } from '../../../actions/actionCreators'; import Store from '../../../store'; import CoindDownModalRender from './coindDownModal.render'; class CoindDownModal extends React.Component { - constructor(props) { - super(props); + constructor() { + super(); this.state = { display: false, debugLogCrash: null, @@ -18,20 +19,12 @@ class CoindDownModal extends React.Component { Store.dispatch(toggleCoindDownModal(false)); } - componentWillReceiveProps(props) { - const coindDownModalProps = props ? props.Dashboard : null; - - if (coindDownModalProps && - coindDownModalProps.displayCoindDownModal !== this.state.display) { + componentWillReceiveProps(nextProps) { + console.log(nextProps.displayCoindDownModal); + if (this.props.displayCoindDownModal !== nextProps.displayCoindDownModal) { this.setState(Object.assign({}, this.state, { - display: coindDownModalProps.displayCoindDownModal, + display: nextProps.displayCoindDownModal, })); - - setTimeout(() => { - this.setState(Object.assign({}, this.state, { - display: coindDownModalProps.displayCoindDownModal, - })); - }, 100); } } @@ -43,5 +36,12 @@ class CoindDownModal extends React.Component { return null; } } - -export default CoindDownModal; +const mapStateToProps = (state) => { + return { + displayCoindDownModal: state.Dashboard.displayCoindDownModal, + debugLog: state.Settings.debugLog + }; + +}; + +export default connect(mapStateToProps)(CoindDownModal); diff --git a/react/src/components/dashboard/coindDownModal/coindDownModal.render.js b/react/src/components/dashboard/coindDownModal/coindDownModal.render.js index 548e661..d00a81e 100644 --- a/react/src/components/dashboard/coindDownModal/coindDownModal.render.js +++ b/react/src/components/dashboard/coindDownModal/coindDownModal.render.js @@ -24,8 +24,9 @@ const CoindDownModalRender = function () { Debug.log (last 50 lines)