From b85f8aff8c5464543d36e3331b940af125e75274 Mon Sep 17 00:00:00 2001 From: Jonathan Rainville Date: Thu, 25 Oct 2018 14:34:54 -0400 Subject: [PATCH] fix margins by using a padding on the container instead --- embark-ui/src/components/CardTitleIdenticon.js | 3 ++- embark-ui/src/components/Communication.js | 2 +- embark-ui/src/components/ContractsDeployment.js | 2 +- embark-ui/src/components/Converter.js | 2 +- embark-ui/src/components/ExplorerDashboardLayout.js | 2 +- embark-ui/src/components/Layout.js | 2 +- embark-ui/src/components/Processes.js | 2 +- embark-ui/src/components/SignAndVerify.js | 4 ++-- embark-ui/src/containers/EditorContainer.css | 1 + embark-ui/src/containers/EnsContainer.js | 2 +- embark-ui/src/containers/HomeContainer.js | 12 +++++++++--- .../src/containers/TransactionDecoderContainer.js | 4 ++-- embark-ui/src/reducers/selectors.js | 2 +- 13 files changed, 24 insertions(+), 16 deletions(-) diff --git a/embark-ui/src/components/CardTitleIdenticon.js b/embark-ui/src/components/CardTitleIdenticon.js index f0576ff3c..b9a8e9f7d 100644 --- a/embark-ui/src/components/CardTitleIdenticon.js +++ b/embark-ui/src/components/CardTitleIdenticon.js @@ -13,7 +13,8 @@ CardTitleIdenticon.propTypes = { id: PropTypes.string, children: PropTypes.oneOfType([ PropTypes.object, - PropTypes.array + PropTypes.array, + PropTypes.string ]) }; diff --git a/embark-ui/src/components/Communication.js b/embark-ui/src/components/Communication.js index ca93bd43a..eaa9603d8 100644 --- a/embark-ui/src/components/Communication.js +++ b/embark-ui/src/components/Communication.js @@ -44,7 +44,7 @@ class Communication extends Component { render() { return ( - + diff --git a/embark-ui/src/components/ContractsDeployment.js b/embark-ui/src/components/ContractsDeployment.js index dcdca38c8..866fe3853 100644 --- a/embark-ui/src/components/ContractsDeployment.js +++ b/embark-ui/src/components/ContractsDeployment.js @@ -180,7 +180,7 @@ const EmbarkContract = ({contract, toggleContractOverview}) => ( ); const ContractsHeader = ({deploymentPipeline, updateDeploymentPipeline}) => ( - +
Deploy using diff --git a/embark-ui/src/components/Converter.js b/embark-ui/src/components/Converter.js index c21365a4f..765026f05 100644 --- a/embark-ui/src/components/Converter.js +++ b/embark-ui/src/components/Converter.js @@ -35,7 +35,7 @@ class Converter extends React.Component { render() { return( - + diff --git a/embark-ui/src/components/ExplorerDashboardLayout.js b/embark-ui/src/components/ExplorerDashboardLayout.js index ee49bd109..4af978347 100644 --- a/embark-ui/src/components/ExplorerDashboardLayout.js +++ b/embark-ui/src/components/ExplorerDashboardLayout.js @@ -12,7 +12,7 @@ import './Explorer.css'; const ExplorerDashboardLayout = () => (
- + diff --git a/embark-ui/src/components/Layout.js b/embark-ui/src/components/Layout.js index bd53a10e5..5c71b5c99 100644 --- a/embark-ui/src/components/Layout.js +++ b/embark-ui/src/components/Layout.js @@ -225,7 +225,7 @@ class Layout extends React.Component { {searchResult.error} - + {children} diff --git a/embark-ui/src/components/Processes.js b/embark-ui/src/components/Processes.js index 5bcf2fdcf..9379cf01b 100644 --- a/embark-ui/src/components/Processes.js +++ b/embark-ui/src/components/Processes.js @@ -29,7 +29,7 @@ Process.propTypes = { }; const Processes = ({processes}) => ( - + {processes.map((process) => )} ); diff --git a/embark-ui/src/components/SignAndVerify.js b/embark-ui/src/components/SignAndVerify.js index 99039ba7d..613db348f 100644 --- a/embark-ui/src/components/SignAndVerify.js +++ b/embark-ui/src/components/SignAndVerify.js @@ -19,7 +19,7 @@ class SignAndVerify extends React.Component { this.state = { selectedAccount: this.props.accounts[0].address, messageToSign: '', - messageToVerify: '', + messageToVerify: '' }; } @@ -40,7 +40,7 @@ class SignAndVerify extends React.Component { render() { return ( - + diff --git a/embark-ui/src/containers/EditorContainer.css b/embark-ui/src/containers/EditorContainer.css index 56a9a97fc..47965252d 100644 --- a/embark-ui/src/containers/EditorContainer.css +++ b/embark-ui/src/containers/EditorContainer.css @@ -1,4 +1,5 @@ .editor--grid { margin-left: -30px !important; margin-right: -30px !important; + margin-top: -1.5rem !important; } diff --git a/embark-ui/src/containers/EnsContainer.js b/embark-ui/src/containers/EnsContainer.js index 68a7e0d6b..a394c3f75 100644 --- a/embark-ui/src/containers/EnsContainer.js +++ b/embark-ui/src/containers/EnsContainer.js @@ -12,7 +12,7 @@ class EnsContainer extends Component { showEns() { return ( - + diff --git a/embark-ui/src/containers/HomeContainer.js b/embark-ui/src/containers/HomeContainer.js index 29f501514..632f5ec0d 100644 --- a/embark-ui/src/containers/HomeContainer.js +++ b/embark-ui/src/containers/HomeContainer.js @@ -35,11 +35,11 @@ class HomeContainer extends Component { } isEmbark() { - return this.state.activeProcess === EMBARK_PROCESS_NAME + return this.state.activeProcess === EMBARK_PROCESS_NAME; } updateTab(processName = EMBARK_PROCESS_NAME) { - this.props.stopProcessLogs(this.state.activeProcess) + this.props.stopProcessLogs(this.state.activeProcess); this.props.fetchProcessLogs(processName, LOG_LIMIT); this.props.listenToProcessLogs(processName); @@ -93,7 +93,13 @@ HomeContainer.propTypes = { postCommand: PropTypes.func, postCommandSuggestions: PropTypes.func, error: PropTypes.string, - loading: PropTypes.bool + loading: PropTypes.bool, + stopProcessLogs: PropTypes.func, + fetchProcessLogs: PropTypes.func, + listenToProcessLogs: PropTypes.func, + fetchContracts: PropTypes.func, + services: PropTypes.array, + contracts: PropTypes.array }; function mapStateToProps(state) { diff --git a/embark-ui/src/containers/TransactionDecoderContainer.js b/embark-ui/src/containers/TransactionDecoderContainer.js index d4e083bab..0747213c8 100644 --- a/embark-ui/src/containers/TransactionDecoderContainer.js +++ b/embark-ui/src/containers/TransactionDecoderContainer.js @@ -11,7 +11,7 @@ const getQueryParams = (props) => { return qs.parse(props.location.search, { ignoreQueryPrefix: true }); -} +}; class TransactionDecoderContainer extends Component { @@ -33,7 +33,7 @@ class TransactionDecoderContainer extends Component { render() { return ( - + diff --git a/embark-ui/src/reducers/selectors.js b/embark-ui/src/reducers/selectors.js index 555fd3ced..b30348517 100644 --- a/embark-ui/src/reducers/selectors.js +++ b/embark-ui/src/reducers/selectors.js @@ -33,7 +33,7 @@ export function getTransactionsByAccount(state, address) { } export function getTransactionsByBlock(state, blockNumber) { - return state.entities.transactions.filter((transaction) => transaction.blockNumber.toString() === blockNumber); + return state.entities.transactions.filter((transaction) => transaction.hasOwnProperty('blockNumber') && transaction.blockNumber.toString() === blockNumber); } export function getBlocks(state) {