Merge 44b1249 into 5bc5c25

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mailchain-web",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",

src/app/inbox/inbox.component.ts

@@ -252,12 +252,14 @@ export class InboxComponent implements OnInit {
       protocols = res["protocols"]
       if (protocols.length > 0) {
         protocols.forEach(protocol => {
-          protocol["networks"].forEach(network => {
-            this.networks.push({
-              label: network,
-              value: network,
-            })
-          });
+          if (protocol["name"] == "ethereum" ) {
+            protocol["networks"].forEach(network => {
+              this.networks.push({
+                label: network["name"],
+                value: network["name"],
+              })
+            });
+          }
         });
       }
     });

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

@@ -302,6 +302,11 @@ describe('MailchainService', () => {
       expect(mailchainService.filterMessages(messages, {status: "error", readState: true, headersTo: address2})).toEqual([ messages[1] ])
       expect(mailchainService.filterMessages(messages, {status: "error", readState: false, headersTo: address2})).toEqual([ messages[3] ])
     })
+    it('should handle messages returned as null', () => {      
+      expect(mailchainService.filterMessages(null, { status: "ok" })).toEqual([])
+      expect(mailchainService.filterMessages(null, { readState: true })).toEqual([])
+      expect(mailchainService.filterMessages(null, { headersTo: address1 })).toEqual([])
+    })
   })
 
   describe('validateEnsName', () => {

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

@@ -144,14 +144,14 @@ export class MailchainService {
     let readState = options.readState
     let headersTo = options.headersTo
     let output = msgsArray
-    if (status != undefined ) {
-      output = output.filter(msg => msg.status === status)
+    if (status != undefined) {
+      output = output == null ? [] : output.filter(msg => msg.status === status)
     }
     if (readState != undefined) {
-      output = output.filter(msg => msg.read === readState)
+      output = output == null ? [] : output.filter(msg => msg.read === readState)
     }
     if (headersTo != undefined) {
-      output = output.filter(msg => 
+      output = output == null ? [] : output.filter(msg => 
         this.parseAddressFromMailchain(msg["headers"]["to"]) == headersTo
       )      
     }

src/app/test/test-helpers/mailchain-test.service.ts

@@ -244,10 +244,8 @@ export class MailchainTestService {
 
   public protocolsServerResponse(): any {
     return {
-      "protocols": [{
-          "name": "ethereum",
-          "networks": ["goerli", "kovan", "mainnet", "rinkeby", "ropsten"]
-        }]
+      "protocols":
+        [{ "name": "ethereum", "networks": [{ "name": "goerli", "id": "" }, { "name": "kovan", "id": "" }, { "name": "mainnet", "id": "" }, { "name": "rinkeby", "id": "" }, { "name": "ropsten", "id": "" }] }, { "name": "substrate", "networks": [{ "name": "edgeware-testnet", "id": "42" }] }]
     }
   }
 
@@ -263,7 +261,8 @@ export class MailchainTestService {
       { label: "kovan", value: "kovan"}, 
       { label: "mainnet", value: "mainnet"}, 
       { label: "rinkeby", value: "rinkeby"}, 
-      { label: "ropsten", value: "ropsten"}
+      { label: "ropsten", value: "ropsten"},
+      // { label: "edgeware-testnet", value: "edgeware-testnet"}
     ]
   }