check src address on eth to sys wizard

Author: jagdeep sidhu

src/wizard/Step1EthToSys.js

@@ -384,7 +384,14 @@ class Step1ES extends Component {
     this.setState(Object.assign(userInput, validateNewInput, this._validationErrors(validateNewInput)));
     let syscoinERC20Manager = new web3.eth.Contract(erc20Managerabi,  CONFIGURATION.ERC20Manager);
     let contractBase = new web3.eth.Contract(assetabi, userInput.sysxContract);
-    let fromAccount = userInput.sysxFromAccount;
+    if (!web3.utils.isAddress(userInput.sysxFromAccount)) {
+      validateNewInput.buttonVal = false;
+      validateNewInput.buttonValMsg = this.props.t("step1InvalidNEVM");
+      this.setState({working: false});
+      this.setState(Object.assign(userInput, validateNewInput, this._validationErrors(validateNewInput)));  
+      return;
+    }
+    let fromAccount = userInput.sysxFromAccount; 
     let assetGUID = userInput.toSysAssetGUID;
     let syscoinWitnessAddress = userInput.syscoinWitnessAddress;
     try {

src/wizard/Step1SysToEth.js

@@ -143,8 +143,8 @@ class Step1 extends Component {
     if (!web3.utils.isAddress(userInput.ethaddress)) {
       validateNewInput.buttonVal = false;
       validateNewInput.buttonValMsg = this.props.t("step1FSInvalidDestination");
-      self.setState({working: false});
-      self.setState(Object.assign(userInput, validateNewInput, this._validationErrors(validateNewInput)));  
+      this.setState({working: false});
+      this.setState(Object.assign(userInput, validateNewInput, this._validationErrors(validateNewInput)));  
       return;
     }  
     let self = this;

src/wizard/i18n.js

@@ -46,6 +46,7 @@ i18n.use(LanguageDetector).init({
         'step1ESEnterWitnessAddress': 'Enter receiving Syscoin address...',
         'step1FSInputMissing': 'Amount or destination address not provided',
         'step1FSInvalidDestination': 'Invalid destination address (check the type of network you are sending from/to)',
+        'step1InvalidNEVM': 'Invalid NEVM address',
         'step1FSStatus': 'Status',
         'step1FSAmount': 'Amount',
         'step1FSDestinationAddress': 'Destination Address',
@@ -184,6 +185,7 @@ i18n.use(LanguageDetector).init({
         'step1ESEnterWitnessAddress': 'Enter receiving Syscoin address...',
         'step1FSInputMissing': 'Amount or destination address not provided',
         'step1FSInvalidDestination': 'Invalid destination address (check the type of network you are sending from/to)',
+        'step1InvalidNEVM': 'Invalid NEVM address',
         'step1FSStatus': 'Status',
         'step1FSAmount': 'Amount',
         'step1FSDestinationAddress': 'Destination Address',
@@ -322,6 +324,7 @@ i18n.use(LanguageDetector).init({
         'step1ESEnterWitnessAddress': 'Enter receiving Syscoin address...',
         'step1FSInputMissing': 'Amount or destination address not provided',
         'step1FSInvalidDestination': 'Invalid destination address (check the type of network you are sending from/to)',
+        'step1InvalidNEVM': 'Invalid NEVM address',
         'step1FSStatus': 'Status',
         'step1FSAmount': 'Amount',
         'step1FSDestinationAddress': 'Destination Address',