Merge branch 'main' into em/beta-main-2

# Conflicts:
#	android/build.gradle
#	example/ios/Podfile.lock
#	ios/XMTPReactNative.podspec

.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

@@ -98,20 +98,8 @@ repositories {
 dependencies {
   implementation project(':expo-modules-core')
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getKotlinVersion()}"
-  implementation "org.xmtp:android:0.10.0"
+  implementation "org.xmtp:android:0.10.4"
   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"
-  implementation "org.xmtp:android:0.10.0"
-  // 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'
 }