diff --git a/package.json b/package.json index 6e9d5e31..5a7f9d60 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "@babel/node": "^7.0.0", "@babel/preset-env": "^7.1.0", "babel-eslint": "^10.0.1", - "eslint": "^5.7.0", + "eslint": "^5.8.0", "eslint-config-prettier": "^3.1.0", "eslint-loader": "^2.1.1", "eslint-plugin-graphql": "^2.1.1", diff --git a/src/components/Post/PostMeta.module.scss b/src/components/Post/PostMeta.module.scss index 6c768906..1a600aae 100644 --- a/src/components/Post/PostMeta.module.scss +++ b/src/components/Post/PostMeta.module.scss @@ -4,7 +4,7 @@ ///////////////////////////////////// .entryMeta { - font-size: $font-size-base; + font-size: $font-size-small; margin-top: $spacer * 2; color: $brand-grey-light; } diff --git a/src/components/Web3Donation/Alerts.module.scss b/src/components/Web3Donation/Alerts.module.scss index f5b301e9..857df040 100644 --- a/src/components/Web3Donation/Alerts.module.scss +++ b/src/components/Web3Donation/Alerts.module.scss @@ -5,6 +5,10 @@ margin-top: $spacer / 2; font-size: $font-size-small; color: darken($alert-error, 60%); + + &:empty { + display: none; + } } .success { diff --git a/src/components/Web3Donation/InputGroup.jsx b/src/components/Web3Donation/InputGroup.jsx index ff86c05f..a2c8e38e 100644 --- a/src/components/Web3Donation/InputGroup.jsx +++ b/src/components/Web3Donation/InputGroup.jsx @@ -12,7 +12,9 @@ export default class InputGroup extends PureComponent { amount: PropTypes.string.isRequired, onAmountChange: PropTypes.func.isRequired, handleButton: PropTypes.func.isRequired, - selectedAccount: PropTypes.string + selectedAccount: PropTypes.string, + inTransaction: PropTypes.bool, + message: PropTypes.string } render() { @@ -22,10 +24,14 @@ export default class InputGroup extends PureComponent { amount, onAmountChange, handleButton, - selectedAccount + selectedAccount, + inTransaction, + message } = this.props - return ( + return inTransaction ? ( +
Send Ether with MetaMask, Brave, or Mist.
- {web3Connected && ( -