refactor: Combine into single if statement when checking if valid Eth…

…/Etc address
openethereum · Apr 12, 2019 · b5296af · b5296af
1 parent 2e7a89e
commit b5296af
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/packages/fether-react/src/Send/TxForm/TxForm.js b/packages/fether-react/src/Send/TxForm/TxForm.js
@@ -423,16 +423,12 @@ class TxForm extends Component {
       };
     } else if (balance && balance.lt(amountBn)) {
       return { amount: `You don't have enough ${token.symbol} balance` };
-    } else if (
-      (!values.to || !isAddress(values.to)) &&
-      !isEtcChainId(currentChainIdBN)
-    ) {
-      return { to: 'Please enter a valid Ethereum address' };
-    } else if (
-      (!values.to || isAddress(values.to)) &&
-      isEtcChainId(currentChainIdBN)
-    ) {
-      return { to: 'Please enter a valid Ethereum Classic address' };
+    } else if (!values.to || !isAddress(values.to)) {
+      return {
+        to: `Please enter a valid Ethereum ${
+          isEtcChainId(currentChainIdBN) ? 'Classic address' : 'address'
+        }`
+      };
     } else if (values.to === '0x0000000000000000000000000000000000000000') {
       return {
         to: `You are not permitted to send ${