Merge branch 'issues/mailchain/434' into issues/mailchain/release_0.0.38

mailchain · Dec 2, 2019 · ec8e65f · ec8e65f
2 parents ae50fe2 + af6ec6d
commit ec8e65f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/app/services/mailchain/mailchain.service.spec.ts b/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', () => {

diff --git a/src/app/services/mailchain/mailchain.service.ts b/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
       )      
     }