[merge] Merged chat.

Bit-Nation · Aug 15, 2018 · 215c88d · 215c88d
2 parents c9f2788 + ad0de2b
commit 215c88d
Show file tree

Hide file tree

Showing 27 changed files with 1,233 additions and 876 deletions.
diff --git a/.env.dev.example b/.env.dev.example
diff --git a/__tests__/src/sagas/accounts/sagas.js b/__tests__/src/sagas/accounts/sagas.js
diff --git a/android/panthalassa.aar b/android/panthalassa.aar
diff --git a/android/panthalassa/panthalassa.aar b/android/panthalassa/panthalassa.aar
diff --git a/ios/Frameworks/panthalassa.framework/Versions/A/Headers/Panthalassa.objc.h b/ios/Frameworks/panthalassa.framework/Versions/A/Headers/Panthalassa.objc.h
diff --git a/ios/Frameworks/panthalassa.framework/Versions/A/Panthalassa b/ios/Frameworks/panthalassa.framework/Versions/A/Panthalassa
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
diff --git a/src/actions/chat.js b/src/actions/chat.js
diff --git a/src/reducers/chat.js b/src/reducers/chat.js
diff --git a/src/sagas/accounts/sagas.js b/src/sagas/accounts/sagas.js
diff --git a/src/sagas/chat/index.js b/src/sagas/chat/index.js
diff --git a/src/sagas/chat/sagas.js b/src/sagas/chat/sagas.js
diff --git a/src/sagas/upstream/uiAPI.js b/src/sagas/upstream/uiAPI.js
diff --git a/src/screens/PrivateChat/Chat/index.js b/src/screens/PrivateChat/Chat/index.js
diff --git a/src/screens/PrivateChat/ChatList/NewChatModal.js b/src/screens/PrivateChat/ChatList/NewChatModal.js
diff --git a/src/screens/PrivateChat/ChatList/index.js b/src/screens/PrivateChat/ChatList/index.js
diff --git a/src/screens/WalletScreen/SendMoney/index.js b/src/screens/WalletScreen/SendMoney/index.js
diff --git a/src/services/accounts/index.js b/src/services/accounts/index.js
diff --git a/src/services/chat/compiled.js b/src/services/chat/compiled.js
diff --git a/src/services/chat/index.js b/src/services/chat/index.js
diff --git a/src/services/chat/profile.proto b/src/services/chat/profile.proto
diff --git a/src/services/dApps/index.js b/src/services/dApps/index.js
diff --git a/src/services/panthalassa/index.js b/src/services/panthalassa/index.js
diff --git a/src/services/upstream/upstream.js b/src/services/upstream/upstream.js
diff --git a/src/types/Chat.js b/src/types/Chat.js
diff --git a/src/utils/chat.js b/src/utils/chat.js