Merge pull request #514 from Bit-Nation/feature/contacts-picker

[chat] Contacts picker
Bit-Nation · Sep 13, 2018 · e0c0519 · e0c0519
2 parents ac286dd + 513a114
commit e0c0519
Show file tree

Hide file tree

Showing 22 changed files with 989 additions and 639 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -25,7 +25,8 @@
     "react/require-default-props":0,
     "max-len": "off",
     "import/prefer-default-export": "off",
-    "class-methods-use-this": "off"
+    "class-methods-use-this": "off",
+    "react/no-did-update-set-state": "off"
   },
   "globals": {
     "Generator": true

diff --git a/__tests__/src/reducers/contacts.js b/__tests__/src/reducers/contacts.js
@@ -56,6 +56,7 @@ describe('contacts reducer action handling', () => {
       ...stateBefore,
       isFetching: false,
       contacts: [profileMock],
+      fetchError: null,
     });
   });
 

diff --git a/__tests__/src/sagas/contacts/sagas.js b/__tests__/src/sagas/contacts/sagas.js
@@ -3,7 +3,7 @@
 import { call, put } from 'redux-saga/effects';
 import { cloneableGenerator } from 'redux-saga/utils';
 
-import { addContact, contactsFetchFailed, contactsUpdated } from '../../../../src/actions/contacts';
+import { addContact, contactsFetchFailed, contactsUpdated, startContactsFetch } from '../../../../src/actions/contacts';
 import { addNewContact, fetchContacts } from '../../../../src/sagas/contacts/sagas';
 import { getProfile } from '../../../../src/sagas/chat/sagas';
 import ContactsService from '../../../../src/services/contacts';
@@ -42,7 +42,7 @@ test('addNewContact', () => {
 
   expect(gen.next(mockProfile).value).toEqual(call(ContactsService.addContact, mockIdentityKey));
   expect(gen.next().value).toEqual(call(mockCallback, null));
-  expect(gen.next().value).toEqual(put(fetchContacts));
+  expect(gen.next().value).toEqual(put(startContactsFetch()));
 });
 
 test('fetchContacts', () => {