Merge branch 'unittestharness' of https://github.com/xmtp/xmtp-react-…

…native into unittestharness
xmtp · May 3, 2023 · 1681da1 · 1681da1
2 parents cae81d2 + eda0ec5
commit 1681da1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/android/src/main/java/expo/modules/xmtpreactnativesdk/XMTPModule.kt b/android/src/main/java/expo/modules/xmtpreactnativesdk/XMTPModule.kt
@@ -247,7 +247,7 @@ class XMTPModule : Module() {
             findConversation(topic = topic, conversationId = conversationId) ?: return
         subscriptions[conversation.cacheKey] = CoroutineScope(Dispatchers.IO).launch {
             try {
-                conversation.streamMessages().collect() { message ->
+                conversation.streamMessages().collect { message ->
                     sendEvent(
                         "message",
                         mapOf(

diff --git a/example/src/ConversationView.tsx b/example/src/ConversationView.tsx
@@ -67,19 +67,11 @@ export default function ConversationView({ route }: Props): JSX.Element {
 
   useEffect(() => {
     const unsubscribe = conversation.streamMessages(async (message) => {
-      const uniqueMessages = [
-        ...new Map(
-          [message, ...messages].map((item: DecodedMessage) => [item.id, item])
-        ).values(),
-      ].sort((a, b) => {
-        return a.sent > b.sent ? 1 : -1;
-      });
-
-      setMessages(uniqueMessages);
+      await loadMessages();
     });
 
     return unsubscribe;
-  });
+  }, []);
 
   return (
     <>