diff --git a/web/cashtab/src/components/Send/SendToken.js b/web/cashtab/src/components/Send/SendToken.js --- a/web/cashtab/src/components/Send/SendToken.js +++ b/web/cashtab/src/components/Send/SendToken.js @@ -252,8 +252,6 @@ let error = false; let addressString = value; - const isValid = isValidEtokenAddress(addressString); - const addressInfo = parseAddressForParams(addressString); /* Model @@ -271,13 +269,11 @@ // Show an alert that only amount and currency.ticker are supported setQueryStringText(queryString); + const isValid = + isValidEtokenAddress(address) || isValidXecAddress(address); // Is this valid address? if (!isValid) { - error = 'Address is not a valid etoken: address'; - // If valid address but xec format - if (isValidXecAddress(address)) { - error = `Cashtab does not support sending eTokens to XEC addresses. Please convert to an eToken address.`; - } + error = 'Address is not a valid ecash: address'; } setSendTokenAddressError(error);