handle validation for substrate addresses (relaxed)

src/app/inbox/inbox-compose/inbox-compose.component.spec.ts

@@ -346,40 +346,59 @@ describe('InboxComposeComponent', () => {
   })
 
   describe('resolveAddress', () => {
-    it('should call nameserviceService.resolveName if given a name-like value', () => {
-      spyOn(nameserviceService, 'resolveName').and.callThrough()
-      component.resolveAddress(ensName)
-      expect(nameserviceService.resolveName).toHaveBeenCalled()
-
-    })
-    it('should call nameserviceService.resolveName with params for protocol, network & name-like value', () => {
-      spyOn(nameserviceService, 'resolveName').and.callThrough()
-      component.resolveAddress(ensName)
-      expect(nameserviceService.resolveName).toHaveBeenCalledWith(
-        component.currentProtocol,
-        component.currentNetwork,
-        ensName
-      )
-    })
-    it('should return an observable with body containing address hash if given a name-like value', async () => {
-      let obs = await component.resolveAddress(ensName)
-      let expectedBody = { address: currentAccount }
-      obs.subscribe(res => {
-        expect(res['body']).toEqual(expectedBody)
+    describe('in ethereum', () => {
+
+      it('should call nameserviceService.resolveName if given a name-like value', () => {
+        spyOn(nameserviceService, 'resolveName').and.callThrough()
+        component.currentProtocol = 'ethereum'
+        component.resolveAddress(ensName)
+        expect(nameserviceService.resolveName).toHaveBeenCalled()
+
       })
-    })
-    it('should return an observable with body containing address hash if given an address-like value', async () => {
-      let obs = await component.resolveAddress(currentAccount)
-      let expectedBody = { address: currentAccount }
-      obs.subscribe(res => {
-        expect(res['body']).toEqual(expectedBody)
+      it('should call nameserviceService.resolveName with params for protocol, network & name-like value ', () => {
+        spyOn(nameserviceService, 'resolveName').and.callThrough()
+        component.currentProtocol = 'ethereum'
+        component.resolveAddress(ensName)
+        expect(nameserviceService.resolveName).toHaveBeenCalledWith(
+          component.currentProtocol,
+          component.currentNetwork,
+          ensName
+        )
+      })
+      it('should return an observable with body containing address hash if given a name-like value', async () => {
+        component.currentProtocol = 'ethereum'
+        let obs = await component.resolveAddress(ensName)
+        let expectedBody = { address: currentAccount }
+        obs.subscribe(res => {
+          expect(res['body']).toEqual(expectedBody)
+        })
+      })
+      it('should return an observable with body containing address hash if given an address-like value', async () => {
+        component.currentProtocol = 'ethereum'
+        let obs = await component.resolveAddress(currentAccount)
+        let expectedBody = { address: currentAccount }
+        obs.subscribe(res => {
+          expect(res['body']).toEqual(expectedBody)
+        })
+      })
+      it('should return an observable with body containing empty address hash if given a value that is not name-like or address-like', async () => {
+        component.currentProtocol = 'ethereum'
+        let obs = await component.resolveAddress('string')
+        let expectedBody = { address: '' }
+        obs.subscribe(res => {
+          expect(res['body']).toEqual(expectedBody)
+        })
       })
     })
-    it('should return an observable with body containing empty address hash if given a value that is not name-like or address-like', async () => {
-      let obs = await component.resolveAddress('string')
-      let expectedBody = { address: '' }
-      obs.subscribe(res => {
-        expect(res['body']).toEqual(expectedBody)
+    describe('in substrate', () => {
+
+      it('should return an observable with body containing address hash if given an address-like value', async () => {
+        component.currentProtocol = 'substrate'
+        let obs = await component.resolveAddress(currentAccount)
+        let expectedBody = { address: currentAccount }
+        obs.subscribe(res => {
+          expect(res['body']).toEqual(expectedBody)
+        })
       })
     })
   })

src/app/inbox/inbox-compose/inbox-compose.component.ts

@@ -194,15 +194,17 @@ export class InboxComposeComponent implements OnInit {
     ).subscribe((res) => {
       res.subscribe(val => {
         let address = val['body']['address']
-        if (this.mailchainService.validateEthAddress(address)) {
+        if (
+          (this.currentProtocol == 'ethereum' && this.mailchainService.validateEthAddress(address)) ||
+          (this.currentProtocol == 'substrate' && this.mailchainService.validateSubstrateAddress(address))
+        ) {
           this.model.to = address
           this.setRecipientLoadingIcon('valid')
           this.setRecipientLoadingText('valid address')
         } else {
           this.setRecipientLoadingIcon('invalid')
           this.setRecipientLoadingText('invalid address')
         }
-
       }, err => {
         this.setRecipientLoadingIcon('invalid')
         this.setRecipientLoadingText(err['error']['message'])
@@ -228,21 +230,33 @@ export class InboxComposeComponent implements OnInit {
   public async resolveAddress(value) {
     let returnObs
 
-    if (this.mailchainService.validateEnsName(value)) {
-      returnObs = await this.nameserviceService.resolveName(
-        this.currentProtocol,
-        this.currentNetwork,
-        value
-      )
-    } else if (this.mailchainService.validateEthAddress(value)) {
-      returnObs = of(
-        { body: { address: value } }
-      )
-    } else {
-      returnObs = of(
-        { body: { address: '' } }
-      )
-    }
+    if (this.currentProtocol == 'ethereum') {
+      if (this.mailchainService.validateEnsName(value)) {
+        returnObs = await this.nameserviceService.resolveName(
+          this.currentProtocol,
+          this.currentNetwork,
+          value
+        )
+      } else if (this.mailchainService.validateEthAddress(value)) {
+        returnObs = of(
+          { body: { address: value } }
+        )
+      } else {
+        returnObs = of(
+          { body: { address: '' } }
+        )
+      }
+    } else if (this.currentProtocol == 'substrate') {
+      if (this.mailchainService.validateSubstrateAddress(value)) {
+        returnObs = of(
+          { body: { address: value } }
+        )
+      } else {
+        returnObs = of(
+          { body: { address: '' } }
+        )
+      }
+    };
 
     return returnObs
 

src/app/services/mailchain/mailchain.service.ts

@@ -211,6 +211,17 @@ export class MailchainService {
     return regex.test(value)
   }
 
+  /**
+   * tests the value matches the Substrate Address Regex
+   * @param value the address value to test, e.g. TODOTODO
+   * expects TODODO
+   */
+  public validateSubstrateAddress(value) {
+    // let regex = new RegExp('0x[0-9a-fA-F]{40}$');
+    // return regex.test(value)
+    return true
+  }
+
   /**
    * getContentTypeForView: determines how the application should handle various content types in messages.
    * Returns `html` or `plaintext` based on the contentType provided.