From 8dddf48904323d47685516ccc76f9e267dbd188a Mon Sep 17 00:00:00 2001
From: Jonathan Smirnoff <7558841+jonathansmirnoff@users.noreply.github.com>
Date: Wed, 13 Feb 2019 17:30:46 -0300
Subject: Fixed issue #5838 (#6001)

Update changelog file
---
 .../send/send-content/send-to-row/send-to-row.utils.js           | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'ui/app/components/send/send-content/send-to-row/send-to-row.utils.js')

diff --git a/ui/app/components/send/send-content/send-to-row/send-to-row.utils.js b/ui/app/components/send/send-content/send-to-row/send-to-row.utils.js
index 4a8add42e..2bd3ea45e 100644
--- a/ui/app/components/send/send-content/send-to-row/send-to-row.utils.js
+++ b/ui/app/components/send/send-content/send-to-row/send-to-row.utils.js
@@ -2,20 +2,21 @@ const {
   REQUIRED_ERROR,
   INVALID_RECIPIENT_ADDRESS_ERROR,
   KNOWN_RECIPIENT_ADDRESS_ERROR,
+  INVALID_RECIPIENT_ADDRESS_NOT_ETH_NETWORK_ERROR,
 } = require('../../send.constants')
-const { isValidAddress } = require('../../../../util')
+const { isValidAddress, isEthNetwork } = require('../../../../util')
 import { checkExistingAddresses } from '../../../pages/add-token/util'
 
 const ethUtil = require('ethereumjs-util')
 const contractMap = require('eth-contract-metadata')
 
-function getToErrorObject (to, toError = null, hasHexData = false, tokens = [], selectedToken = null) {
+function getToErrorObject (to, toError = null, hasHexData = false, tokens = [], selectedToken = null, network) {
   if (!to) {
     if (!hasHexData) {
       toError = REQUIRED_ERROR
     }
-  } else if (!isValidAddress(to) && !toError) {
-    toError = INVALID_RECIPIENT_ADDRESS_ERROR
+  } else if (!isValidAddress(to, network) && !toError) {
+    toError = isEthNetwork(network) ? INVALID_RECIPIENT_ADDRESS_ERROR : INVALID_RECIPIENT_ADDRESS_NOT_ETH_NETWORK_ERROR
   } else if (selectedToken && (ethUtil.toChecksumAddress(to) in contractMap || checkExistingAddresses(to, tokens))) {
     toError = KNOWN_RECIPIENT_ADDRESS_ERROR
   }
-- 
cgit