Merge pull request #360 from xmtp/np/bad-merge

Revert "Merge branch 'beta' into main"

.eslintrc.js

@@ -1,17 +1,9 @@
 module.exports = {
   root: true,
-  parser: "@typescript-eslint/parser",
-  parserOptions: {
-    project: ["./tsconfig.json", "./example/tsconfig.json"]
-  },  
-  plugins: ["@typescript-eslint"],
   extends: ['universe/native', 'universe/web'],
   ignorePatterns: ['build'],
   plugins: ['prettier'],
   globals: {
     __dirname: true,
   },
-  rules: {
-    "@typescript-eslint/no-floating-promises": ["error"],
-  },
 }

.gitignore

@@ -63,4 +63,3 @@ android/keystores/debug.keystore
 
 # Typedocs
 docs/
-**/.yarn/*

README.md

@@ -437,7 +437,3 @@ The `env` parameter accepts one of three valid values: `dev`, `production`, or `
 - `local`: Use to have a client communicate with an XMTP node you are running locally. For example, an XMTP node developer can set `env` to `local` to generate client traffic to test a node running locally.
 
 The `production` network is configured to store messages indefinitely. XMTP may occasionally delete messages and keys from the `dev` network, and will provide advance notice in the [XMTP Discord community](https://discord.gg/xmtp).
-
-## Enabling group chat
-
-Coming soon...

android/build.gradle

@@ -102,15 +102,4 @@ dependencies {
   implementation 'com.google.code.gson:gson:2.10.1'
   implementation 'com.facebook.react:react-native:0.71.3'
   implementation "com.daveanthonythomas.moshipack:moshipack:1.0.1"
-  // xmtp-android local testing setup below (comment org.xmtp:android above)
-  // implementation files('<PATH TO XMTP-ANDROID>/xmtp-android/library/build/outputs/aar/library-debug.aar')
-  // implementation 'com.google.crypto.tink:tink-android:1.7.0'
-  // implementation 'io.grpc:grpc-kotlin-stub:1.3.0'
-  // implementation 'io.grpc:grpc-okhttp:1.51.1'
-  // implementation 'io.grpc:grpc-protobuf-lite:1.51.0'
-  // implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'
-  // implementation 'org.web3j:crypto:5.0.0'
-  // implementation "net.java.dev.jna:jna:5.13.0@aar"
-  // implementation 'com.google.protobuf:protobuf-kotlin-lite:3.22.3'
-  // implementation 'org.xmtp:proto-kotlin:3.40.1'
 }

android/src/main/java/expo/modules/xmtpreactnativesdk/wrappers/ContentJson.kt

@@ -30,9 +30,6 @@ import org.xmtp.android.library.codecs.description
 import org.xmtp.android.library.codecs.getReactionAction
 import org.xmtp.android.library.codecs.getReactionSchema
 import org.xmtp.android.library.codecs.id
-import uniffi.xmtpv3.org.xmtp.android.library.codecs.ContentTypeGroupMembershipChange
-import uniffi.xmtpv3.org.xmtp.android.library.codecs.GroupMembershipChangeCodec
-import uniffi.xmtpv3.org.xmtp.android.library.codecs.GroupMembershipChanges
 import java.net.URL
 
 class ContentJson(
@@ -54,7 +51,6 @@ class ContentJson(
             Client.register(RemoteAttachmentCodec())
             Client.register(ReplyCodec())
             Client.register(ReadReceiptCodec())
-            Client.register(GroupMembershipChangeCodec())
         }
 
         fun fromJsonObject(obj: JsonObject): ContentJson {
@@ -175,21 +171,6 @@ class ContentJson(
                 "readReceipt" to ""
             )
 
-            ContentTypeGroupMembershipChange.id -> mapOf(
-                "groupChange" to mapOf(
-                    "membersAdded" to (content as GroupMembershipChanges).membersAddedList.map {
-                        mapOf(
-                            "address" to it.accountAddress,
-                            "initiatedByAddress" to it.initiatedByAccountAddress
-                        )},
-                    "membersRemoved" to content.membersRemovedList.map {
-                        mapOf(
-                            "address" to it.accountAddress,
-                            "initiatedByAddress" to it.initiatedByAccountAddress
-                        )},
-                )
-            )
-
             else -> {
                 val json = JsonObject()
                 encodedContent?.let {

android/src/main/java/expo/modules/xmtpreactnativesdk/wrappers/ConversationWrapper.kt

@@ -24,7 +24,7 @@ class ConversationWrapper {
                 "context" to context,
                 "topic" to conversation.topic,
                 "peerAddress" to conversation.peerAddress,
-                "version" to "DIRECT",
+                "version" to if (conversation.version == Conversation.Version.V1) "v1" else "v2",
                 "conversationID" to (conversation.conversationId ?: ""),
                 "keyMaterial" to (conversation.keyMaterial?.let { Base64.encodeToString(it, Base64.NO_WRAP) } ?: "")
             )

example/App.tsx

@@ -14,7 +14,6 @@ import { XmtpProvider } from 'xmtp-react-native-sdk'
 
 import ConversationCreateScreen from './src/ConversationCreateScreen'
 import ConversationScreen from './src/ConversationScreen'
-import GroupScreen from './src/GroupScreen'
 import HomeScreen from './src/HomeScreen'
 import LaunchScreen from './src/LaunchScreen'
 import { Navigator } from './src/Navigation'
@@ -91,11 +90,6 @@ export default function App() {
                 options={{ title: 'Conversation' }}
                 initialParams={{ topic: '' }}
               />
-              <Navigator.Screen
-                name="group"
-                component={GroupScreen}
-                options={{ title: 'Group' }}
-              />
               <Navigator.Screen
                 name="conversationCreate"
                 component={ConversationCreateScreen}

example/ios/Podfile.lock

@@ -322,7 +322,7 @@ PODS:
     - React-Core
   - react-native-encrypted-storage (4.0.3):
     - React-Core
-  - react-native-get-random-values (1.11.0):
+  - react-native-get-random-values (1.10.0):
     - React-Core
   - react-native-mmkv (2.11.0):
     - MMKV (>= 1.2.13)
@@ -344,8 +344,6 @@ PODS:
     - RCTTypeSafety
     - React-Core
     - ReactCommon/turbomodule/core
-  - react-native-sqlite-storage (6.0.1):
-    - React-Core
   - react-native-webview (13.8.1):
     - RCT-Folly (= 2021.07.22.00)
     - React-Core
@@ -435,8 +433,6 @@ PODS:
     - React-perflogger (= 0.71.14)
   - RNCAsyncStorage (1.21.0):
     - React-Core
-  - RNFS (2.20.0):
-    - React-Core
   - RNScreens (3.20.0):
     - React-Core
     - React-RCTImage
@@ -509,7 +505,6 @@ DEPENDENCIES:
   - react-native-quick-crypto (from `../node_modules/react-native-quick-crypto`)
   - react-native-randombytes (from `../node_modules/react-native-randombytes`)
   - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
-  - react-native-sqlite-storage (from `../node_modules/react-native-sqlite-storage`)
   - react-native-webview (from `../node_modules/react-native-webview`)
   - React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`)
   - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`)
@@ -525,7 +520,6 @@ DEPENDENCIES:
   - React-runtimeexecutor (from `../node_modules/react-native/ReactCommon/runtimeexecutor`)
   - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
   - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)"
-  - RNFS (from `../node_modules/react-native-fs`)
   - RNScreens (from `../node_modules/react-native-screens`)
   - RNSVG (from `../node_modules/react-native-svg`)
   - XMTPReactNative (from `../../ios`)
@@ -640,8 +634,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-randombytes"
   react-native-safe-area-context:
     :path: "../node_modules/react-native-safe-area-context"
-  react-native-sqlite-storage:
-    :path: "../node_modules/react-native-sqlite-storage"
   react-native-webview:
     :path: "../node_modules/react-native-webview"
   React-perflogger:
@@ -672,8 +664,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon"
   RNCAsyncStorage:
     :path: "../node_modules/@react-native-async-storage/async-storage"
-  RNFS:
-    :path: "../node_modules/react-native-fs"
   RNScreens:
     :path: "../node_modules/react-native-screens"
   RNSVG:
@@ -734,14 +724,13 @@ SPEC CHECKSUMS:
   react-native-blob-util: d8fa1a7f726867907a8e43163fdd8b441d4489ea
   react-native-config: 86038147314e2e6d10ea9972022aa171e6b1d4d8
   react-native-encrypted-storage: db300a3f2f0aba1e818417c1c0a6be549038deb7
-  react-native-get-random-values: 21325b2244dfa6b58878f51f9aa42821e7ba3d06
+  react-native-get-random-values: 384787fd76976f5aec9465aff6fa9e9129af1e74
   react-native-mmkv: e97c0c79403fb94577e5d902ab1ebd42b0715b43
   react-native-netinfo: 8a7fd3f7130ef4ad2fb4276d5c9f8d3f28d2df3d
   react-native-quick-base64: 777057ea4286f806b00259ede65dc79c7c706320
   react-native-quick-crypto: 455c1b411db006dba1026a30681ececb19180187
   react-native-randombytes: 421f1c7d48c0af8dbcd471b0324393ebf8fe7846
   react-native-safe-area-context: 39c2d8be3328df5d437ac1700f4f3a4f75716acc
-  react-native-sqlite-storage: f6d515e1c446d1e6d026aa5352908a25d4de3261
   react-native-webview: bdc091de8cf7f8397653e30182efcd9f772e03b3
   React-perflogger: 4987ad83731c23d11813c84263963b0d3028c966
   React-RCTActionSheet: 5ad952b2a9740d87a5bd77280c4bc23f6f89ea0c
@@ -757,7 +746,6 @@ SPEC CHECKSUMS:
   React-runtimeexecutor: ffe826b7b1cfbc32a35ed5b64d5886c0ff75f501
   ReactCommon: 7f3dd5e98a9ec627c6b03d26c062bf37ea9fc888
   RNCAsyncStorage: 618d03a5f52fbccb3d7010076bc54712844c18ef
-  RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
   RNScreens: 218801c16a2782546d30bd2026bb625c0302d70f
   RNSVG: d00c8f91c3cbf6d476451313a18f04d220d4f396
   secp256k1.swift: a7e7a214f6db6ce5db32cc6b2b45e5c4dd633634

example/package.json

@@ -30,16 +30,13 @@
     "react-native-config": "^1.5.1",
     "react-native-crypto": "^2.2.0",
     "react-native-encrypted-storage": "^4.0.3",
-    "react-native-fs": "^2.20.0",
-    "react-native-get-random-values": "^1.11.0",
+    "react-native-get-random-values": "^1.10.0",
     "react-native-mmkv": "^2.8.0",
-    "react-native-modal-selector": "^2.1.2",
     "react-native-quick-base64": "^2.0.8",
     "react-native-quick-crypto": "^0.6.1",
     "react-native-randombytes": "^3.6.1",
     "react-native-safe-area-context": "4.5.0",
     "react-native-screens": "~3.20.0",
-    "react-native-sqlite-storage": "^6.0.1",
     "react-native-svg": "^13.9.0",
     "react-native-url-polyfill": "^2.0.0",
     "react-native-webview": "^13.8.1",

example/src/ConversationCreateScreen.tsx

@@ -1,6 +1,6 @@
 import { NativeStackScreenProps } from '@react-navigation/native-stack'
 import React, { useState } from 'react'
-import { Button, ScrollView, Switch, Text, TextInput, View } from 'react-native'
+import { Button, ScrollView, Text, TextInput } from 'react-native'
 import { useXmtp } from 'xmtp-react-native-sdk'
 
 import { NavigationParamList } from './Navigation'
@@ -13,33 +13,19 @@ export default function ConversationCreateScreen({
   const [alert, setAlert] = useState<string>('')
   const [isCreating, setCreating] = useState<boolean>(false)
   const { client } = useXmtp()
-  const [groupsEnabled, setGroupsEnabled] = useState(false)
-
   const startNewConversation = async (toAddress: string) => {
     if (!client) {
       setAlert('Client not initialized')
       return
     }
-    if (groupsEnabled) {
-      const toAddresses = toAddress.split(',')
-      const canMessage = await client.canGroupMessage(toAddresses)
-      if (!canMessage) {
-        setAlert(`${toAddress} cannot be added to a group conversation yet`)
-        return
-      }
-      const group = await client.conversations.newGroup(toAddresses)
-      navigation.navigate('group', { id: group.id })
-    } else {
-      const canMessage = await client.canMessage(toAddress)
-      if (!canMessage) {
-        setAlert(`${toAddress} is not on the XMTP network yet`)
-        return
-      }
-      const convo = await client.conversations.newConversation(toAddress)
-      navigation.navigate('conversation', { topic: convo.topic })
+    const canMessage = await client.canMessage(toAddress)
+    if (!canMessage) {
+      setAlert(`${toAddress} is not on the XMTP network yet`)
+      return
     }
+    const convo = await client.conversations.newConversation(toAddress)
+    navigation.navigate('conversation', { topic: convo.topic })
   }
-
   return (
     <>
       <ScrollView>
@@ -62,15 +48,6 @@ export default function ConversationCreateScreen({
             opacity: isCreating ? 0.5 : 1,
           }}
         />
-        <View>
-          <Switch
-            value={groupsEnabled}
-            onValueChange={() =>
-              setGroupsEnabled((previousState) => !previousState)
-            }
-          />
-          <Text>Create Group: {groupsEnabled ? 'ON' : 'OFF'}</Text>
-        </View>
         <Button
           title="Start conversation"
           onPress={() => {