diff --git a/native/android/app/build.gradle b/native/android/app/build.gradle
index 940ee790c..a7b5ff1d0 100644
--- a/native/android/app/build.gradle
+++ b/native/android/app/build.gradle
@@ -1,728 +1,725 @@
 apply plugin: "com.android.application"
 
 import com.android.build.OutputFile
 import de.undercouch.gradle.tasks.download.Download
 import app.comm.gradle.tasks.GitModules
 
 /**
  * The react.gradle file registers a task for each build variant (e.g. bundleDebugJsAndAssets
  * and bundleReleaseJsAndAssets).
  * These basically call `react-native bundle` with the correct arguments during the Android build
  * cycle. By default, bundleDebugJsAndAssets is skipped, as in debug/dev mode we prefer to load the
  * bundle directly from the development server. Below you can see all the possible configurations
  * and their defaults. If you decide to add a configuration block, make sure to add it before the
  * `apply from: "../../node_modules/react-native/react.gradle"` line.
  *
  * project.ext.react = [
  *   // the name of the generated asset file containing your JS bundle
  *   bundleAssetName: "index.android.bundle",
  *
  *   // the entry file for bundle generation. If none specified and
  *   // "index.android.js" exists, it will be used. Otherwise "index.js" is
  *   // default. Can be overridden with ENTRY_FILE environment variable.
  *   entryFile: "index.android.js",
  *
  *   // https://reactnative.dev/docs/performance#enable-the-ram-format
  *   bundleCommand: "ram-bundle",
  *
  *   // whether to bundle JS and assets in debug mode
  *   bundleInDebug: false,
  *
  *   // whether to bundle JS and assets in release mode
  *   bundleInRelease: true,
  *
  *   // whether to bundle JS and assets in another build variant (if configured).
  *   // See http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Build-Variants
  *   // The configuration property can be in the following formats
  *   //         'bundleIn${productFlavor}${buildType}'
  *   //         'bundleIn${buildType}'
  *   // bundleInFreeDebug: true,
  *   // bundleInPaidRelease: true,
  *   // bundleInBeta: true,
  *
  *   // whether to disable dev mode in custom build variants (by default only disabled in release)
  *   // for example: to disable dev mode in the staging build type (if configured)
  *   devDisabledInStaging: true,
  *   // The configuration property can be in the following formats
  *   //         'devDisabledIn${productFlavor}${buildType}'
  *   //         'devDisabledIn${buildType}'
  *
  *   // the root of your project, i.e. where "package.json" lives
  *   root: "../../",
  *
  *   // where to put the JS bundle asset in debug mode
  *   jsBundleDirDebug: "$buildDir/intermediates/assets/debug",
  *
  *   // where to put the JS bundle asset in release mode
  *   jsBundleDirRelease: "$buildDir/intermediates/assets/release",
  *
  *   // where to put drawable resources / React Native assets, e.g. the ones you use via
  *   // require('./image.png')), in debug mode
  *   resourcesDirDebug: "$buildDir/intermediates/res/merged/debug",
  *
  *   // where to put drawable resources / React Native assets, e.g. the ones you use via
  *   // require('./image.png')), in release mode
  *   resourcesDirRelease: "$buildDir/intermediates/res/merged/release",
  *
  *   // by default the gradle tasks are skipped if none of the JS files or assets change; this means
  *   // that we don't look at files in android/ or ios/ to determine whether the tasks are up to
  *   // date; if you have any other folders that you want to ignore for performance reasons (gradle
  *   // indexes the entire tree), add them here. Alternatively, if you have JS files in android/
  *   // for example, you might want to remove it from here.
  *   inputExcludes: ["android/**", "ios/**"],
  *
  *   // override which node gets called and with what additional arguments
  *   nodeExecutableAndArgs: ["node"],
  *
  *   // supply additional arguments to the packager
  *   extraPackagerArgs: []
  * ]
  */
 
 project.ext.react = [
     enableHermes: true,  // clean and rebuild if changing
     cliPath: ["node", "-e", "console.log(require('react-native/cli').bin);"].execute([], projectDir).text.trim(),
 ]
 
 apply from: new File(["node", "--print", "require.resolve('react-native/package.json')"].execute(null, rootDir).text.trim(), "../react.gradle")
 
 /**
  * Set this to true to create two separate APKs instead of one:
  *   - An APK that only works on ARM devices
  *   - An APK that only works on x86 devices
  * The advantage is the size of the APK is reduced by about 4MB.
  * Upload all the APKs to the Play Store and people will download
  * the correct one based on the CPU architecture of their device.
  */
 def enableSeparateBuildPerCPUArchitecture = false
 
 /**
  * Run Proguard to shrink the Java bytecode in release builds.
  */
 def enableProguardInReleaseBuilds = false
 
 /**
  * The preferred build flavor of JavaScriptCore.
  *
  * For example, to use the international variant, you can use:
  * `def jscFlavor = 'org.webkit:android-jsc-intl:+'`
  *
  * The international variant includes ICU i18n library and necessary data
  * allowing to use e.g. `Date.toLocaleString` and `String.localeCompare` that
  * give correct results when using with locales other than en-US.  Note that
  * this variant is about 6MiB larger per architecture than default.
  */
 def jscFlavor = 'org.webkit:android-jsc:+'
 
 /**
  * Whether to enable the Hermes VM.
  *
  * This should be set on project.ext.react and that value will be read here. If it is not set
  * on project.ext.react, JavaScript will not be compiled to Hermes Bytecode
  * and the benefits of using Hermes will therefore be sharply reduced.
  */
 def enableHermes = project.ext.react.get("enableHermes", false)
 
 /**
  * Architectures to build native code for.
  */
 def reactNativeArchitectures() {
     def value = project.getProperties().get("reactNativeArchitectures")
     return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
 }
 
 def customDownloadsDir = System.getenv("REACT_NATIVE_DOWNLOADS_DIR")
 def dependenciesPath = System.getenv("REACT_NATIVE_DEPENDENCIES")
 def downloadsDir = customDownloadsDir ? new File(customDownloadsDir) : new File("$buildDir/downloads")
 def thirdPartyNdkDir = new File("$buildDir/third-party-ndk")
 
 task createNativeDepsDirectories {
     downloadsDir.mkdirs()
     thirdPartyNdkDir.mkdirs()
 }
 
 def REACT_NATIVE_DIR = new File(["node", "--print", "require.resolve('react-native/package.json')"].execute(null, rootDir).text.trim()).parent
 def reactNativeThirdParty = new File("$REACT_NATIVE_DIR/ReactAndroid/src/main/jni/third-party")
 
 def reactProperties = new Properties()
 file("$REACT_NATIVE_DIR/ReactAndroid/gradle.properties").withInputStream { reactProperties.load(it) }
 
 def FOLLY_VERSION = reactProperties.getProperty("FOLLY_VERSION")
 def BOOST_VERSION = reactProperties.getProperty("BOOST_VERSION")
 def DOUBLE_CONVERSION_VERSION = reactProperties.getProperty("DOUBLE_CONVERSION_VERSION")
 
 // FOLLY
 task downloadFolly(dependsOn: createNativeDepsDirectories, type: Download) {
     src("https://github.com/facebook/folly/archive/v${FOLLY_VERSION}.tar.gz")
     onlyIfNewer(true)
     overwrite(false)
     dest(new File(downloadsDir, "folly-${FOLLY_VERSION}.tar.gz"))
 }
 
 task prepareFolly(dependsOn: [downloadFolly], type: Copy) {
     from(tarTree(downloadFolly.dest))
     from("$reactNativeThirdParty/folly/Android.mk")
     include("folly-${FOLLY_VERSION}/folly/**/*", "Android.mk")
     eachFile { fname -> fname.path = (fname.path - "folly-${FOLLY_VERSION}/") }
     includeEmptyDirs = false
     into("$thirdPartyNdkDir/folly")
 }
 
 // GLOG
 task downloadGlog(dependsOn: createNativeDepsDirectories, type: Download) {
     src("https://github.com/google/glog/archive/v${GLOG_VERSION}.tar.gz")
     onlyIfNewer(true)
     overwrite(false)
     dest(new File(downloadsDir, "glog-${GLOG_VERSION}.tar.gz"))
 }
 
 task prepareGlog(dependsOn: dependenciesPath ? [] : [downloadGlog], type: Copy) {
     from(dependenciesPath ?: tarTree(downloadGlog.dest))
     include("glog-${GLOG_VERSION}/**/*")
     includeEmptyDirs = false
     into("$thirdPartyNdkDir/glog")
 }
 
 // BOOST
 
 // The Boost library is a very large download (>100MB).
 // If Boost is already present on your system, define the REACT_NATIVE_BOOST_PATH env variable
 // and the build will use that.
 def boostPath = dependenciesPath ?: System.getenv("REACT_NATIVE_BOOST_PATH")
 
 task downloadBoost(dependsOn: createNativeDepsDirectories, type: Download) {
     src("https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION.replace("_", ".")}/source/boost_${BOOST_VERSION}.tar.gz")
     onlyIfNewer(true)
     overwrite(false)
     dest(new File(downloadsDir, "boost_${BOOST_VERSION}.tar.gz"))
 }
 
 task prepareBoost(dependsOn: [downloadBoost], type: Copy) {
     from(tarTree(resources.gzip(downloadBoost.dest)))
     from("$reactNativeThirdParty/boost/Android.mk")
     include("Android.mk", "boost_${BOOST_VERSION}/boost/**/*.hpp", "boost/boost/**/*.hpp")
     includeEmptyDirs = false
     into("$thirdPartyNdkDir/boost")
     doLast {
         file("$thirdPartyNdkDir/boost/boost").renameTo("$thirdPartyNdkDir/boost/boost_${BOOST_VERSION}")
     }
 }
 
 // DOUBLE-CONVERSION
 task downloadDoubleConversion(dependsOn: createNativeDepsDirectories, type: Download) {
     src("https://github.com/google/double-conversion/archive/v${DOUBLE_CONVERSION_VERSION}.tar.gz")
     onlyIfNewer(true)
     overwrite(false)
     dest(new File(downloadsDir, "double-conversion-${DOUBLE_CONVERSION_VERSION}.tar.gz"))
 }
 
 task prepareDoubleConversion(dependsOn: [downloadDoubleConversion], type: Copy) {
     from(tarTree(downloadDoubleConversion.dest))
     from("$reactNativeThirdParty/double-conversion/Android.mk")
     include("double-conversion-${DOUBLE_CONVERSION_VERSION}/src/**/*", "Android.mk")
     filesMatching("*/src/**/*", { fname -> fname.path = "double-conversion/${fname.name}" })
     includeEmptyDirs = false
     into("$thirdPartyNdkDir/double-conversion")
 }
 
 // OPENSSL
 def hostSystem = System.getProperty('os.name').toLowerCase(Locale.ROOT)
 def hostTag = hostSystem.contains('mac') ? 'darwin-x86_64' : 'linux-x86_64'
 
 task downloadOpenSSL(dependsOn: createNativeDepsDirectories, type: Download) {
     src("https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz")
     onlyIfNewer(true)
     overwrite(false)
     dest(new File(downloadsDir, "openssl-${OPENSSL_VERSION}.tar.gz"))
 }
 
 task prepareOpenSSL(
     dependsOn: dependenciesPath ? [] : [downloadOpenSSL],
     type: Copy
 ) {
     from(dependenciesPath ?: tarTree(downloadOpenSSL.dest))
     include("openssl-${OPENSSL_VERSION}/**/*")
     includeEmptyDirs = false
     into("${thirdPartyNdkDir}/openssl")
 }
 
 task prebuildOpenSSL(dependsOn: dependenciesPath ? [] : [prepareOpenSSL]) {
     inputs.properties([
         'openssl.version': OPENSSL_VERSION,
         'openssl.abis': getBuildTypeABIs(reactNativeArchitectures())
     ])
     outputs.dir("${thirdPartyNdkDir}/openssl/openssl-${OPENSSL_VERSION}/build/")
         .withPropertyName('openssl.output')
     doFirst {
         getBuildTypeABIs(reactNativeArchitectures()).each { buildABI ->
             logger.info("Building OpenSSL library for the ${buildABI}")
             exec {
                 commandLine './bash/build_openssl.sh',
                 // OPENSSL_SUBMODULE_PATH
                 "${thirdPartyNdkDir}/openssl/openssl-${OPENSSL_VERSION}/",
                 // HOST_TAG
                 hostTag,
                 // ANDROID_ARCH_ABI
                 "${buildABI}",
                 // MIN_SDK_VERSION
                 rootProject.ext.minSdkVersion,
                 // ANDROID_NDK_HOME
                 android.ndkDirectory.absolutePath,
                 // PARALLEL_THREADS
                 Runtime.getRuntime().availableProcessors()
             }
         }
     }
 }
 
 // JNI
 def REACT_NATIVE_AAR = "${buildDir}/react-native.aar"
 
 def extractReactNativeAAR = { buildType ->
     def suffix = buildType == 'Debug' ? '-debug' : '-release'
     def rnAARs = fileTree(REACT_NATIVE_DIR).matching { include "**/react-native/**/*${suffix}.aar" }
     if (rnAARs.isEmpty()) {
         rnAARs = fileTree(REACT_NATIVE_DIR).matching { include "**/react-native/**/*.aar" }
     }
     if (rnAARs.any() && rnAARs.size() > 1) {
         logger.error("More than one React Native AAR file has been found:")
         rnAARs.each { println(it) }
         throw new GradleException(
             "Multiple React Native AARs found:\n${rnAARs.join("\n")}" +
             "\nRemove the old ones and try again"
         )
     }
     def rnAAR = rnAARs.singleFile
     def file = rnAAR.absoluteFile
     def packageName = file.name.tokenize('-')[0]
     copy {
         from zipTree(file)
         into REACT_NATIVE_AAR
         include "jni/**/*"
     }
 }
 
 task extractReactNativeAARRelease {
     doLast {
         extractReactNativeAAR('Release')
     }
 }
 
 task extractReactNativeAARDebug {
     doLast {
         extractReactNativeAAR('Debug')
     }
 }
 
 
 task extractAARHeaders {
     doLast {
         configurations.extractHeaders.files.each {
             def file = it.absoluteFile
             copy {
                 from zipTree(file)
                 into "$buildDir/$file.name"
                 include "**/*.h"
             }
         }
     }
 }
 
 task extractJNIFiles {
     doLast {
         configurations.extractJNI.files.each {
             def file = it.absoluteFile
             copy {
                 from zipTree(file)
                 into "$buildDir/$file.name"
                 include "jni/**/*"
             }
         }
     }
 }
 
 tasks.whenTaskAdded { task ->
     if (
         !task.name.contains("Clean") &&
         (task.name.contains('externalNativeBuild') ||
             task.name.startsWith('configureCMake') ||
             task.name.startsWith('buildCMake'))
     ) {
         def buildType = task.name.endsWith('Debug') ? 'Debug' : 'Release'
         task.dependsOn(extractAARHeaders)
         task.dependsOn(extractJNIFiles)
         task.dependsOn("extractReactNativeAAR${buildType}")
     }
 }
 
 // EXTERNAL LIBS
 task prepareExternalLibs {
     dependsOn prepareFolly
     dependsOn prepareGlog
     dependsOn prepareBoost
     dependsOn prepareDoubleConversion
     dependsOn prebuildOpenSSL
 }
 
 // Removes the '.cxx' directory to prevent running
 // ninja clean when the 'clean' command is executed
 task removeCXX(type: Exec) {
     commandLine 'rm', '-rf', '.cxx'
 }
 
 // Add cross-compilation targets to Rust toolchain
 task updateRustToolchain(type: Exec) {
     commandLine "rustup", "target", "add",
         "aarch64-linux-android",
         "armv7-linux-androideabi",
         "i686-linux-android",
         "x86_64-linux-android"
 }
 
 // Bind preBuild dependencies only if not 'clean' running
 if (!isCleanRunning()) {
     afterEvaluate {
         preBuild.dependsOn(prepareExternalLibs, updateRustToolchain)
     }
 }
 
 // Run removing CXX task before the clean execution
 beforeEvaluate {
     clean.dependsOn(removeCXX)
 }
 
 // Detects are we running the 'clean' commands
 def isCleanRunning() {
     gradle.startParameter.taskRequests.any {
         !it.args.isEmpty() && it.args.first().startsWith('clean')
     }
 }
 
 // Release keystore via macOS Keychain Access
 def getPassword(String keyLabel) {
     if (System.getenv('ANDROID_SIGNING_PASSWORD')) {
         return System.getenv('ANDROID_SIGNING_PASSWORD') 
     }
     def stdout = new ByteArrayOutputStream()
     exec {
         commandLine 'security',
             'find-generic-password',
             '-wl', keyLabel,
             '-a', System.properties['user.name']
         standardOutput = stdout
         ignoreExitValue true
     }
     return stdout.toString().strip()
 }
 
 // Returns all ABIs architectures for the 'bundleRelease'
 // or only from 'adb devices' if running debug release.
 def getBuildTypeABIs(nativeArchitectures) {
     if (System.getenv("BUILDKITE") == "true") {
         return ["arm64-v8a"] 
     }
     def isBundleRelease = gradle.startParameter.taskRequests.any {
         !it.args.isEmpty() && it.args.first().contains("bundleRelease")
     }
     if (isBundleRelease) {
         // All of the supported ABIs
         // https://developer.android.com/ndk/guides/abis.html#sa
         final allAbis = ["armeabi-v7a", "x86", "arm64-v8a", "x86_64"]
         logger.info("Using all architectures to build: ${allAbis}")
         return allAbis
     }
     if (nativeArchitectures) {
         return nativeArchitectures
     }
     // Get current 'adb devices' architectures
     def commandOutput = new ByteArrayOutputStream()
     exec {
         commandLine "./bash/detect_abis.sh"
         standardOutput = commandOutput
     }
     final detectedAbis = commandOutput.toString("UTF-8").trim().tokenize()
     logger.info("Detected architectures to build: ${detectedAbis}")
     return detectedAbis
 }
 
 def REACT_NATIVE_SO_DIR = "${REACT_NATIVE_AAR}/jni"
 
 android {
     buildFeatures {
         prefab true
     }
     configurations {
         all*.exclude module: 'fbjni-java-only'
         extractHeaders
         extractJNI
     }
     dependencies {
         implementation 'com.facebook.fbjni:fbjni:0.2.2'
         compileOnly 'com.facebook.fbjni:fbjni:0.2.2'
         extractHeaders 'com.facebook.fbjni:fbjni:0.2.2:headers'
         extractJNI 'com.facebook.fbjni:fbjni:0.2.2'
     }
 
     ndkVersion rootProject.ext.ndkVersion
 
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
         applicationId 'app.comm.android'
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 166
         versionName '1.0.166'
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
         if (isNewArchitectureEnabled()) {
             // We configure the CMake build only if you decide to opt-in for the New Architecture.
             externalNativeBuild {
                 cmake {
                     arguments "-DPROJECT_BUILD_DIR=$buildDir",
                         "-DREACT_ANDROID_DIR=$rootDir/../node_modules/react-native/ReactAndroid",
                         "-DREACT_ANDROID_BUILD_DIR=$rootDir/../node_modules/react-native/ReactAndroid/build",
                         "-DNODE_MODULES_DIR=$rootDir/../node_modules",
                         "-DANDROID_STL=c++_shared"
                 }
             }
             if (!enableSeparateBuildPerCPUArchitecture) {
                 ndk {
                     abiFilters (*reactNativeArchitectures())
                 }
             }
         }
         missingDimensionStrategy 'react-native-camera', 'general'
         multiDexEnabled true
     }
 
     if (isNewArchitectureEnabled()) {
         // We configure the NDK build only if you decide to opt-in for the New Architecture.
         externalNativeBuild {
             cmake {
                 path "$projectDir/src/main/jni/CMakeLists.txt"
             }
         }
         def reactAndroidProjectDir = project(':ReactAndroid').projectDir
         def packageReactNdkDebugLibs = tasks.register("packageReactNdkDebugLibs", Copy) {
             dependsOn(":ReactAndroid:packageReactNdkDebugLibsForBuck")
             from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib")
             into("$buildDir/react-ndk/exported")
         }
         def packageReactNdkReleaseLibs = tasks.register("packageReactNdkReleaseLibs", Copy) {
             dependsOn(":ReactAndroid:packageReactNdkReleaseLibsForBuck")
             from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib")
             into("$buildDir/react-ndk/exported")
         }
         afterEvaluate {
             // If you wish to add a custom TurboModule or component locally,
             // you should uncomment this line.
             // preBuild.dependsOn("generateCodegenArtifactsFromSchema")
             preDebugBuild.dependsOn(packageReactNdkDebugLibs)
             preReleaseBuild.dependsOn(packageReactNdkReleaseLibs)
             // Due to a bug inside AGP, we have to explicitly set a dependency
             // between configureCMakeDebug* tasks and the preBuild tasks.
             // This can be removed once this is solved: https://issuetracker.google.com/issues/207403732
             configureCMakeRelWithDebInfo.dependsOn(preReleaseBuild)
             configureCMakeDebug.dependsOn(preDebugBuild)
             reactNativeArchitectures().each { architecture ->
                 tasks.findByName("configureCMakeDebug[${architecture}]")?.configure {
                     dependsOn("preDebugBuild")
                 }
                 tasks.findByName("configureCMakeRelWithDebInfo[${architecture}]")?.configure {
                     dependsOn("preReleaseBuild")
                 }
             }
         }
     }
 
     splits {
         abi {
             reset()
             enable enableSeparateBuildPerCPUArchitecture
             universalApk false  // If true, also generate a universal APK
             include (*reactNativeArchitectures())
         }
     }
     signingConfigs {
         debug {
             storeFile file('debug.keystore')
             storePassword 'android'
             keyAlias 'androiddebugkey'
             keyPassword 'android'
         }
         release {
             if (project.hasProperty('COMM_UPLOAD_STORE_FILE')) {
                 def password = getPassword('CommAndroidKeyPassword')
                 storeFile file(COMM_UPLOAD_STORE_FILE)
                 storePassword password
                 keyAlias COMM_UPLOAD_KEY_ALIAS
                 keyPassword password
             }
         }
     }
     buildTypes {
         final buildABIs = getBuildTypeABIs(reactNativeArchitectures())
         release {
             if (project.hasProperty('COMM_UPLOAD_STORE_FILE')) {
                 signingConfig signingConfigs.release
             } else {
                 signingConfig signingConfigs.debug
             }
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
             ndk {
                 abiFilters = []
                 abiFilters.addAll(buildABIs)
             }
         }
         debug {
             signingConfig signingConfigs.debug
             ndk {
                 abiFilters = []
                 abiFilters.addAll(buildABIs)
             }
         }
     }
 
     packagingOptions {
         pickFirst "**/libc++_shared.so"
         pickFirst "**/libfbjni.so"
     }
 
     defaultConfig {
         externalNativeBuild {
             cmake {
                 arguments "-DANDROID_STL=c++_shared",
                     "-DGLOG_VERSION=" + GLOG_VERSION,
                     "-DOPENSSL_VERSION=" + OPENSSL_VERSION,
                     "-DNDK_VERSION=" + rootProject.ext.ndkVersion,
                     "-DREACT_NATIVE_SO_DIR=${REACT_NATIVE_SO_DIR}",
                     "-DBOOST_VERSION=${BOOST_VERSION}"
                 targets "comm_jni_module", "turbomodulejsijni"
             }
         }
     }
 
     externalNativeBuild {
         cmake {
             path "CMakeLists.txt"
             version "3.18.1"
         }
     }
 
     // applicationVariants are e.g. debug, release
     applicationVariants.all { variant ->
         variant.outputs.each { output ->
             // For each separate APK per architecture, set a unique version code as described here:
             // https://developer.android.com/studio/build/configure-apk-splits.html
             // Example: versionCode 1 will generate 1001 for armeabi-v7a, 1002 for x86, etc.
             def versionCodes = ["armeabi-v7a": 1, "x86": 2, "arm64-v8a": 3, "x86_64": 4]
             def abi = output.getFilter(OutputFile.ABI)
             if (abi != null) {  // null for the universal-debug, universal-release variants
                 output.versionCodeOverride =
                         defaultConfig.versionCode * 1000 + versionCodes.get(abi)
             }
         }
     }
 
     afterEvaluate {
         extractAARHeaders.dependsOn(prepareExternalLibs)
         extractJNIFiles.dependsOn(prepareExternalLibs)
     }
 }
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.10"
     //noinspection GradleDynamicVersion
     implementation("com.facebook.react:react-native:+")
 
     def isGifEnabled = (findProperty('expo.gif.enabled') ?: "") == "true";
     def isWebpEnabled = (findProperty('expo.webp.enabled') ?: "") == "true";
     def isWebpAnimatedEnabled = (findProperty('expo.webp.animated') ?: "") == "true";
 
     // If your app supports Android versions before Ice Cream Sandwich (API level 14)
     // All fresco packages should use the same version
     if (isGifEnabled || isWebpEnabled) {
         implementation 'com.facebook.fresco:fresco:2.0.0'
         implementation 'com.facebook.fresco:imagepipeline-okhttp3:2.0.0'
     }
 
     if (isGifEnabled) {
         // For animated gif support
         implementation 'com.facebook.fresco:animated-gif:2.0.0'
     }
 
     if (isWebpEnabled) {
         // For webp support
         implementation 'com.facebook.fresco:webpsupport:2.0.0'
         if (isWebpAnimatedEnabled) {
             // Animated webp support
             implementation 'com.facebook.fresco:animated-webp:2.0.0'
         }
     }
 
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
 
     implementation "com.google.android.gms:play-services-base:16.1.0"
     implementation "com.google.firebase:firebase-core:16.0.9"
     implementation "com.google.firebase:firebase-messaging:18.0.0"
     implementation "me.leolin:ShortcutBadger:1.1.21@aar"
     implementation project(':reactnativekeyboardinput')
     implementation "androidx.multidex:multidex:2.0.1"
 
