From d48013a875ca48c7e47255e2a6708ea3b0b6e91e Mon Sep 17 00:00:00 2001
From: Naomi Plasterer <naomi@xmtp.com>
Date: Mon, 11 Nov 2024 10:26:59 -0800
Subject: [PATCH] update the example app

---
 example/src/ConversationCreateScreen.tsx |   4 +-
 example/src/ConversationScreen.tsx       |   2 +-
 example/src/GroupScreen.tsx              |   2 +-
 example/src/HomeScreen.tsx               |   8 +-
 example/src/LaunchScreen.tsx             |  52 ++-----
 example/src/StreamScreen.tsx             |   2 +-
 example/src/TestScreen.tsx               |  20 +--
 example/src/hooks.tsx                    |  45 ++----
 example/src/tests/conversationTests.ts   |  27 ++--
 example/src/tests/dmTests.ts             | 167 +++++++++++++++++++++++
 example/src/types/typeTests.ts           |   4 +-
 src/lib/Conversations.ts                 |   2 +-
 12 files changed, 216 insertions(+), 119 deletions(-)
 create mode 100644 example/src/tests/dmTests.ts

diff --git a/example/src/ConversationCreateScreen.tsx b/example/src/ConversationCreateScreen.tsx
index 6973bb6ac..9d8e2440b 100644
--- a/example/src/ConversationCreateScreen.tsx
+++ b/example/src/ConversationCreateScreen.tsx
@@ -22,7 +22,7 @@ export default function ConversationCreateScreen({
     }
     if (groupsEnabled) {
       const toAddresses = toAddress.split(',')
-      const canMessage = await client.canGroupMessage(toAddresses)
+      const canMessage = await client.canMessage(toAddresses)
       if (!canMessage) {
         setAlert(`${toAddress} cannot be added to a group conversation yet`)
         return
@@ -30,7 +30,7 @@ export default function ConversationCreateScreen({
       const group = await client.conversations.newGroup(toAddresses)
       navigation.navigate('group', { id: group.id })
     } else {
-      const canMessage = await client.canMessage(toAddress)
+      const canMessage = await client.canMessage([toAddress])
       if (!canMessage) {
         setAlert(`${toAddress} is not on the XMTP network yet`)
         return
diff --git a/example/src/ConversationScreen.tsx b/example/src/ConversationScreen.tsx
index 6cbe84d64..45304e7b9 100644
--- a/example/src/ConversationScreen.tsx
+++ b/example/src/ConversationScreen.tsx
@@ -959,7 +959,7 @@ function MessageItem({
                   {message.senderAddress.slice(-4)}
                 </Text>
                 <Text style={{ fontWeight: '300' }}>
-                  {moment(message.sent).fromNow()}
+                  {moment(message.sentNs / 1000000).fromNow()}
                 </Text>
               </View>
             )}
diff --git a/example/src/GroupScreen.tsx b/example/src/GroupScreen.tsx
index f3ca36fb4..43d856377 100644
--- a/example/src/GroupScreen.tsx
+++ b/example/src/GroupScreen.tsx
@@ -959,7 +959,7 @@ function MessageItem({
                   {message.senderAddress.slice(-4)}
                 </Text>
                 <Text style={{ fontWeight: '300' }}>
-                  {moment(message.sent).fromNow()}
+                  {moment(message.sentNs / 1000000).fromNow()}
                 </Text>
               </View>
             )}
diff --git a/example/src/HomeScreen.tsx b/example/src/HomeScreen.tsx
index d67cf3288..882ab48ca 100644
--- a/example/src/HomeScreen.tsx
+++ b/example/src/HomeScreen.tsx
@@ -103,7 +103,7 @@ function GroupListItem({
   const [consentState, setConsentState] = useState<string | undefined>()
 
   const denyGroup = async () => {
-    await client?.contacts.denyGroups([group.id])
+    await group.updateConsent('denied')
     const consent = await group.consentState()
     setConsentState(consent)
   }
@@ -154,7 +154,7 @@ function GroupListItem({
             {lastMessage?.fallback}
           </Text>
           <Text>{lastMessage?.senderAddress}:</Text>
-          <Text>{moment(lastMessage?.sent).fromNow()}</Text>
+          <Text>{moment(lastMessage?.sentNs / 1000000).fromNow()}</Text>
         </View>
       </View>
     </Pressable>
@@ -185,7 +185,7 @@ function ConversationItem({
   }, [conversation])
 
   const denyContact = async () => {
-    await client?.contacts.deny([conversation.peerAddress])
+    await conversation.updateConsent('denied')
     conversation
       .consentState()
       .then(setConsentState)
@@ -223,7 +223,7 @@ function ConversationItem({
             {lastMessage?.fallback}
           </Text>
           <Text>{lastMessage?.senderAddress}:</Text>
-          <Text>{moment(lastMessage?.sent).fromNow()}</Text>
+          <Text>{moment(lastMessage?.sentNs / 1000000).fromNow()}</Text>
           <Text style={{ fontWeight: 'bold', color: 'red' }}>
             {getConsentState}
           </Text>
diff --git a/example/src/LaunchScreen.tsx b/example/src/LaunchScreen.tsx
index 91332479d..8e9ac0f1a 100644
--- a/example/src/LaunchScreen.tsx
+++ b/example/src/LaunchScreen.tsx
@@ -10,7 +10,7 @@ import { useXmtp } from 'xmtp-react-native-sdk'
 import { NavigationParamList } from './Navigation'
 import { TestCategory } from './TestScreen'
 import { supportedCodecs } from './contentTypes/contentTypes'
-import { useSavedKeys } from './hooks'
+import { useSavedAddress } from './hooks'
 
 const appVersion = 'XMTP_RN_EX/0.0.1'
 
@@ -65,11 +65,10 @@ export default function LaunchScreen(
   const [selectedNetwork, setSelectedNetwork] = useState<
     'dev' | 'local' | 'production'
   >('dev')
-  const [enableGroups, setEnableGroups] = useState('true')
   const signer = useSigner()
   const [signerAddressDisplay, setSignerAddressDisplay] = useState<string>()
   const { setClient } = useXmtp()
-  const savedKeys = useSavedKeys()
+  const savedKeys = useSavedAddress()
   const configureWallet = useCallback(
     (label: string, configuring: Promise<XMTP.Client<any>>) => {
       console.log('Connecting XMTP client', label)
@@ -81,8 +80,7 @@ export default function LaunchScreen(
           setClient(client)
           navigation.navigate('home')
           // Save the configured client keys for use in later sessions.
-          const keyBundle = await client.exportKeyBundle()
-          await savedKeys.save(keyBundle)
+          await savedKeys.save(client.address)
         })
         .catch((err) =>
           console.log('Unable to connect XMTP client', label, err)
@@ -91,14 +89,6 @@ export default function LaunchScreen(
     []
   )
 
-  const preCreateIdentityCallback = () => {
-    console.log('Pre Create Identity Callback')
-  }
-
-  const preEnableIdentityCallback = () => {
-    console.log('Pre Enable Identity Callback')
-  }
-
   const preAuthenticateToInboxCallback = async () => {
     console.log('Pre Authenticate To Inbox Callback')
   }
@@ -191,10 +181,6 @@ export default function LaunchScreen(
           selectTextStyle={styles.modalSelectText}
           backdropPressToClose
           data={groupOptions}
-          initValue={enableGroups}
-          onChange={(option) => {
-            setEnableGroups(option.label)
-          }}
         />
       </View>
       <View style={styles.row}>
@@ -209,12 +195,7 @@ export default function LaunchScreen(
               color="orange"
               onPress={() => {
                 ;(async () => {
-                  console.log(
-                    'Using network ' +
-                      selectedNetwork +
-                      ' and enableV3 ' +
-                      enableGroups
-                  )
+                  console.log('Using network ' + selectedNetwork)
 
                   const dbEncryptionKey = await getDbEncryptionKey(
                     selectedNetwork,
@@ -227,10 +208,7 @@ export default function LaunchScreen(
                       env: selectedNetwork,
                       appVersion,
                       codecs: supportedCodecs,
-                      preCreateIdentityCallback,
-                      preEnableIdentityCallback,
                       preAuthenticateToInboxCallback,
-                      enableV3: enableGroups === 'true',
                       dbEncryptionKey,
                     })
                   )
@@ -246,12 +224,7 @@ export default function LaunchScreen(
           color="green"
           onPress={() => {
             ;(async () => {
-              console.log(
-                'Using network ' +
-                  selectedNetwork +
-                  ' and enableV3 ' +
-                  enableGroups
-              )
+              console.log('Using network ' + selectedNetwork)
               const dbEncryptionKey = await getDbEncryptionKey(
                 selectedNetwork,
                 true
@@ -262,10 +235,7 @@ export default function LaunchScreen(
                   env: selectedNetwork,
                   appVersion,
                   codecs: supportedCodecs,
-                  preCreateIdentityCallback,
-                  preEnableIdentityCallback,
                   preAuthenticateToInboxCallback,
-                  enableV3: enableGroups === 'true',
                   dbEncryptionKey,
                 })
               )
@@ -273,7 +243,7 @@ export default function LaunchScreen(
           }}
         />
       </View>
-      {!!savedKeys.keyBundle && (
+      {!!savedKeys.address && (
         <>
           <View key="saved-dev" style={{ margin: 16 }}>
             <Button
@@ -281,21 +251,15 @@ export default function LaunchScreen(
               color="purple"
               onPress={() => {
                 ;(async () => {
-                  console.log(
-                    'Using network ' +
-                      selectedNetwork +
-                      ' and enableV3 ' +
-                      enableGroups
-                  )
+                  console.log('Using network ' + selectedNetwork)
                   const dbEncryptionKey =
                     await getDbEncryptionKey(selectedNetwork)
                   configureWallet(
                     selectedNetwork,
-                    XMTP.Client.createFromKeyBundle(savedKeys.keyBundle!, {
+                    XMTP.Client.build(savedKeys.address!, {
                       env: selectedNetwork,
                       appVersion,
                       codecs: supportedCodecs,
-                      enableV3: enableGroups === 'true',
                       dbEncryptionKey,
                     })
                   )
diff --git a/example/src/StreamScreen.tsx b/example/src/StreamScreen.tsx
index 0944d06fa..b3caeee88 100644
--- a/example/src/StreamScreen.tsx
+++ b/example/src/StreamScreen.tsx
@@ -154,7 +154,7 @@ const ConversationItem = ({
           <FlatList
             data={messages}
             keyExtractor={(item) => item.id}
-            renderItem={({ item }) => <Text>{item.sent}</Text>}
+            renderItem={({ item }) => <Text>{item.sentNs}</Text>}
           />
         </>
       )}
diff --git a/example/src/TestScreen.tsx b/example/src/TestScreen.tsx
index 262e70198..275bded58 100644
--- a/example/src/TestScreen.tsx
+++ b/example/src/TestScreen.tsx
@@ -3,13 +3,12 @@ import React, { useEffect, useState } from 'react'
 import { View, Text, Button, ScrollView } from 'react-native'
 
 import { conversationTests } from './tests/conversationTests'
+import { dmTests } from './tests/dmTests'
 import { groupPerformanceTests } from './tests/groupPerformanceTests'
 import { groupPermissionsTests } from './tests/groupPermissionsTests'
 import { groupTests } from './tests/groupTests'
 import { restartStreamTests } from './tests/restartStreamsTests'
 import { Test } from './tests/test-utils'
-import { tests } from './tests/tests'
-import { v3OnlyTests } from './tests/v3OnlyTests'
 
 type Result = 'waiting' | 'running' | 'success' | 'failure' | 'error'
 
@@ -107,10 +106,9 @@ function TestView({
 
 export enum TestCategory {
   all = 'all',
-  tests = 'tests',
   conversation = 'conversation',
   group = 'group',
-  v3Only = 'v3Only',
+  dm = 'dm',
   restartStreans = 'restartStreams',
   groupPermissions = 'groupPermissions',
   groupPerformance = 'groupPerformance',
@@ -123,13 +121,11 @@ export default function TestScreen(): JSX.Element {
     testSelection: TestCategory
   }
   const allTests = [
-    ...tests,
+    ...dmTests,
     ...groupTests,
     ...conversationTests,
-    ...v3OnlyTests,
     ...restartStreamTests,
     ...groupPermissionsTests,
-    ...groupPerformanceTests,
   ]
   let activeTests, title
   switch (params.testSelection) {
@@ -137,9 +133,9 @@ export default function TestScreen(): JSX.Element {
       activeTests = allTests
       title = 'All Unit Tests'
       break
-    case TestCategory.tests:
-      activeTests = tests
-      title = 'Original Unit Tests'
+    case TestCategory.dm:
+      activeTests = dmTests
+      title = 'Dm Unit Tests'
       break
     case TestCategory.group:
       activeTests = groupTests
@@ -149,10 +145,6 @@ export default function TestScreen(): JSX.Element {
       activeTests = conversationTests
       title = 'Conversation Unit Tests'
       break
-    case TestCategory.v3Only:
-      activeTests = v3OnlyTests
-      title = 'V3 Only Tests'
-      break
     case TestCategory.restartStreans:
       activeTests = restartStreamTests
       title = 'Restart Streams Unit Tests'
diff --git a/example/src/hooks.tsx b/example/src/hooks.tsx
index 8daa137cc..c092f7f6c 100644
--- a/example/src/hooks.tsx
+++ b/example/src/hooks.tsx
@@ -24,32 +24,11 @@ export function useConversationList(): UseQueryResult<
   Conversation<SupportedContentTypes>[]
 > {
   const { client } = useXmtp()
-  client?.contacts
-    .refreshConsentList()
-    .then(() => {
-      console.log('Refreshed consent list successfully')
-    })
-    .catch((error) => {
-      console.error('Error refreshing consent list', error)
-    })
   return useQuery<Conversation<SupportedContentTypes>[]>(
     ['xmtp', 'conversations', client?.address],
-    () => client!.conversations.list(),
-    {
-      enabled: !!client,
-    }
-  )
-}
-
-export function useGroupsList(): UseQueryResult<
-  Group<SupportedContentTypes>[]
-> {
-  const { client } = useXmtp()
-  return useQuery<Group<SupportedContentTypes>[]>(
-    ['xmtp', 'groups', client?.address],
     async () => {
-      await client?.conversations.syncGroups()
-      return (await client?.conversations.listGroups()) || []
+      await client?.conversations.sync()
+      return (await client?.conversations.list()) || []
     },
     {
       enabled: !!client,
@@ -550,23 +529,23 @@ export function usePrepareRemoteAttachment({
 /**
  * Load or save a keyBundle for future use.
  */
-export function useSavedKeys(): {
-  keyBundle: string | null | undefined
-  save: (keyBundle: string) => void
+export function useSavedAddress(): {
+  address: string | null | undefined
+  save: (address: string) => void
   clear: () => void
 } {
-  const { data: keyBundle, refetch } = useQuery<string | null>(
-    ['xmtp', 'keyBundle'],
-    () => EncryptedStorage.getItem('xmtp.keyBundle')
+  const { data: address, refetch } = useQuery<string | null>(
+    ['xmtp', 'address'],
+    () => EncryptedStorage.getItem('xmtp.address')
   )
   return {
-    keyBundle,
-    save: async (keyBundle: string) => {
-      await EncryptedStorage.setItem('xmtp.keyBundle', keyBundle)
+    address,
+    save: async (address: string) => {
+      await EncryptedStorage.setItem('xmtp.address', address)
       await refetch()
     },
     clear: async () => {
-      await EncryptedStorage.removeItem('xmtp.keyBundle')
+      await EncryptedStorage.removeItem('xmtp.address')
       await refetch()
     },
   }
diff --git a/example/src/tests/conversationTests.ts b/example/src/tests/conversationTests.ts
index 09a206920..11b896e20 100644
--- a/example/src/tests/conversationTests.ts
+++ b/example/src/tests/conversationTests.ts
@@ -1,5 +1,5 @@
 import { Test, assert, createClients, delayToPropogate } from './test-utils'
-import { Conversation, ConversationVersion } from '../../../src/index'
+import { Conversation, ConversationId, ConversationVersion } from '../../../src/index'
 
 export const conversationTests: Test[] = []
 let counter = 1
@@ -15,10 +15,12 @@ test('can find a conversations by id', async () => {
   const alixGroup = await alixClient.conversations.newGroup([boClient.address])
   const alixDm = await alixClient.conversations.findOrCreateDm(boClient.address)
 
-  await boClient.conversations.syncConversations()
+  await boClient.conversations.sync()
   const boGroup = await boClient.conversations.findConversation(alixGroup.id)
   const boDm = await boClient.conversations.findConversation(alixDm.id)
-  const boDm2 = await boClient.conversations.findConversation('GARBAGE')
+  const boDm2 = await boClient.conversations.findConversation(
+    'GARBAGE' as ConversationId
+  )
 
   assert(boDm2 === undefined, `bodm2 should be undefined`)
 
@@ -40,7 +42,7 @@ test('can find a conversation by topic', async () => {
   const alixGroup = await alixClient.conversations.newGroup([boClient.address])
   const alixDm = await alixClient.conversations.findOrCreateDm(boClient.address)
 
-  await boClient.conversations.syncConversations()
+  await boClient.conversations.sync()
   const boGroup = await boClient.conversations.findConversationByTopic(
     alixGroup.topic
   )
@@ -65,7 +67,7 @@ test('can find a dm by address', async () => {
   const [alixClient, boClient] = await createClients(2)
   const alixDm = await alixClient.conversations.findOrCreateDm(boClient.address)
 
-  await boClient.conversations.syncConversations()
+  await boClient.conversations.sync()
   const boDm = await boClient.conversations.findDm(alixClient.address)
 
   assert(
@@ -94,16 +96,11 @@ test('can list conversations with params', async () => {
 
   await boClient.conversations.syncAllConversations()
   const boConvosOrderCreated = await boClient.conversations.list()
-  const boConvosOrderLastMessage =
-    await boClient.conversations.list(
-      { lastMessage: true },
-      'lastMessage'
-    )
-  const boGroupsLimit = await boClient.conversations.list(
-    {},
-    undefined,
-    1
+  const boConvosOrderLastMessage = await boClient.conversations.list(
+    { lastMessage: true },
+    'lastMessage'
   )
+  const boGroupsLimit = await boClient.conversations.list({}, undefined, 1)
 
   assert(
     boConvosOrderCreated.map((group: any) => group.id).toString() ===
@@ -150,7 +147,7 @@ test('can list groups', async () => {
   await boClient.conversations.findOrCreateDm(alixClient.address)
 
   const boConversations = await boClient.conversations.list()
-  await alixClient.conversations.syncConversations()
+  await alixClient.conversations.sync()
   const alixConversations = await alixClient.conversations.list()
 
   assert(
diff --git a/example/src/tests/dmTests.ts b/example/src/tests/dmTests.ts
new file mode 100644
index 000000000..e804d7037
--- /dev/null
+++ b/example/src/tests/dmTests.ts
@@ -0,0 +1,167 @@
+import { Test, assert, createClients, delayToPropogate } from './test-utils'
+import {
+  Conversation,
+  ConversationId,
+  ConversationVersion,
+} from '../../../src/index'
+
+export const dmTests: Test[] = []
+let counter = 1
+function test(name: string, perform: () => Promise<boolean>) {
+  dmTests.push({
+    name: String(counter++) + '. ' + name,
+    run: perform,
+  })
+}
+
+test('can list dms with params', async () => {
+  const [alixClient, boClient, caroClient] = await createClients(3)
+
+  const boGroup1 = await boClient.conversations.newGroup([alixClient.address])
+  const boGroup2 = await boClient.conversations.newGroup([alixClient.address])
+  const boDm1 = await boClient.conversations.findOrCreateDm(alixClient.address)
+  const boDm2 = await boClient.conversations.findOrCreateDm(caroClient.address)
+
+  await boGroup1.send({ text: `first message` })
+  await boGroup1.send({ text: `second message` })
+  await boGroup1.send({ text: `third message` })
+  await boDm2.send({ text: `third message` })
+  await boGroup2.send({ text: `first message` })
+  await boDm1.send({ text: `dm message` })
+  // Order should be [Dm1, Group2, Dm2, Group1]
+
+  await boClient.conversations.syncAllConversations()
+  const boConvosOrderCreated = await boClient.conversations.listDms()
+  const boConvosOrderLastMessage = await boClient.conversations.listDms(
+    { lastMessage: true },
+    'lastMessage'
+  )
+  const boGroupsLimit = await boClient.conversations.listDms({}, undefined, 1)
+
+  assert(
+    boConvosOrderCreated
+      .map((conversation: any) => conversation.id)
+      .toString() === [boDm1.id, boDm2.id].toString(),
+    `Conversation created at order should be ${[boDm1.id, boDm2.id].toString()} but was ${boConvosOrderCreated.map((group: any) => group.id).toString()}`
+  )
+
+  assert(
+    boConvosOrderLastMessage
+      .map((conversation: any) => conversation.id)
+      .toString() === [boDm1.id, boDm2.id].toString(),
+    `Conversation last message order should be ${[boDm1.id, boDm2.id].toString()} but was ${boConvosOrderLastMessage.map((group: any) => group.id).toString()}`
+  )
+
+  const messages = await boConvosOrderLastMessage[0].messages()
+  assert(
+    messages[0].content() === 'dm message',
+    `last message 1 should be dm message ${messages[0].content()}`
+  )
+
+  return true
+})
+
+test('can stream all dm messages', async () => {
+  const [alix, bo] = await createClients(2)
+
+  let conversationCallbacks = 0
+  let messageCallbacks = 0
+  await bo.conversations.stream(async () => {
+    conversationCallbacks++
+  })
+
+  await bo.conversations.streamAllMessages(async () => {
+    messageCallbacks++
+  }, 'dms')
+
+  const group = await alix.conversations.newGroup([bo.address])
+  const dm = await alix.conversations.findOrCreateDm(bo.address)
+  await delayToPropogate()
+  await group.send('hello')
+  await dm.send('hello')
+  await delayToPropogate()
+
+  assert(
+    conversationCallbacks === 2,
+    'conversation stream should have received 2 conversation'
+  )
+  assert(
+    messageCallbacks === 2,
+    'message stream should have received 2 message'
+  )
+
+  return true
+})
+
+test('can stream dm messages', async () => {
+  const [alixClient, boClient] = await createClients(2)
+
+  const alixGroup = await alixClient.conversations.newGroup([boClient.address])
+  const alixDm = await alixClient.conversations.findOrCreateDm(boClient.address)
+  const alixConversation = await alixClient.conversations.findConversation(
+    alixGroup.id
+  )
+
+  let dmMessageCallbacks = 0
+  let conversationMessageCallbacks = 0
+  await alixConversation?.streamMessages(async () => {
+    conversationMessageCallbacks++
+  })
+
+  await alixDm.streamMessages(async () => {
+    dmMessageCallbacks++
+  })
+
+  await alixConversation?.send({ text: `first message` })
+  await alixDm.send({ text: `first message` })
+
+  return true
+})
+
+test('can stream all dms', async () => {
+  const [alixClient, boClient, caroClient] = await createClients(3)
+
+  const containers: Conversation<any>[] = []
+  const cancelStreamAll = await alixClient.conversations.stream(
+    async (conversation: Conversation<any>) => {
+      containers.push(conversation)
+    }
+  )
+
+  await boClient.conversations.newGroup([alixClient.address])
+  await delayToPropogate()
+  if ((containers.length as number) !== 1) {
+    throw Error(
+      'Unexpected num conversations (should be 1): ' + containers.length
+    )
+  }
+
+  await boClient.conversations.findOrCreateDm(alixClient.address)
+  await delayToPropogate()
+  if ((containers.length as number) !== 2) {
+    throw Error(
+      'Unexpected num conversations (should be 2): ' + containers.length
+    )
+  }
+
+  await alixClient.conversations.findOrCreateDm(caroClient.address)
+  await delayToPropogate()
+  if (containers.length !== 3) {
+    throw Error(
+      'Expected conversations length 3 but it is: ' + containers.length
+    )
+  }
+
+  cancelStreamAll()
+  await delayToPropogate()
+
+  await caroClient.conversations.newGroup([alixClient.address])
+  await delayToPropogate()
+  if ((containers.length as number) !== 3) {
+    throw Error(
+      'Unexpected num conversations (should be 3): ' + containers.length
+    )
+  }
+
+  return true
+})
diff --git a/example/src/types/typeTests.ts b/example/src/types/typeTests.ts
index 0815957dd..935412bfc 100644
--- a/example/src/types/typeTests.ts
+++ b/example/src/types/typeTests.ts
@@ -1,14 +1,12 @@
 import {
   Client,
   ContentTypeId,
-  Conversation,
   ConversationVersion,
   EncodedContent,
   JSContentCodec,
   ReactionCodec,
   ReplyCodec,
   TextCodec,
-  sendMessage,
 } from 'xmtp-react-native-sdk'
 
 const ContentTypeNumber: ContentTypeId = {
@@ -63,7 +61,7 @@ export const typeTests = async () => {
   // @ts-expect-error
   await textConvo.send({ wrong: 'hello' })
 
-  const textConvo2 = new Conversation(textClient, {
+  const textConvo2 = new Dm(textClient, {
     createdAt: 123,
     topic: 'sdf',
     peerAddress: 'sdf',
diff --git a/src/lib/Conversations.ts b/src/lib/Conversations.ts
index 4bdfeee20..e9f134fa2 100644
--- a/src/lib/Conversations.ts
+++ b/src/lib/Conversations.ts
@@ -258,7 +258,7 @@ export default class Conversations<
    * Executes a network request to fetch the latest list of conversations associated with the client
    * and save them to the local state.
    */
-  async syncConversations() {
+  async sync() {
     await XMTPModule.syncConversations(this.client.inboxId)
   }