From c0bdc8cd727dab26258c282e695cd964cd0408de Mon Sep 17 00:00:00 2001
From: Matthias Kretschmann <m@kretschmann.io>
Date: Sun, 14 Oct 2018 18:33:46 +0200
Subject: [PATCH] fix no account message, alerts refactor

---
 src/components/Web3Donation/Alerts.jsx | 114 +++++++++++++------------
 1 file changed, 60 insertions(+), 54 deletions(-)

diff --git a/src/components/Web3Donation/Alerts.jsx b/src/components/Web3Donation/Alerts.jsx
index 84ffd6f6..edcb4308 100644
--- a/src/components/Web3Donation/Alerts.jsx
+++ b/src/components/Web3Donation/Alerts.jsx
@@ -1,62 +1,68 @@
-import React, { Fragment } from 'react'
+import React, { Fragment, PureComponent } from 'react'
 import PropTypes from 'prop-types'
 import styles from './Alerts.module.scss'
 
-const alertMessages = (networkName, transactionHash) => ({
-  noAccount:
-    'Web3 detected, but no account. Are you logged into your MetaMask account?',
-  noCorrectNetwork: `Please connect to <strong>Main</strong> network. You are on <strong>${networkName}</strong> right now.`,
-  noWeb3:
-    'No Web3 detected. Install <a href="https://metamask.io">MetaMask</a>, <a href="https://brave.com">Brave</a>, or <a href="https://github.com/ethereum/mist">Mist</a>.',
-  success: `You are awesome, thanks!<br />
-      <a href="https://etherscan.io/tx/${transactionHash}">
-        See your transaction on etherscan.io.
-      </a>`
-})
+const Message = ({ message, ...props }) => (
+  <div dangerouslySetInnerHTML={{ __html: message }} {...props} />
+)
 
-const Alerts = ({
-  hasCorrectNetwork,
-  hasAccount,
-  networkName,
-  error,
-  transactionHash,
-  web3Connected
-}) => {
-  return !web3Connected ? (
-    <small dangerouslySetInnerHTML={{ __html: alertMessages().noWeb3 }} />
-  ) : (
-    <Fragment>
+export default class Alerts extends PureComponent {
+  static propTypes = {
+    hasCorrectNetwork: PropTypes.bool,
+    hasAccount: PropTypes.bool,
+    networkName: PropTypes.string,
+    error: PropTypes.object,
+    transactionHash: PropTypes.string,
+    web3Connected: PropTypes.bool
+  }
+
+  alertMessages = (networkName, transactionHash) => ({
+    noAccount:
+      'Web3 detected, but no account. Are you logged into your MetaMask account?',
+    noCorrectNetwork: `Please connect to <strong>Main</strong> network. You are on <strong>${networkName}</strong> right now.`,
+    noWeb3:
+      'No Web3 detected. Install <a href="https://metamask.io">MetaMask</a>, <a href="https://brave.com">Brave</a>, or <a href="https://github.com/ethereum/mist">Mist</a>.',
+    success: `You are awesome, thanks!<br />
+        <a href="https://etherscan.io/tx/${transactionHash}">
+          See your transaction on etherscan.io.
+        </a>`
+  })
+
+  render() {
+    const {
+      hasCorrectNetwork,
+      hasAccount,
+      networkName,
+      error,
+      transactionHash,
+      web3Connected
+    } = this.props
+
+    return (
       <div className={styles.alert}>
-        {!hasAccount && <div>{alertMessages().noaccount}</div>}
-        {!hasCorrectNetwork && (
-          <div
-            dangerouslySetInnerHTML={{
-              __html: alertMessages(networkName).noCorrectNetwork
-            }}
-          />
+        {!web3Connected ? (
+          <Message message={this.alertMessages().noWeb3} />
+        ) : (
+          <Fragment>
+            {!hasAccount && (
+              <Message message={this.alertMessages().noAccount} />
+            )}
+            {!hasCorrectNetwork && (
+              <Message
+                message={this.alertMessages(networkName).noCorrectNetwork}
+              />
+            )}
+            {error && <Message message={error.message} />}
+
+            {transactionHash && (
+              <Message
+                className={styles.success}
+                message={this.alertMessages(transactionHash).success}
+              />
+            )}
+          </Fragment>
         )}
-        {error && <div>{error.message}</div>}
       </div>
-
-      {transactionHash && (
-        <div
-          className={styles.success}
-          dangerouslySetInnerHTML={{
-            __html: alertMessages(transactionHash).success
-          }}
-        />
-      )}
-    </Fragment>
-  )
+    )
+  }
 }
-
-Alerts.propTypes = {
-  hasCorrectNetwork: PropTypes.bool,
-  hasAccount: PropTypes.bool,
-  networkName: PropTypes.string,
-  error: PropTypes.object,
-  transactionHash: PropTypes.string,
-  web3Connected: PropTypes.bool
-}
-
-export default Alerts