-    implementation "androidx.lifecycle:lifecycle-runtime:2.2.0"
-    implementation "androidx.lifecycle:lifecycle-process:2.2.0"
-
     implementation 'com.facebook.fresco:fresco:2.2.0'
     implementation 'com.facebook.fresco:animated-gif:2.2.0'
     implementation 'com.facebook.fresco:animated-webp:2.2.0'
     implementation 'com.facebook.fresco:webpsupport:2.2.0'
 
     implementation 'org.conscrypt:conscrypt-android:2.0.0'
 
     if (enableHermes) {
         //noinspection GradleDynamicVersion
         implementation("com.facebook.react:hermes-engine:+") { // From node_modules
             exclude group:'com.facebook.fbjni'
         }
     } else {
         implementation jscFlavor
     }
 }
 
 if (isNewArchitectureEnabled()) {
     // If new architecture is enabled, we let you build RN from source
     // Otherwise we fallback to a prebuilt .aar bundled in the NPM package.
     // This will be applied to all the imported transtitive dependency.
     configurations.all {
         resolutionStrategy.dependencySubstitution {
             substitute(module("com.facebook.react:react-native"))
                     .using(project(":ReactAndroid"))
                     .because("On New Architecture we're building React Native from source")
             substitute(module("com.facebook.react:hermes-engine"))
                     .using(project(":ReactAndroid:hermes-engine"))
                     .because("On New Architecture we're building Hermes from source")
         }
     }
 }
 
 // Run this once to be able to run the application with BUCK
 // puts all compile dependencies into folder libs for BUCK to use
 task copyDownloadableDepsToLibs(type: Copy) {
     from configurations.implementation
     into 'libs'
 }
 
 apply from: new File(["node", "--print", "require.resolve('@react-native-community/cli-platform-android/package.json')"].execute(null, rootDir).text.trim(), "../native_modules.gradle");
 applyNativeModulesAppBuildGradle(project)
 
 def isNewArchitectureEnabled() {
     // To opt-in for the New Architecture, you can either:
     // - Set `newArchEnabled` to true inside the `gradle.properties` file
     // - Invoke gradle with `-newArchEnabled=true`
     // - Set an environment variable `ORG_GRADLE_PROJECT_newArchEnabled=true`
     return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/native/android/app/src/main/java/app/comm/android/AndroidLifecycleModule.java b/native/android/app/src/main/java/app/comm/android/AndroidLifecycleModule.java
deleted file mode 100644
index debd2208d..000000000
--- a/native/android/app/src/main/java/app/comm/android/AndroidLifecycleModule.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package app.comm.android;
-
-import androidx.lifecycle.Lifecycle;
-import androidx.lifecycle.LifecycleEventObserver;
-import androidx.lifecycle.ProcessLifecycleOwner;
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.Callback;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.UiThreadUtil;
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.module.annotations.ReactModule;
-import com.facebook.react.modules.core.DeviceEventManagerModule;
-import java.util.HashMap;
-import java.util.Map;
-
-@ReactModule(name = AndroidLifecycleModule.NAME)
-public class AndroidLifecycleModule extends ReactContextBaseJavaModule {
-
-  public static final String NAME = "AndroidLifecycle";
-
-  public static final String ANDROID_LIFECYCLE_ACTIVE = "active";
-  public static final String ANDROID_LIFECYCLE_BACKGROUND = "background";
-
-  private static final String INITIAL_STATUS_KEY = "initialStatus";
-  private static final String STATUS_KEY = "status";
-
-  private boolean isInitialized = false;
-
-  private String currentState;
-
-  public AndroidLifecycleModule(ReactApplicationContext reactContext) {
-    super(reactContext);
-
-    final Lifecycle lifecycle = ProcessLifecycleOwner.get().getLifecycle();
-    this.currentState = lifecycle.getCurrentState() == Lifecycle.State.RESUMED
-        ? ANDROID_LIFECYCLE_ACTIVE
-        : ANDROID_LIFECYCLE_BACKGROUND;
-
-    UiThreadUtil.runOnUiThread(() -> {
-      lifecycle.addObserver((LifecycleEventObserver)(source, event) -> {
-        final String name = event.toString();
-        if (name != "ON_START" && name != "ON_STOP") {
-          return;
-        }
-        if (!this.isInitialized) {
-          return;
-        }
-        this.currentState = name == "ON_START" ? ANDROID_LIFECYCLE_ACTIVE
-                                               : ANDROID_LIFECYCLE_BACKGROUND;
-        reactContext
-            .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-            .emit("LIFECYCLE_CHANGE", this.createEventMap());
-      });
-    });
-  }
-
-  @Override
-  public String getName() {
-    return NAME;
-  }
-
-  @Override
-  public void initialize() {
-    super.initialize();
-    this.isInitialized = true;
-  }
-
-  @Override
-  public Map<String, Object> getConstants() {
-    final Map<String, Object> constants = new HashMap<>();
-    constants.put(INITIAL_STATUS_KEY, this.currentState);
-    return constants;
-  }
-
-  private WritableMap createEventMap() {
-    WritableMap appState = Arguments.createMap();
-    appState.putString(STATUS_KEY, this.currentState);
-    return appState;
-  }
-
-  @ReactMethod
-  public void getCurrentLifecycleStatus(Callback success, Callback error) {
-    success.invoke(createEventMap());
-  }
-}
diff --git a/native/android/app/src/main/java/app/comm/android/CommPackage.java b/native/android/app/src/main/java/app/comm/android/CommPackage.java
deleted file mode 100644
index aa1beba75..000000000
--- a/native/android/app/src/main/java/app/comm/android/CommPackage.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package app.comm.android;
-
-import com.facebook.react.ReactPackage;
-import com.facebook.react.bridge.NativeModule;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.uimanager.ViewManager;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-public class CommPackage implements ReactPackage {
-
-  @Override
-  public List<ViewManager>
-  createViewManagers(ReactApplicationContext reactContext) {
-    return Collections.emptyList();
-  }
-
-  @Override
-  public List<NativeModule>
-  createNativeModules(ReactApplicationContext reactContext) {
-    List<NativeModule> modules = new ArrayList<>();
-    modules.add(new AndroidLifecycleModule(reactContext));
-    return modules;
-  }
-}
diff --git a/native/android/app/src/main/java/app/comm/android/MainApplication.java b/native/android/app/src/main/java/app/comm/android/MainApplication.java
index 5daf729ba..760b7b3ce 100644
--- a/native/android/app/src/main/java/app/comm/android/MainApplication.java
+++ b/native/android/app/src/main/java/app/comm/android/MainApplication.java
@@ -1,103 +1,102 @@
 package app.comm.android;
 
 import android.content.Context;
 import android.content.res.Configuration;
 import android.database.CursorWindow;
 import androidx.annotation.NonNull;
 import androidx.multidex.MultiDexApplication;
 import app.comm.android.newarchitecture.MainApplicationReactNativeHost;
 import com.facebook.react.PackageList;
 import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.JSIModulePackage;
 import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.soloader.SoLoader;
 import com.wix.reactnativekeyboardinput.KeyboardInputPackage;
 import expo.modules.ApplicationLifecycleDispatcher;
 import expo.modules.ReactNativeHostWrapper;
 import io.invertase.firebase.messaging.RNFirebaseMessagingPackage;
 import io.invertase.firebase.notifications.RNFirebaseNotificationsPackage;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.security.Security;
 import java.util.List;
 public class MainApplication
     extends MultiDexApplication implements ReactApplication {
 
   static {
     System.loadLibrary("comm_jni_module");
   }
 
   private final ReactNativeHost mReactNativeHost =
       new ReactNativeHostWrapper(this, new ReactNativeHost(this) {
         @Override
         public boolean getUseDeveloperSupport() {
           return BuildConfig.DEBUG;
         }
 
         @Override
         protected List<ReactPackage> getPackages() {
           @SuppressWarnings("UnnecessaryLocalVariable")
           List<ReactPackage> packages = new PackageList(this).getPackages();
           packages.add(new RNFirebaseMessagingPackage());
           packages.add(new RNFirebaseNotificationsPackage());
           packages.add(new KeyboardInputPackage(this.getApplication()));
-          packages.add(new CommPackage());
           return packages;
         }
 
         @Override
         protected String getJSMainModuleName() {
           return "index";
         }
 
         @Override
         protected JSIModulePackage getJSIModulePackage() {
           return new CommCoreJSIModulePackage();
         }
       });
 
   private final ReactNativeHost mNewArchitectureNativeHost =
       new ReactNativeHostWrapper(
           this,
           new MainApplicationReactNativeHost(this));
 
   @Override
   public ReactNativeHost getReactNativeHost() {
     if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
       return mNewArchitectureNativeHost;
     } else {
       return mReactNativeHost;
     }
   }
 
   @Override
   public void onCreate() {
     super.onCreate();
     // If you opted-in for the New Architecture, we enable the TurboModule
     // system
     ReactFeatureFlags.useTurboModules = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
 
     Security.insertProviderAt(new org.conscrypt.OpenSSLProvider(), 1);
 
     SoLoader.init(this, /* native exopackage */ false);
     ApplicationLifecycleDispatcher.onApplicationCreate(this);
     try {
       Field field = CursorWindow.class.getDeclaredField("sCursorWindowSize");
       field.setAccessible(true);
       field.set(null, 100 * 1024 * 1024); // 100 MiB
     } catch (Exception e) {
       if (BuildConfig.DEBUG) {
         e.printStackTrace();
       }
     }
   }
 
   @Override
   public void onConfigurationChanged(Configuration newConfig) {
     super.onConfigurationChanged(newConfig);
     ApplicationLifecycleDispatcher.onConfigurationChanged(this, newConfig);
   }
 }
