From fe69a544ce0ff0ec84d845b6ec8e2ce75bbba3b8 Mon Sep 17 00:00:00 2001
From: Pat Nakajima <patnakajima@gmail.com>
Date: Thu, 21 Sep 2023 13:31:45 -0400
Subject: [PATCH 1/8] wip

---
 example/src/LaunchScreen.tsx | 57 +++++++++++++++++++++++++++++-------
 src/lib/Conversations.ts     | 14 +++++----
 2 files changed, 54 insertions(+), 17 deletions(-)

diff --git a/example/src/LaunchScreen.tsx b/example/src/LaunchScreen.tsx
index e5c6d8111..38eaf1b57 100644
--- a/example/src/LaunchScreen.tsx
+++ b/example/src/LaunchScreen.tsx
@@ -16,7 +16,7 @@ export default function LaunchScreen({
   let savedKeys = useSavedKeys();
   const configureWallet = (
     label: string,
-    configuring: Promise<XMTP.Client>,
+    configuring: Promise<XMTP.Client>
   ) => {
     console.log("Connecting XMTP client", label);
     configuring
@@ -73,8 +73,8 @@ export default function LaunchScreen({
           color="green"
           onPress={() => {
             configureWallet(
-              'dev',
-              XMTP.Client.createRandom({ env: 'dev', appVersion }),
+              "dev",
+              XMTP.Client.createRandom({ env: "dev", appVersion })
             );
           }}
         />
@@ -85,8 +85,8 @@ export default function LaunchScreen({
           color="purple"
           onPress={() => {
             configureWallet(
-              'local',
-              XMTP.Client.createRandom({ env: 'local', appVersion }),
+              "local",
+              XMTP.Client.createRandom({ env: "local", appVersion })
             );
           }}
         />
@@ -112,11 +112,11 @@ export default function LaunchScreen({
               color="green"
               onPress={() => {
                 configureWallet(
-                  'dev',
+                  "dev",
                   XMTP.Client.createFromKeyBundle(savedKeys.keyBundle!, {
-                    env: 'dev',
+                    env: "dev",
                     appVersion,
-                  }),
+                  })
                 );
               }}
             />
@@ -127,11 +127,11 @@ export default function LaunchScreen({
               color="purple"
               onPress={() => {
                 configureWallet(
-                  'local',
+                  "local",
                   XMTP.Client.createFromKeyBundle(savedKeys.keyBundle!, {
-                    env: 'local',
+                    env: "local",
                     appVersion,
-                  }),
+                  })
                 );
               }}
             />
@@ -145,6 +145,41 @@ export default function LaunchScreen({
           </View>
         </>
       )}
+
+      <Button
+        title="Test Stream"
+        onPress={async () => {
+          console.log("testing streamsies");
+          const client1 = await XMTP.Client.createRandom();
+          const client2 = await XMTP.Client.createRandom();
+          const client3 = await XMTP.Client.createRandom();
+
+          const convo1 = await client3.conversations.newConversation(
+            client1.address
+          );
+
+          const convo2 = await client3.conversations.newConversation(
+            client2.address
+          );
+
+          await Promise.all([
+            client1.conversations.streamAllMessages(async (message) => {
+              console.log("client1 message", message);
+            }),
+
+            client2.conversations.streamAllMessages(async (message) => {
+              console.log("client2 message", message);
+            }),
+
+            async () => {
+              setTimeout(async () => {
+                console.log("sending message");
+                await convo1.send("hi");
+              }, 1000);
+            },
+          ]);
+        }}
+      />
     </ScrollView>
   );
 }
diff --git a/src/lib/Conversations.ts b/src/lib/Conversations.ts
index 0e471521a..c69ccadd0 100644
--- a/src/lib/Conversations.ts
+++ b/src/lib/Conversations.ts
@@ -24,7 +24,7 @@ export default class Conversations {
   async importTopicData(topicData: string): Promise<Conversation> {
     const conversation = await XMTPModule.importConversationTopicData(
       this.client.address,
-      topicData,
+      topicData
     );
     this.known[conversation.topic] = true;
     return conversation;
@@ -32,12 +32,12 @@ export default class Conversations {
 
   async newConversation(
     peerAddress: string,
-    context?: ConversationContext,
+    context?: ConversationContext
   ): Promise<Conversation> {
     return await XMTPModule.createConversation(
       this.client.address,
       peerAddress,
-      context,
+      context
     );
   }
 
@@ -61,12 +61,12 @@ export default class Conversations {
 
         this.known[conversation.topic] = true;
         await callback(new Conversation(conversation));
-      },
+      }
     );
   }
 
   async streamAllMessages(
-    callback: (message: DecodedMessage) => Promise<void>,
+    callback: (message: DecodedMessage) => Promise<void>
   ) {
     XMTPModule.subscribeToAllMessages(this.client.address);
     XMTPModule.emitter.addListener(
@@ -79,15 +79,17 @@ export default class Conversations {
         message: DecodedMessage;
       }) => {
         if (clientAddress !== this.client.address) {
+          console.log("client address doesnt match this client address");
           return;
         }
         if (this.known[message.id]) {
+          console.log("known contains message id");
           return;
         }
 
         this.known[message.id] = true;
         await callback(message as DecodedMessage);
-      },
+      }
     );
   }
 

From d5f5c217693ad1a22372f5385e0e92cac894dcee Mon Sep 17 00:00:00 2001
From: Pat Nakajima <patnakajima@gmail.com>
Date: Thu, 21 Sep 2023 14:08:42 -0400
Subject: [PATCH 2/8] Don't cancel all subscriptions

---
 ios/XMTPModule.swift | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ios/XMTPModule.swift b/ios/XMTPModule.swift
index 30df006fe..7c435d93d 100644
--- a/ios/XMTPModule.swift
+++ b/ios/XMTPModule.swift
@@ -570,10 +570,10 @@ public class XMTPModule: Module {
             return
         }
 
-        await subscriptionsManager.getSubscription(key: "conversations")?.cancel()
-        await subscriptionsManager.updateSubscription(key: "conversations", task: Task {
+			await subscriptionsManager.getSubscription(key: "conversations:\(client.address)")?.cancel()
+			await subscriptionsManager.updateSubscription(key: "conversations:\(client.address)", task: Task {
             do {
-                for try await conversation in try await client.conversations.stream() {
+                for try await conversation in await client.conversations.stream() {
                     try sendEvent("conversation", [
                         "clientAddress": clientAddress,
                         "conversation": ConversationWrapper.encodeToObj(conversation, client: client),
@@ -591,8 +591,8 @@ public class XMTPModule: Module {
             return
         }
 
-        await subscriptionsManager.getSubscription(key: "messages")?.cancel()
-        await subscriptionsManager.updateSubscription(key: "messages", task: Task {
+			await subscriptionsManager.getSubscription(key: "messages:\(client.address)")?.cancel()
+			await subscriptionsManager.updateSubscription(key: "messages:\(client.address)", task: Task {
             do {
                 for try await message in try await client.conversations.streamAllMessages() {
                     do {

From 2fd86e979de8e89c35197a5a056db20f74230dce Mon Sep 17 00:00:00 2001
From: Pat Nakajima <patnakajima@gmail.com>
Date: Thu, 21 Sep 2023 14:08:53 -0400
Subject: [PATCH 3/8] Revert "wip"

This reverts commit fe69a544ce0ff0ec84d845b6ec8e2ce75bbba3b8.
---
 example/src/LaunchScreen.tsx | 57 +++++++-----------------------------
 src/lib/Conversations.ts     | 14 ++++-----
 2 files changed, 17 insertions(+), 54 deletions(-)

diff --git a/example/src/LaunchScreen.tsx b/example/src/LaunchScreen.tsx
index 38eaf1b57..e5c6d8111 100644
--- a/example/src/LaunchScreen.tsx
+++ b/example/src/LaunchScreen.tsx
@@ -16,7 +16,7 @@ export default function LaunchScreen({
   let savedKeys = useSavedKeys();
   const configureWallet = (
     label: string,
-    configuring: Promise<XMTP.Client>
+    configuring: Promise<XMTP.Client>,
   ) => {
     console.log("Connecting XMTP client", label);
     configuring
@@ -73,8 +73,8 @@ export default function LaunchScreen({
           color="green"
           onPress={() => {
             configureWallet(
-              "dev",
-              XMTP.Client.createRandom({ env: "dev", appVersion })
+              'dev',
+              XMTP.Client.createRandom({ env: 'dev', appVersion }),
             );
           }}
         />
@@ -85,8 +85,8 @@ export default function LaunchScreen({
           color="purple"
           onPress={() => {
             configureWallet(
-              "local",
-              XMTP.Client.createRandom({ env: "local", appVersion })
+              'local',
+              XMTP.Client.createRandom({ env: 'local', appVersion }),
             );
           }}
         />
@@ -112,11 +112,11 @@ export default function LaunchScreen({
               color="green"
               onPress={() => {
                 configureWallet(
-                  "dev",
+                  'dev',
                   XMTP.Client.createFromKeyBundle(savedKeys.keyBundle!, {
-                    env: "dev",
+                    env: 'dev',
                     appVersion,
-                  })
+                  }),
                 );
               }}
             />
@@ -127,11 +127,11 @@ export default function LaunchScreen({
               color="purple"
               onPress={() => {
                 configureWallet(
-                  "local",
+                  'local',
                   XMTP.Client.createFromKeyBundle(savedKeys.keyBundle!, {
-                    env: "local",
+                    env: 'local',
                     appVersion,
-                  })
+                  }),
                 );
               }}
             />
@@ -145,41 +145,6 @@ export default function LaunchScreen({
           </View>
         </>
       )}
-
-      <Button
-        title="Test Stream"
-        onPress={async () => {
-          console.log("testing streamsies");
-          const client1 = await XMTP.Client.createRandom();
-          const client2 = await XMTP.Client.createRandom();
-          const client3 = await XMTP.Client.createRandom();
-
-          const convo1 = await client3.conversations.newConversation(
-            client1.address
-          );
-
-          const convo2 = await client3.conversations.newConversation(
-            client2.address
-          );
-
-          await Promise.all([
-            client1.conversations.streamAllMessages(async (message) => {
-              console.log("client1 message", message);
-            }),
-
-            client2.conversations.streamAllMessages(async (message) => {
-              console.log("client2 message", message);
-            }),
-
-            async () => {
-              setTimeout(async () => {
-                console.log("sending message");
-                await convo1.send("hi");
-              }, 1000);
-            },
-          ]);
-        }}
-      />
     </ScrollView>
   );
 }
diff --git a/src/lib/Conversations.ts b/src/lib/Conversations.ts
index c69ccadd0..0e471521a 100644
--- a/src/lib/Conversations.ts
+++ b/src/lib/Conversations.ts
@@ -24,7 +24,7 @@ export default class Conversations {
   async importTopicData(topicData: string): Promise<Conversation> {
     const conversation = await XMTPModule.importConversationTopicData(
       this.client.address,
-      topicData
+      topicData,
     );
     this.known[conversation.topic] = true;
     return conversation;
@@ -32,12 +32,12 @@ export default class Conversations {
 
   async newConversation(
     peerAddress: string,
-    context?: ConversationContext
+    context?: ConversationContext,
   ): Promise<Conversation> {
     return await XMTPModule.createConversation(
       this.client.address,
       peerAddress,
-      context
+      context,
     );
   }
 
@@ -61,12 +61,12 @@ export default class Conversations {
 
         this.known[conversation.topic] = true;
         await callback(new Conversation(conversation));
-      }
+      },
     );
   }
 
   async streamAllMessages(
-    callback: (message: DecodedMessage) => Promise<void>
+    callback: (message: DecodedMessage) => Promise<void>,
   ) {
     XMTPModule.subscribeToAllMessages(this.client.address);
     XMTPModule.emitter.addListener(
@@ -79,17 +79,15 @@ export default class Conversations {
         message: DecodedMessage;
       }) => {
         if (clientAddress !== this.client.address) {
-          console.log("client address doesnt match this client address");
           return;
         }
         if (this.known[message.id]) {
-          console.log("known contains message id");
           return;
         }
 
         this.known[message.id] = true;
         await callback(message as DecodedMessage);
-      }
+      },
     );
   }
 

From 4fa09ad985fd5137b3d1b14ab52955b04683e637 Mon Sep 17 00:00:00 2001
From: Naomi Plasterer <naomi@xmtp.com>
Date: Thu, 21 Sep 2023 12:50:36 -0700
Subject: [PATCH 4/8] fix: fixes android and adds it to a few more places in
 ios

---
 .../modules/xmtpreactnativesdk/XMTPModule.kt  | 20 +++++++++----------
 ios/XMTPModule.swift                          | 20 +++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/android/src/main/java/expo/modules/xmtpreactnativesdk/XMTPModule.kt b/android/src/main/java/expo/modules/xmtpreactnativesdk/XMTPModule.kt
index 69c9a5d12..10c18b0e8 100644
--- a/android/src/main/java/expo/modules/xmtpreactnativesdk/XMTPModule.kt
+++ b/android/src/main/java/expo/modules/xmtpreactnativesdk/XMTPModule.kt
@@ -441,14 +441,14 @@ class XMTPModule : Module() {
             )
         }
 
-        Function("unsubscribeFromConversations") {
+        Function("unsubscribeFromConversations") { clientAddress: String ->
             logV("unsubscribeFromConversations")
-            subscriptions["conversations"]?.cancel()
+            subscriptions["conversations:$clientAddress"]?.cancel()
         }
 
-        Function("unsubscribeFromAllMessages") {
+        Function("unsubscribeFromAllMessages") { clientAddress: String ->
             logV("unsubscribeFromAllMessages")
-            subscriptions["messages"]?.cancel()
+            subscriptions["messages:$clientAddress"]?.cancel()
         }
 
         AsyncFunction("unsubscribeFromMessages") { clientAddress: String, topic: String ->
@@ -517,8 +517,8 @@ class XMTPModule : Module() {
     private fun subscribeToConversations(clientAddress: String) {
         val client = clients[clientAddress] ?: throw XMTPException("No client")
 
-        subscriptions["conversations"]?.cancel()
-        subscriptions["conversations"] = CoroutineScope(Dispatchers.IO).launch {
+        subscriptions["conversations:${clientAddress})"]?.cancel()
+        subscriptions["conversations:${clientAddress}"] = CoroutineScope(Dispatchers.IO).launch {
             try {
                 client.conversations.stream().collect { conversation ->
                     sendEvent(
@@ -531,7 +531,7 @@ class XMTPModule : Module() {
                 }
             } catch (e: Exception) {
                 Log.e("XMTPModule", "Error in conversations subscription: $e")
-                subscriptions["conversations"]?.cancel()
+                subscriptions["conversations:${clientAddress}"]?.cancel()
             }
         }
     }
@@ -539,8 +539,8 @@ class XMTPModule : Module() {
     private fun subscribeToAllMessages(clientAddress: String) {
         val client = clients[clientAddress] ?: throw XMTPException("No client")
 
-        subscriptions["messages"]?.cancel()
-        subscriptions["messages"] = CoroutineScope(Dispatchers.IO).launch {
+        subscriptions["messages:${clientAddress}"]?.cancel()
+        subscriptions["messages:${clientAddress}"] = CoroutineScope(Dispatchers.IO).launch {
             try {
                 client.conversations.streamAllMessages().collect { message ->
                     sendEvent(
@@ -553,7 +553,7 @@ class XMTPModule : Module() {
                 }
             } catch (e: Exception) {
                 Log.e("XMTPModule", "Error in all messages subscription: $e")
-                subscriptions["messages"]?.cancel()
+                subscriptions["messages:${clientAddress}"]?.cancel()
             }
         }
     }
diff --git a/ios/XMTPModule.swift b/ios/XMTPModule.swift
index 7c435d93d..073e1280a 100644
--- a/ios/XMTPModule.swift
+++ b/ios/XMTPModule.swift
@@ -474,12 +474,12 @@ public class XMTPModule: Module {
             try await subscribeToMessages(clientAddress: clientAddress, topic: topic)
         }
 
-        AsyncFunction("unsubscribeFromConversations") {
-            await subscriptionsManager.getSubscription(key: "conversations")?.cancel()
+        AsyncFunction("unsubscribeFromConversations") { (clientAddress: String) in
+            await subscriptionsManager.getSubscription(key: "conversations:\(clientAddress)")?.cancel()
         }
 
-        AsyncFunction("unsubscribeFromAllMessages") {
-            await subscriptionsManager.getSubscription(key: "messages")?.cancel()
+        AsyncFunction("unsubscribeFromAllMessages") { (clientAddress: String) in
+            await subscriptionsManager.getSubscription(key: "messages:\(clientAddress)")?.cancel()
         }
 
         AsyncFunction("unsubscribeFromMessages") { (clientAddress: String, topic: String) in
@@ -570,8 +570,8 @@ public class XMTPModule: Module {
             return
         }
 
-			await subscriptionsManager.getSubscription(key: "conversations:\(client.address)")?.cancel()
-			await subscriptionsManager.updateSubscription(key: "conversations:\(client.address)", task: Task {
+			await subscriptionsManager.getSubscription(key: "conversations:\(clientAddress)")?.cancel()
+			await subscriptionsManager.updateSubscription(key: "conversations:\(clientAddress)", task: Task {
             do {
                 for try await conversation in await client.conversations.stream() {
                     try sendEvent("conversation", [
@@ -581,7 +581,7 @@ public class XMTPModule: Module {
                 }
             } catch {
                 print("Error in conversations subscription: \(error)")
-                await subscriptionsManager.getSubscription(key: "conversations")?.cancel()
+                await subscriptionsManager.getSubscription(key: "conversations:\(clientAddress)")?.cancel()
             }
         })
     }
@@ -591,8 +591,8 @@ public class XMTPModule: Module {
             return
         }
 
-			await subscriptionsManager.getSubscription(key: "messages:\(client.address)")?.cancel()
-			await subscriptionsManager.updateSubscription(key: "messages:\(client.address)", task: Task {
+			await subscriptionsManager.getSubscription(key: "messages:\(clientAddress)")?.cancel()
+			await subscriptionsManager.updateSubscription(key: "messages:\(clientAddress)", task: Task {
             do {
                 for try await message in try await client.conversations.streamAllMessages() {
                     do {
@@ -606,7 +606,7 @@ public class XMTPModule: Module {
                 }
             } catch {
                 print("Error in all messages subscription: \(error)")
-                await subscriptionsManager.getSubscription(key: "messages")?.cancel()
+                await subscriptionsManager.getSubscription(key: "messages:\(clientAddress)")?.cancel()
             }
         })
     }

From 5f8434fb571c7331c0dc2a7ec941148d6d9c532d Mon Sep 17 00:00:00 2001
From: Naomi Plasterer <naomi@xmtp.com>
Date: Thu, 21 Sep 2023 12:52:35 -0700
Subject: [PATCH 5/8] do the typescript side

---
 src/index.ts             | 8 ++++----
 src/lib/Conversations.ts | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index dc7bdfd50..22ed13739 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -228,12 +228,12 @@ export async function subscribeToMessages(
   return await XMTPModule.subscribeToMessages(clientAddress, topic);
 }
 
-export function unsubscribeFromConversations() {
-  return XMTPModule.unsubscribeFromConversations();
+export function unsubscribeFromConversations(clientAddress: string) {
+  return XMTPModule.unsubscribeFromConversations(clientAddress);
 }
 
-export function unsubscribeFromAllMessages() {
-  return XMTPModule.unsubscribeFromAllMessages();
+export function unsubscribeFromAllMessages(clientAddress: string) {
+  return XMTPModule.unsubscribeFromAllMessages(clientAddress);
 }
 
 export async function unsubscribeFromMessages(
diff --git a/src/lib/Conversations.ts b/src/lib/Conversations.ts
index 0e471521a..ce99fb821 100644
--- a/src/lib/Conversations.ts
+++ b/src/lib/Conversations.ts
@@ -92,10 +92,10 @@ export default class Conversations {
   }
 
   cancelStream() {
-    XMTPModule.unsubscribeFromConversations();
+    XMTPModule.unsubscribeFromConversations(this.client.address);
   }
 
   cancelStreamAllMessages() {
-    XMTPModule.unsubscribeFromAllMessages();
+    XMTPModule.unsubscribeFromAllMessages(this.client.address);
   }
 }

From 5b18587a3576d6c6aab9418d0f5c11df2ab1d62d Mon Sep 17 00:00:00 2001
From: Naomi Plasterer <naomi@xmtp.com>
Date: Thu, 21 Sep 2023 13:01:59 -0700
Subject: [PATCH 6/8] pull out the getters into functions

---
 .../modules/xmtpreactnativesdk/XMTPModule.kt  | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/android/src/main/java/expo/modules/xmtpreactnativesdk/XMTPModule.kt b/android/src/main/java/expo/modules/xmtpreactnativesdk/XMTPModule.kt
index 10c18b0e8..7bc4df43b 100644
--- a/android/src/main/java/expo/modules/xmtpreactnativesdk/XMTPModule.kt
+++ b/android/src/main/java/expo/modules/xmtpreactnativesdk/XMTPModule.kt
@@ -443,12 +443,12 @@ class XMTPModule : Module() {
 
         Function("unsubscribeFromConversations") { clientAddress: String ->
             logV("unsubscribeFromConversations")
-            subscriptions["conversations:$clientAddress"]?.cancel()
+            subscriptions[getConversationsKey(clientAddress)]?.cancel()
         }
 
         Function("unsubscribeFromAllMessages") { clientAddress: String ->
             logV("unsubscribeFromAllMessages")
-            subscriptions["messages:$clientAddress"]?.cancel()
+            subscriptions[getMessagesKey(clientAddress)]?.cancel()
         }
 
         AsyncFunction("unsubscribeFromMessages") { clientAddress: String, topic: String ->
@@ -517,8 +517,8 @@ class XMTPModule : Module() {
     private fun subscribeToConversations(clientAddress: String) {
         val client = clients[clientAddress] ?: throw XMTPException("No client")
 
-        subscriptions["conversations:${clientAddress})"]?.cancel()
-        subscriptions["conversations:${clientAddress}"] = CoroutineScope(Dispatchers.IO).launch {
+        subscriptions[getConversationsKey(clientAddress)]?.cancel()
+        subscriptions[getConversationsKey(clientAddress)] = CoroutineScope(Dispatchers.IO).launch {
             try {
                 client.conversations.stream().collect { conversation ->
                     sendEvent(
@@ -531,7 +531,7 @@ class XMTPModule : Module() {
                 }
             } catch (e: Exception) {
                 Log.e("XMTPModule", "Error in conversations subscription: $e")
-                subscriptions["conversations:${clientAddress}"]?.cancel()
+                subscriptions[getConversationsKey(clientAddress)]?.cancel()
             }
         }
     }
@@ -539,8 +539,8 @@ class XMTPModule : Module() {
     private fun subscribeToAllMessages(clientAddress: String) {
         val client = clients[clientAddress] ?: throw XMTPException("No client")
 
-        subscriptions["messages:${clientAddress}"]?.cancel()
-        subscriptions["messages:${clientAddress}"] = CoroutineScope(Dispatchers.IO).launch {
+        subscriptions[getMessagesKey(clientAddress)]?.cancel()
+        subscriptions[getMessagesKey(clientAddress)] = CoroutineScope(Dispatchers.IO).launch {
             try {
                 client.conversations.streamAllMessages().collect { message ->
                     sendEvent(
@@ -553,7 +553,7 @@ class XMTPModule : Module() {
                 }
             } catch (e: Exception) {
                 Log.e("XMTPModule", "Error in all messages subscription: $e")
-                subscriptions["messages:${clientAddress}"]?.cancel()
+                subscriptions[getMessagesKey(clientAddress)]?.cancel()
             }
         }
     }
@@ -584,6 +584,14 @@ class XMTPModule : Module() {
             }
     }
 
+    private fun getMessagesKey(clientAddress: String): String {
+        return "messages:$clientAddress"
+    }
+
+    private fun getConversationsKey(clientAddress: String): String {
+        return "conversations:$clientAddress"
+    }
+
     private fun unsubscribeFromMessages(
         clientAddress: String,
         topic: String,

From f1e4c9ddcb6b1aa888bddcd1439286215a45faa4 Mon Sep 17 00:00:00 2001
From: Naomi Plasterer <naomi@xmtp.com>
Date: Thu, 21 Sep 2023 13:10:23 -0700
Subject: [PATCH 7/8] abstract

---
 ios/XMTPModule.swift | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/ios/XMTPModule.swift b/ios/XMTPModule.swift
index 073e1280a..b11c18d43 100644
--- a/ios/XMTPModule.swift
+++ b/ios/XMTPModule.swift
@@ -475,11 +475,11 @@ public class XMTPModule: Module {
         }
 
         AsyncFunction("unsubscribeFromConversations") { (clientAddress: String) in
-            await subscriptionsManager.getSubscription(key: "conversations:\(clientAddress)")?.cancel()
+            await subscriptionsManager.getSubscription(key: getConversationsKey(key: clientAddress))?.cancel()
         }
 
         AsyncFunction("unsubscribeFromAllMessages") { (clientAddress: String) in
-            await subscriptionsManager.getSubscription(key: "messages:\(clientAddress)")?.cancel()
+            await subscriptionsManager.getSubscription(key: getMessagesKey(key: clientAddress))?.cancel()
         }
 
         AsyncFunction("unsubscribeFromMessages") { (clientAddress: String, topic: String) in
@@ -570,8 +570,8 @@ public class XMTPModule: Module {
             return
         }
 
-			await subscriptionsManager.getSubscription(key: "conversations:\(clientAddress)")?.cancel()
-			await subscriptionsManager.updateSubscription(key: "conversations:\(clientAddress)", task: Task {
+			await subscriptionsManager.getSubscription(key: getConversationsKey(key: clientAddress))?.cancel()
+			await subscriptionsManager.updateSubscription(key: getConversationsKey(key: clientAddress), task: Task {
             do {
                 for try await conversation in await client.conversations.stream() {
                     try sendEvent("conversation", [
@@ -581,7 +581,7 @@ public class XMTPModule: Module {
                 }
             } catch {
                 print("Error in conversations subscription: \(error)")
-                await subscriptionsManager.getSubscription(key: "conversations:\(clientAddress)")?.cancel()
+                await subscriptionsManager.getSubscription(key: getConversationsKey(key: clientAddress))?.cancel()
             }
         })
     }
@@ -591,8 +591,8 @@ public class XMTPModule: Module {
             return
         }
 
-			await subscriptionsManager.getSubscription(key: "messages:\(clientAddress)")?.cancel()
-			await subscriptionsManager.updateSubscription(key: "messages:\(clientAddress)", task: Task {
+			await subscriptionsManager.getSubscription(key: getMessagesKey(key: clientAddress))?.cancel()
+			await subscriptionsManager.updateSubscription(key: getMessagesKey(key: clientAddress), task: Task {
             do {
                 for try await message in try await client.conversations.streamAllMessages() {
                     do {
@@ -606,7 +606,7 @@ public class XMTPModule: Module {
                 }
             } catch {
                 print("Error in all messages subscription: \(error)")
-                await subscriptionsManager.getSubscription(key: "messages:\(clientAddress)")?.cancel()
+                await subscriptionsManager.getSubscription(key: getMessagesKey(key: clientAddress))?.cancel()
             }
         })
     }
@@ -643,4 +643,12 @@ public class XMTPModule: Module {
 
         await subscriptionsManager.getSubscription(key: conversation.cacheKey(clientAddress))?.cancel()
     }
+    
+    func getMessagesKey(clientAddress: String) -> String {
+        return "messages:\(clientAddress)"
+    }
+
+    func getConversationsKey(clientAddress: String) -> String {
+        return "conversations:\(clientAddress)"
+    }
 }

From 87a75719646df9d61c5951004a2e6fd919f00123 Mon Sep 17 00:00:00 2001
From: Naomi Plasterer <naomi@xmtp.com>
Date: Thu, 21 Sep 2023 13:14:33 -0700
Subject: [PATCH 8/8] fix typo

---
 ios/XMTPModule.swift | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/ios/XMTPModule.swift b/ios/XMTPModule.swift
index b11c18d43..b3586a023 100644
--- a/ios/XMTPModule.swift
+++ b/ios/XMTPModule.swift
@@ -475,11 +475,11 @@ public class XMTPModule: Module {
         }
 
         AsyncFunction("unsubscribeFromConversations") { (clientAddress: String) in
-            await subscriptionsManager.getSubscription(key: getConversationsKey(key: clientAddress))?.cancel()
+            await subscriptionsManager.getSubscription(key: getConversationsKey(clientAddress: clientAddress))?.cancel()
         }
 
         AsyncFunction("unsubscribeFromAllMessages") { (clientAddress: String) in
-            await subscriptionsManager.getSubscription(key: getMessagesKey(key: clientAddress))?.cancel()
+            await subscriptionsManager.getSubscription(key: getMessagesKey(clientAddress: clientAddress))?.cancel()
         }
 
         AsyncFunction("unsubscribeFromMessages") { (clientAddress: String, topic: String) in
@@ -570,8 +570,8 @@ public class XMTPModule: Module {
             return
         }
 
-			await subscriptionsManager.getSubscription(key: getConversationsKey(key: clientAddress))?.cancel()
-			await subscriptionsManager.updateSubscription(key: getConversationsKey(key: clientAddress), task: Task {
+			await subscriptionsManager.getSubscription(key: getConversationsKey(clientAddress: clientAddress))?.cancel()
+			await subscriptionsManager.updateSubscription(key: getConversationsKey(clientAddress: clientAddress), task: Task {
             do {
                 for try await conversation in await client.conversations.stream() {
                     try sendEvent("conversation", [
@@ -581,7 +581,7 @@ public class XMTPModule: Module {
                 }
             } catch {
                 print("Error in conversations subscription: \(error)")
-                await subscriptionsManager.getSubscription(key: getConversationsKey(key: clientAddress))?.cancel()
+                await subscriptionsManager.getSubscription(key: getConversationsKey(clientAddress: clientAddress))?.cancel()
             }
         })
     }
@@ -591,8 +591,8 @@ public class XMTPModule: Module {
             return
         }
 
-			await subscriptionsManager.getSubscription(key: getMessagesKey(key: clientAddress))?.cancel()
-			await subscriptionsManager.updateSubscription(key: getMessagesKey(key: clientAddress), task: Task {
+			await subscriptionsManager.getSubscription(key: getMessagesKey(clientAddress: clientAddress))?.cancel()
+			await subscriptionsManager.updateSubscription(key: getMessagesKey(clientAddress: clientAddress), task: Task {
             do {
                 for try await message in try await client.conversations.streamAllMessages() {
                     do {
@@ -606,7 +606,7 @@ public class XMTPModule: Module {
                 }
             } catch {
                 print("Error in all messages subscription: \(error)")
-                await subscriptionsManager.getSubscription(key: getMessagesKey(key: clientAddress))?.cancel()
+                await subscriptionsManager.getSubscription(key: getMessagesKey(clientAddress: clientAddress))?.cancel()
             }
         })
     }