diff --git a/native/lifecycle/lifecycle-event-emitter.js b/native/lifecycle/lifecycle-event-emitter.js
deleted file mode 100644
index e225cfaf9..000000000
--- a/native/lifecycle/lifecycle-event-emitter.js
+++ /dev/null
@@ -1,60 +0,0 @@
-// @flow
-
-import invariant from 'invariant';
-import { Platform } from 'react-native';
-import NativeEventEmitter from 'react-native/Libraries/EventEmitter/NativeEventEmitter';
-import type { TurboModule } from 'react-native/Libraries/TurboModule/RCTExport';
-import * as TurboModuleRegistry from 'react-native/Libraries/TurboModule/TurboModuleRegistry';
-
-import type { LifecycleState } from 'lib/types/lifecycle-state-types';
-
-import type { EventSubscription } from '../types/react-native';
-
-interface Spec extends TurboModule {
-  +getConstants: () => {
-    initialStatus: string,
-  };
-  +addListener: (eventName: string) => void;
-  +removeListeners: (count: number) => void;
-}
-const AndroidLifecycle = (TurboModuleRegistry.getEnforcing<Spec>(
-  'AndroidLifecycle',
-): Spec);
-
-type LifecycleEventEmitterArgs = {
-  +LIFECYCLE_CHANGE: [{ +status: ?LifecycleState }],
-};
-class LifecycleEventEmitter extends NativeEventEmitter<LifecycleEventEmitterArgs> {
-  currentLifecycleStatus: ?string;
-
-  constructor() {
-    super(AndroidLifecycle);
-    this.currentLifecycleStatus = AndroidLifecycle.getConstants().initialStatus;
-    this.addLifecycleListener(state => {
-      this.currentLifecycleStatus = state;
-    });
-  }
-
-  addLifecycleListener: (
-    listener: (state: ?LifecycleState) => void,
-  ) => EventSubscription = listener => {
-    return this.addListener('LIFECYCLE_CHANGE', event => {
-      listener(event.status);
-    });
-  };
-}
-
-let lifecycleEventEmitter;
-function getLifecycleEventEmitter(): LifecycleEventEmitter {
-  if (lifecycleEventEmitter) {
-    return lifecycleEventEmitter;
-  }
-  invariant(
-    Platform.OS === 'android',
-    'LifecycleEventEmitter only works on Android',
-  );
-  lifecycleEventEmitter = new LifecycleEventEmitter();
-  return lifecycleEventEmitter;
-}
-
-export { getLifecycleEventEmitter };
diff --git a/native/lifecycle/lifecycle.js b/native/lifecycle/lifecycle.js
index 8dbd5fa44..d23582d40 100644
--- a/native/lifecycle/lifecycle.js
+++ b/native/lifecycle/lifecycle.js
@@ -1,26 +1,33 @@
 // @flow
 
 import { Platform, AppState as NativeAppState } from 'react-native';
 
 import { type LifecycleState } from 'lib/types/lifecycle-state-types';
 
 import type { EventSubscription } from '../types/react-native';
-import { getLifecycleEventEmitter } from './lifecycle-event-emitter';
+import { addAndroidLifecycleListener, initialStatus } from './lifecycle-module';
+
+let currentLifecycleStatus = initialStatus;
+if (Platform.OS === 'android') {
+  addAndroidLifecycleListener(state => {
+    currentLifecycleStatus = state;
+  });
+}
 
 function addLifecycleListener(
   listener: (state: ?LifecycleState) => void,
 ): EventSubscription {
   if (Platform.OS === 'android') {
-    return getLifecycleEventEmitter().addLifecycleListener(listener);
+    return addAndroidLifecycleListener(listener);
   }
 
   return NativeAppState.addEventListener('change', listener);
 }
 
 function getCurrentLifecycleState(): ?string {
   return Platform.OS === 'android'
-    ? getLifecycleEventEmitter().currentLifecycleStatus
+    ? currentLifecycleStatus
     : NativeAppState.currentState;
 }
 
 export { addLifecycleListener, getCurrentLifecycleState };