diff --git a/native/cpp/CommonCpp/NativeModules/CommCoreModule.h b/native/cpp/CommonCpp/NativeModules/CommCoreModule.h
--- a/native/cpp/CommonCpp/NativeModules/CommCoreModule.h
+++ b/native/cpp/CommonCpp/NativeModules/CommCoreModule.h
@@ -3,7 +3,7 @@
 #include "../CryptoTools/CryptoModule.h"
 #include "../Tools/CommSecureStore.h"
 #include "../Tools/WorkerThread.h"
-#include "../_generated/NativeModules.h"
+#include "../_generated/commJSI.h"
 #include <ReactCommon/TurboModuleUtils.h>
 #include <jsi/jsi.h>
 #include <memory>
@@ -22,49 +22,44 @@
 
   template <class T>
   T runSyncOrThrowJSError(jsi::Runtime &rt, std::function<T()> task);
-  jsi::Value getDraft(jsi::Runtime &rt, const jsi::String &key) override;
-  jsi::Value updateDraft(
+  virtual jsi::Value getDraft(jsi::Runtime &rt, jsi::String key) override;
+  virtual jsi::Value
+  updateDraft(jsi::Runtime &rt, jsi::String key, jsi::String text) override;
+  virtual jsi::Value
+  moveDraft(jsi::Runtime &rt, jsi::String oldKey, jsi::String newKey) override;
+  virtual jsi::Value getClientDBStore(jsi::Runtime &rt) override;
+  virtual jsi::Value removeAllDrafts(jsi::Runtime &rt) override;
+  virtual jsi::Array getAllMessagesSync(jsi::Runtime &rt) override;
+  virtual jsi::Value
+  processDraftStoreOperations(jsi::Runtime &rt, jsi::Array operations) override;
+  virtual jsi::Value processMessageStoreOperations(
       jsi::Runtime &rt,
-      const jsi::String &key,
-      const jsi::String &text) override;
-  jsi::Value moveDraft(
+      jsi::Array operations) override;
+  virtual void processMessageStoreOperationsSync(
       jsi::Runtime &rt,
-      const jsi::String &oldKey,
-      const jsi::String &newKey) override;
-  jsi::Value getClientDBStore(jsi::Runtime &rt) override;
-  jsi::Value removeAllDrafts(jsi::Runtime &rt) override;
-  jsi::Array getAllMessagesSync(jsi::Runtime &rt) override;
-  jsi::Value processDraftStoreOperations(
+      jsi::Array operations) override;
+  virtual jsi::Array getAllThreadsSync(jsi::Runtime &rt) override;
+  virtual jsi::Value processThreadStoreOperations(
       jsi::Runtime &rt,
-      const jsi::Array &operations) override;
-  jsi::Value processMessageStoreOperations(
+      jsi::Array operations) override;
+  virtual void processThreadStoreOperationsSync(
       jsi::Runtime &rt,
-      const jsi::Array &operations) override;
-  void processMessageStoreOperationsSync(
-      jsi::Runtime &rt,
-      const jsi::Array &operations) override;
-  jsi::Array getAllThreadsSync(jsi::Runtime &rt) override;
-  jsi::Value processThreadStoreOperations(
-      jsi::Runtime &rt,
-      const jsi::Array &operations) override;
-  void processThreadStoreOperationsSync(
-      jsi::Runtime &rt,
-      const jsi::Array &operations) override;
-  jsi::Value
-  initializeCryptoAccount(jsi::Runtime &rt, const jsi::String &userId) override;
-  jsi::Value getUserPublicKey(jsi::Runtime &rt) override;
-  jsi::Value getUserOneTimeKeys(jsi::Runtime &rt) override;
-  double getCodeVersion(jsi::Runtime &rt) override;
-  jsi::Value
-  setNotifyToken(jsi::Runtime &rt, const jsi::String &token) override;
-  jsi::Value clearNotifyToken(jsi::Runtime &rt) override;
-  jsi::Value
-  setCurrentUserID(jsi::Runtime &rt, const jsi::String &userID) override;
-  jsi::Value getCurrentUserID(jsi::Runtime &rt) override;
-  jsi::Value
-  setDeviceID(jsi::Runtime &rt, const jsi::String &deviceType) override;
-  jsi::Value getDeviceID(jsi::Runtime &rt) override;
-  jsi::Value clearSensitiveData(jsi::Runtime &rt) override;
+      jsi::Array operations) override;
+  virtual jsi::Value
+  initializeCryptoAccount(jsi::Runtime &rt, jsi::String userId) override;
+  virtual jsi::Value getUserPublicKey(jsi::Runtime &rt) override;
+  virtual jsi::Value getUserOneTimeKeys(jsi::Runtime &rt) override;
+  virtual double getCodeVersion(jsi::Runtime &rt) override;
+  virtual jsi::Value
+  setNotifyToken(jsi::Runtime &rt, jsi::String token) override;
+  virtual jsi::Value clearNotifyToken(jsi::Runtime &rt) override;
+  virtual jsi::Value
+  setCurrentUserID(jsi::Runtime &rt, jsi::String userID) override;
+  virtual jsi::Value getCurrentUserID(jsi::Runtime &rt) override;
+  virtual jsi::Value
+  setDeviceID(jsi::Runtime &rt, jsi::String deviceType) override;
+  virtual jsi::Value getDeviceID(jsi::Runtime &rt) override;
+  virtual jsi::Value clearSensitiveData(jsi::Runtime &rt) override;
 
 public:
   CommCoreModule(std::shared_ptr<facebook::react::CallInvoker> jsInvoker);
diff --git a/native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp b/native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp
--- a/native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp
+++ b/native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp
@@ -40,7 +40,7 @@
   }
 }
 
-jsi::Value CommCoreModule::getDraft(jsi::Runtime &rt, const jsi::String &key) {
+jsi::Value CommCoreModule::getDraft(jsi::Runtime &rt, jsi::String key) {
   std::string keyStr = key.utf8(rt);
   return createPromiseAsJSIValue(
       rt, [=](jsi::Runtime &innerRt, std::shared_ptr<Promise> promise) {
@@ -68,8 +68,8 @@
 
 jsi::Value CommCoreModule::updateDraft(
     jsi::Runtime &rt,
-    const jsi::String &key,
-    const jsi::String &text) {
+    jsi::String key,
+    jsi::String text) {
   std::string keyStr = key.utf8(rt);
   std::string textStr = text.utf8(rt);
   return createPromiseAsJSIValue(
@@ -96,8 +96,8 @@
 
 jsi::Value CommCoreModule::moveDraft(
     jsi::Runtime &rt,
-    const jsi::String &oldKey,
-    const jsi::String &newKey) {
+    jsi::String oldKey,
+    jsi::String newKey) {
   std::string oldKeyStr = oldKey.utf8(rt);
   std::string newKeyStr = newKey.utf8(rt);
 
@@ -373,7 +373,7 @@
 
 jsi::Value CommCoreModule::processDraftStoreOperations(
     jsi::Runtime &rt,
-    const jsi::Array &operations) {
+    jsi::Array operations) {
   std::string createOperationsError;
   std::shared_ptr<std::vector<std::unique_ptr<DraftStoreOperationBase>>>
       draftStoreOpsPtr;
@@ -465,7 +465,7 @@
 
 jsi::Value CommCoreModule::processMessageStoreOperations(
     jsi::Runtime &rt,
-    const jsi::Array &operations) {
+    jsi::Array operations) {
 
   std::string createOperationsError;
   std::shared_ptr<std::vector<std::unique_ptr<MessageStoreOperationBase>>>
@@ -512,7 +512,7 @@
 
 void CommCoreModule::processMessageStoreOperationsSync(
     jsi::Runtime &rt,
-    const jsi::Array &operations) {
+    jsi::Array operations) {
   std::vector<std::unique_ptr<MessageStoreOperationBase>> messageStoreOps;
 
   try {
@@ -653,7 +653,7 @@
 
 jsi::Value CommCoreModule::processThreadStoreOperations(
     jsi::Runtime &rt,
-    const jsi::Array &operations) {
+    jsi::Array operations) {
   std::string operationsError;
   std::shared_ptr<std::vector<std::unique_ptr<ThreadStoreOperationBase>>>
       threadStoreOpsPtr;
@@ -696,7 +696,7 @@
 
 void CommCoreModule::processThreadStoreOperationsSync(
     jsi::Runtime &rt,
-    const jsi::Array &operations) {
+    jsi::Array operations) {
   std::vector<std::unique_ptr<ThreadStoreOperationBase>> threadStoreOps;
 
   try {
@@ -719,9 +719,8 @@
   });
 }
 
-jsi::Value CommCoreModule::initializeCryptoAccount(
-    jsi::Runtime &rt,
-    const jsi::String &userId) {
+jsi::Value
+CommCoreModule::initializeCryptoAccount(jsi::Runtime &rt, jsi::String userId) {
   std::string userIdStr = userId.utf8(rt);
   folly::Optional<std::string> storedSecretKey =
       this->secureStore.get(this->secureStoreAccountDataKey);
@@ -860,8 +859,7 @@
   return this->codeVersion;
 }
 
-jsi::Value
-CommCoreModule::setNotifyToken(jsi::Runtime &rt, const jsi::String &token) {
+jsi::Value CommCoreModule::setNotifyToken(jsi::Runtime &rt, jsi::String token) {
   auto notifyToken{token.utf8(rt)};
   return createPromiseAsJSIValue(
       rt,
@@ -912,7 +910,7 @@
 };
 
 jsi::Value
-CommCoreModule::setCurrentUserID(jsi::Runtime &rt, const jsi::String &userID) {
+CommCoreModule::setCurrentUserID(jsi::Runtime &rt, jsi::String userID) {
   auto currentUserID{userID.utf8(rt)};
   return createPromiseAsJSIValue(
       rt,
@@ -963,7 +961,7 @@
 }
 
 jsi::Value
-CommCoreModule::setDeviceID(jsi::Runtime &rt, const jsi::String &deviceType) {
+CommCoreModule::setDeviceID(jsi::Runtime &rt, jsi::String deviceType) {
   std::string type = deviceType.utf8(rt);
   std::string deviceID;
   std::string deviceIDGenerationError;
diff --git a/native/cpp/CommonCpp/_generated/NativeModules.h b/native/cpp/CommonCpp/_generated/NativeModules.h
deleted file mode 100644
--- a/native/cpp/CommonCpp/_generated/NativeModules.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @generated by codegen project: GenerateModuleH.js
- */
-
-#pragma once
-
-#include <ReactCommon/TurboModule.h>
-
-namespace facebook {
-namespace react {
-class JSI_EXPORT CommCoreModuleSchemaCxxSpecJSI : public TurboModule {
-protected:
-  CommCoreModuleSchemaCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker);
-
-public:
-virtual jsi::Value getDraft(jsi::Runtime &rt, const jsi::String &key) = 0;
-virtual jsi::Value updateDraft(jsi::Runtime &rt, const jsi::String &key, const jsi::String &text) = 0;
-virtual jsi::Value moveDraft(jsi::Runtime &rt, const jsi::String &oldKey, const jsi::String &newKey) = 0;
-virtual jsi::Value getClientDBStore(jsi::Runtime &rt) = 0;
-virtual jsi::Value removeAllDrafts(jsi::Runtime &rt) = 0;
-virtual jsi::Array getAllMessagesSync(jsi::Runtime &rt) = 0;
-virtual jsi::Value processDraftStoreOperations(jsi::Runtime &rt, const jsi::Array &operations) = 0;
-virtual jsi::Value processMessageStoreOperations(jsi::Runtime &rt, const jsi::Array &operations) = 0;
-virtual void processMessageStoreOperationsSync(jsi::Runtime &rt, const jsi::Array &operations) = 0;
-virtual jsi::Array getAllThreadsSync(jsi::Runtime &rt) = 0;
-virtual jsi::Value processThreadStoreOperations(jsi::Runtime &rt, const jsi::Array &operations) = 0;
-virtual void processThreadStoreOperationsSync(jsi::Runtime &rt, const jsi::Array &operations) = 0;
-virtual jsi::Value initializeCryptoAccount(jsi::Runtime &rt, const jsi::String &userId) = 0;
-virtual jsi::Value getUserPublicKey(jsi::Runtime &rt) = 0;
-virtual jsi::Value getUserOneTimeKeys(jsi::Runtime &rt) = 0;
-virtual double getCodeVersion(jsi::Runtime &rt) = 0;
-virtual jsi::Value setNotifyToken(jsi::Runtime &rt, const jsi::String &token) = 0;
-virtual jsi::Value clearNotifyToken(jsi::Runtime &rt) = 0;
-virtual jsi::Value setCurrentUserID(jsi::Runtime &rt, const jsi::String &userID) = 0;
-virtual jsi::Value getCurrentUserID(jsi::Runtime &rt) = 0;
-virtual jsi::Value setDeviceID(jsi::Runtime &rt, const jsi::String &deviceType) = 0;
-virtual jsi::Value getDeviceID(jsi::Runtime &rt) = 0;
-virtual jsi::Value clearSensitiveData(jsi::Runtime &rt) = 0;
-
-};
-
-} // namespace react
-} // namespace facebook
diff --git a/native/cpp/CommonCpp/_generated/NativeModules.cpp b/native/cpp/CommonCpp/_generated/commJSI-generated.cpp
rename from native/cpp/CommonCpp/_generated/NativeModules.cpp
rename to native/cpp/CommonCpp/_generated/commJSI-generated.cpp
--- a/native/cpp/CommonCpp/_generated/NativeModules.cpp
+++ b/native/cpp/CommonCpp/_generated/commJSI-generated.cpp
@@ -1,25 +1,25 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
  *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
  *
  * @generated by codegen project: GenerateModuleH.js
  */
 
-#include "NativeModules.h"
+#include "commJSI.h"
 
 namespace facebook {
 namespace react {
 
 static jsi::Value __hostFunction_CommCoreModuleSchemaCxxSpecJSI_getDraft(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<CommCoreModuleSchemaCxxSpecJSI *>(&turboModule)->getDraft(rt, args[0].getString(rt));
+  return static_cast<CommCoreModuleSchemaCxxSpecJSI *>(&turboModule)->getDraft(rt, args[0].asString(rt));
 }
 static jsi::Value __hostFunction_CommCoreModuleSchemaCxxSpecJSI_updateDraft(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<CommCoreModuleSchemaCxxSpecJSI *>(&turboModule)->updateDraft(rt, args[0].getString(rt), args[1].getString(rt));
+  return static_cast<CommCoreModuleSchemaCxxSpecJSI *>(&turboModule)->updateDraft(rt, args[0].asString(rt), args[1].asString(rt));
 }
 static jsi::Value __hostFunction_CommCoreModuleSchemaCxxSpecJSI_moveDraft(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<CommCoreModuleSchemaCxxSpecJSI *>(&turboModule)->moveDraft(rt, args[0].getString(rt), args[1].getString(rt));
+  return static_cast<CommCoreModuleSchemaCxxSpecJSI *>(&turboModule)->moveDraft(rt, args[0].asString(rt), args[1].asString(rt));
 }
 static jsi::Value __hostFunction_CommCoreModuleSchemaCxxSpecJSI_getClientDBStore(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
   return static_cast<CommCoreModuleSchemaCxxSpecJSI *>(&turboModule)->getClientDBStore(rt);
@@ -31,27 +31,27 @@
   return static_cast<CommCoreModuleSchemaCxxSpecJSI *>(&turboModule)->getAllMessagesSync(rt);
 }
 static jsi::Value __hostFunction_CommCoreModuleSchemaCxxSpecJSI_processDraftStoreOperations(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<CommCoreModuleSchemaCxxSpecJSI *>(&turboModule)->processDraftStoreOperations(rt, args[0].getObject(rt).getArray(rt));
+  return static_cast<CommCoreModuleSchemaCxxSpecJSI *>(&turboModule)->processDraftStoreOperations(rt, args[0].asObject(rt).asArray(rt));
 }
 static jsi::Value __hostFunction_CommCoreModuleSchemaCxxSpecJSI_processMessageStoreOperations(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<CommCoreModuleSchemaCxxSpecJSI *>(&turboModule)->processMessageStoreOperations(rt, args[0].getObject(rt).getArray(rt));
+  return static_cast<CommCoreModuleSchemaCxxSpecJSI *>(&turboModule)->processMessageStoreOperations(rt, args[0].asObject(rt).asArray(rt));
 }
 static jsi::Value __hostFunction_CommCoreModuleSchemaCxxSpecJSI_processMessageStoreOperationsSync(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  static_cast<CommCoreModuleSchemaCxxSpecJSI *>(&turboModule)->processMessageStoreOperationsSync(rt, args[0].getObject(rt).getArray(rt));
+  static_cast<CommCoreModuleSchemaCxxSpecJSI *>(&turboModule)->processMessageStoreOperationsSync(rt, args[0].asObject(rt).asArray(rt));
   return jsi::Value::undefined();
 }
 static jsi::Value __hostFunction_CommCoreModuleSchemaCxxSpecJSI_getAllThreadsSync(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
   return static_cast<CommCoreModuleSchemaCxxSpecJSI *>(&turboModule)->getAllThreadsSync(rt);
 }
 static jsi::Value __hostFunction_CommCoreModuleSchemaCxxSpecJSI_processThreadStoreOperations(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<CommCoreModuleSchemaCxxSpecJSI *>(&turboModule)->processThreadStoreOperations(rt, args[0].getObject(rt).getArray(rt));
+  return static_cast<CommCoreModuleSchemaCxxSpecJSI *>(&turboModule)->processThreadStoreOperations(rt, args[0].asObject(rt).asArray(rt));
 }
 static jsi::Value __hostFunction_CommCoreModuleSchemaCxxSpecJSI_processThreadStoreOperationsSync(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  static_cast<CommCoreModuleSchemaCxxSpecJSI *>(&turboModule)->processThreadStoreOperationsSync(rt, args[0].getObject(rt).getArray(rt));
+  static_cast<CommCoreModuleSchemaCxxSpecJSI *>(&turboModule)->processThreadStoreOperationsSync(rt, args[0].asObject(rt).asArray(rt));
   return jsi::Value::undefined();
 }
 static jsi::Value __hostFunction_CommCoreModuleSchemaCxxSpecJSI_initializeCryptoAccount(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<CommCoreModuleSchemaCxxSpecJSI *>(&turboModule)->initializeCryptoAccount(rt, args[0].getString(rt));
+  return static_cast<CommCoreModuleSchemaCxxSpecJSI *>(&turboModule)->initializeCryptoAccount(rt, args[0].asString(rt));
 }
 static jsi::Value __hostFunction_CommCoreModuleSchemaCxxSpecJSI_getUserPublicKey(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
   return static_cast<CommCoreModuleSchemaCxxSpecJSI *>(&turboModule)->getUserPublicKey(rt);
@@ -63,19 +63,19 @@
   return static_cast<CommCoreModuleSchemaCxxSpecJSI *>(&turboModule)->getCodeVersion(rt);
 }
 static jsi::Value __hostFunction_CommCoreModuleSchemaCxxSpecJSI_setNotifyToken(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<CommCoreModuleSchemaCxxSpecJSI *>(&turboModule)->setNotifyToken(rt, args[0].getString(rt));
+  return static_cast<CommCoreModuleSchemaCxxSpecJSI *>(&turboModule)->setNotifyToken(rt, args[0].asString(rt));
 }
 static jsi::Value __hostFunction_CommCoreModuleSchemaCxxSpecJSI_clearNotifyToken(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
   return static_cast<CommCoreModuleSchemaCxxSpecJSI *>(&turboModule)->clearNotifyToken(rt);
 }
 static jsi::Value __hostFunction_CommCoreModuleSchemaCxxSpecJSI_setCurrentUserID(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<CommCoreModuleSchemaCxxSpecJSI *>(&turboModule)->setCurrentUserID(rt, args[0].getString(rt));
+  return static_cast<CommCoreModuleSchemaCxxSpecJSI *>(&turboModule)->setCurrentUserID(rt, args[0].asString(rt));
 }
 static jsi::Value __hostFunction_CommCoreModuleSchemaCxxSpecJSI_getCurrentUserID(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
   return static_cast<CommCoreModuleSchemaCxxSpecJSI *>(&turboModule)->getCurrentUserID(rt);
 }
 static jsi::Value __hostFunction_CommCoreModuleSchemaCxxSpecJSI_setDeviceID(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<CommCoreModuleSchemaCxxSpecJSI *>(&turboModule)->setDeviceID(rt, args[0].getString(rt));
+  return static_cast<CommCoreModuleSchemaCxxSpecJSI *>(&turboModule)->setDeviceID(rt, args[0].asString(rt));
 }
 static jsi::Value __hostFunction_CommCoreModuleSchemaCxxSpecJSI_getDeviceID(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
   return static_cast<CommCoreModuleSchemaCxxSpecJSI *>(&turboModule)->getDeviceID(rt);
diff --git a/native/cpp/CommonCpp/_generated/commJSI.h b/native/cpp/CommonCpp/_generated/commJSI.h
new file mode 100644
--- /dev/null
+++ b/native/cpp/CommonCpp/_generated/commJSI.h
@@ -0,0 +1,260 @@
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateModuleH.js
+ */
+
+#pragma once
+
+#include <ReactCommon/TurboModule.h>
+#include <react/bridging/Bridging.h>
+
+namespace facebook {
+namespace react {
+
+class JSI_EXPORT CommCoreModuleSchemaCxxSpecJSI : public TurboModule {
+protected:
+  CommCoreModuleSchemaCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker);
+
+public:
+  virtual jsi::Value getDraft(jsi::Runtime &rt, jsi::String key) = 0;
+  virtual jsi::Value updateDraft(jsi::Runtime &rt, jsi::String key, jsi::String text) = 0;
+  virtual jsi::Value moveDraft(jsi::Runtime &rt, jsi::String oldKey, jsi::String newKey) = 0;
+  virtual jsi::Value getClientDBStore(jsi::Runtime &rt) = 0;
+  virtual jsi::Value removeAllDrafts(jsi::Runtime &rt) = 0;
+  virtual jsi::Array getAllMessagesSync(jsi::Runtime &rt) = 0;
+  virtual jsi::Value processDraftStoreOperations(jsi::Runtime &rt, jsi::Array operations) = 0;
+  virtual jsi::Value processMessageStoreOperations(jsi::Runtime &rt, jsi::Array operations) = 0;
+  virtual void processMessageStoreOperationsSync(jsi::Runtime &rt, jsi::Array operations) = 0;
+  virtual jsi::Array getAllThreadsSync(jsi::Runtime &rt) = 0;
+  virtual jsi::Value processThreadStoreOperations(jsi::Runtime &rt, jsi::Array operations) = 0;
+  virtual void processThreadStoreOperationsSync(jsi::Runtime &rt, jsi::Array operations) = 0;
+  virtual jsi::Value initializeCryptoAccount(jsi::Runtime &rt, jsi::String userId) = 0;
+  virtual jsi::Value getUserPublicKey(jsi::Runtime &rt) = 0;
+  virtual jsi::Value getUserOneTimeKeys(jsi::Runtime &rt) = 0;
+  virtual double getCodeVersion(jsi::Runtime &rt) = 0;
+  virtual jsi::Value setNotifyToken(jsi::Runtime &rt, jsi::String token) = 0;
+  virtual jsi::Value clearNotifyToken(jsi::Runtime &rt) = 0;
+  virtual jsi::Value setCurrentUserID(jsi::Runtime &rt, jsi::String userID) = 0;
+  virtual jsi::Value getCurrentUserID(jsi::Runtime &rt) = 0;
+  virtual jsi::Value setDeviceID(jsi::Runtime &rt, jsi::String deviceType) = 0;
+  virtual jsi::Value getDeviceID(jsi::Runtime &rt) = 0;
+  virtual jsi::Value clearSensitiveData(jsi::Runtime &rt) = 0;
+
+};
+
+template <typename T>
+class JSI_EXPORT CommCoreModuleSchemaCxxSpec : public TurboModule {
+public:
+  jsi::Value get(jsi::Runtime &rt, const jsi::PropNameID &propName) override {
+    return delegate_.get(rt, propName);
+  }
+
+protected:
+  CommCoreModuleSchemaCxxSpec(std::shared_ptr<CallInvoker> jsInvoker)
+    : TurboModule("CommTurboModule", jsInvoker),
+      delegate_(static_cast<T*>(this), jsInvoker) {}
+
+private:
+  class Delegate : public CommCoreModuleSchemaCxxSpecJSI {
+  public:
+    Delegate(T *instance, std::shared_ptr<CallInvoker> jsInvoker) :
+      CommCoreModuleSchemaCxxSpecJSI(std::move(jsInvoker)), instance_(instance) {}
+
+    jsi::Value getDraft(jsi::Runtime &rt, jsi::String key) override {
+      static_assert(
+          bridging::getParameterCount(&T::getDraft) == 2,
+          "Expected getDraft(...) to have 2 parameters");
+
+      return bridging::callFromJs<jsi::Value>(
+          rt, &T::getDraft, jsInvoker_, instance_, std::move(key));
+    }
+    jsi::Value updateDraft(jsi::Runtime &rt, jsi::String key, jsi::String text) override {
+      static_assert(
+          bridging::getParameterCount(&T::updateDraft) == 3,
+          "Expected updateDraft(...) to have 3 parameters");
+
+      return bridging::callFromJs<jsi::Value>(
+          rt, &T::updateDraft, jsInvoker_, instance_, std::move(key), std::move(text));
+    }
+    jsi::Value moveDraft(jsi::Runtime &rt, jsi::String oldKey, jsi::String newKey) override {
+      static_assert(
+          bridging::getParameterCount(&T::moveDraft) == 3,
+          "Expected moveDraft(...) to have 3 parameters");
+
+      return bridging::callFromJs<jsi::Value>(
+          rt, &T::moveDraft, jsInvoker_, instance_, std::move(oldKey), std::move(newKey));
+    }
+    jsi::Value getClientDBStore(jsi::Runtime &rt) override {
+      static_assert(
+          bridging::getParameterCount(&T::getClientDBStore) == 1,
+          "Expected getClientDBStore(...) to have 1 parameters");
+
+      return bridging::callFromJs<jsi::Value>(
+          rt, &T::getClientDBStore, jsInvoker_, instance_);
+    }
+    jsi::Value removeAllDrafts(jsi::Runtime &rt) override {
+      static_assert(
+          bridging::getParameterCount(&T::removeAllDrafts) == 1,
+          "Expected removeAllDrafts(...) to have 1 parameters");
+
+      return bridging::callFromJs<jsi::Value>(
+          rt, &T::removeAllDrafts, jsInvoker_, instance_);
+    }
+    jsi::Array getAllMessagesSync(jsi::Runtime &rt) override {
+      static_assert(
+          bridging::getParameterCount(&T::getAllMessagesSync) == 1,
+          "Expected getAllMessagesSync(...) to have 1 parameters");
+
+      return bridging::callFromJs<jsi::Array>(
+          rt, &T::getAllMessagesSync, jsInvoker_, instance_);
+    }
+    jsi::Value processDraftStoreOperations(jsi::Runtime &rt, jsi::Array operations) override {
+      static_assert(
+          bridging::getParameterCount(&T::processDraftStoreOperations) == 2,
+          "Expected processDraftStoreOperations(...) to have 2 parameters");
+
+      return bridging::callFromJs<jsi::Value>(
+          rt, &T::processDraftStoreOperations, jsInvoker_, instance_, std::move(operations));
+    }
+    jsi::Value processMessageStoreOperations(jsi::Runtime &rt, jsi::Array operations) override {
+      static_assert(
+          bridging::getParameterCount(&T::processMessageStoreOperations) == 2,
+          "Expected processMessageStoreOperations(...) to have 2 parameters");
+
+      return bridging::callFromJs<jsi::Value>(
+          rt, &T::processMessageStoreOperations, jsInvoker_, instance_, std::move(operations));
+    }
+    void processMessageStoreOperationsSync(jsi::Runtime &rt, jsi::Array operations) override {
+      static_assert(
+          bridging::getParameterCount(&T::processMessageStoreOperationsSync) == 2,
+          "Expected processMessageStoreOperationsSync(...) to have 2 parameters");
+
+      return bridging::callFromJs<void>(
+          rt, &T::processMessageStoreOperationsSync, jsInvoker_, instance_, std::move(operations));
+    }
+    jsi::Array getAllThreadsSync(jsi::Runtime &rt) override {
+      static_assert(
+          bridging::getParameterCount(&T::getAllThreadsSync) == 1,
+          "Expected getAllThreadsSync(...) to have 1 parameters");
+
+      return bridging::callFromJs<jsi::Array>(
+          rt, &T::getAllThreadsSync, jsInvoker_, instance_);
+    }
+    jsi::Value processThreadStoreOperations(jsi::Runtime &rt, jsi::Array operations) override {
+      static_assert(
+          bridging::getParameterCount(&T::processThreadStoreOperations) == 2,
+          "Expected processThreadStoreOperations(...) to have 2 parameters");
+
+      return bridging::callFromJs<jsi::Value>(
+          rt, &T::processThreadStoreOperations, jsInvoker_, instance_, std::move(operations));
+    }
+    void processThreadStoreOperationsSync(jsi::Runtime &rt, jsi::Array operations) override {
+      static_assert(
+          bridging::getParameterCount(&T::processThreadStoreOperationsSync) == 2,
+          "Expected processThreadStoreOperationsSync(...) to have 2 parameters");
+
+      return bridging::callFromJs<void>(
+          rt, &T::processThreadStoreOperationsSync, jsInvoker_, instance_, std::move(operations));
+    }
+    jsi::Value initializeCryptoAccount(jsi::Runtime &rt, jsi::String userId) override {
+      static_assert(
+          bridging::getParameterCount(&T::initializeCryptoAccount) == 2,
+          "Expected initializeCryptoAccount(...) to have 2 parameters");
+
+      return bridging::callFromJs<jsi::Value>(
+          rt, &T::initializeCryptoAccount, jsInvoker_, instance_, std::move(userId));
+    }
+    jsi::Value getUserPublicKey(jsi::Runtime &rt) override {
+      static_assert(
+          bridging::getParameterCount(&T::getUserPublicKey) == 1,
+          "Expected getUserPublicKey(...) to have 1 parameters");
+
+      return bridging::callFromJs<jsi::Value>(
+          rt, &T::getUserPublicKey, jsInvoker_, instance_);
+    }
+    jsi::Value getUserOneTimeKeys(jsi::Runtime &rt) override {
+      static_assert(
+          bridging::getParameterCount(&T::getUserOneTimeKeys) == 1,
+          "Expected getUserOneTimeKeys(...) to have 1 parameters");
+
+      return bridging::callFromJs<jsi::Value>(
+          rt, &T::getUserOneTimeKeys, jsInvoker_, instance_);
+    }
+    double getCodeVersion(jsi::Runtime &rt) override {
+      static_assert(
+          bridging::getParameterCount(&T::getCodeVersion) == 1,
+          "Expected getCodeVersion(...) to have 1 parameters");
+
+      return bridging::callFromJs<double>(
+          rt, &T::getCodeVersion, jsInvoker_, instance_);
+    }
+    jsi::Value setNotifyToken(jsi::Runtime &rt, jsi::String token) override {
+      static_assert(
+          bridging::getParameterCount(&T::setNotifyToken) == 2,
+          "Expected setNotifyToken(...) to have 2 parameters");
+
+      return bridging::callFromJs<jsi::Value>(
+          rt, &T::setNotifyToken, jsInvoker_, instance_, std::move(token));
+    }
+    jsi::Value clearNotifyToken(jsi::Runtime &rt) override {
+      static_assert(
+          bridging::getParameterCount(&T::clearNotifyToken) == 1,
+          "Expected clearNotifyToken(...) to have 1 parameters");
+
+      return bridging::callFromJs<jsi::Value>(
+          rt, &T::clearNotifyToken, jsInvoker_, instance_);
+    }
+    jsi::Value setCurrentUserID(jsi::Runtime &rt, jsi::String userID) override {
+      static_assert(
+          bridging::getParameterCount(&T::setCurrentUserID) == 2,
+          "Expected setCurrentUserID(...) to have 2 parameters");
+
+      return bridging::callFromJs<jsi::Value>(
+          rt, &T::setCurrentUserID, jsInvoker_, instance_, std::move(userID));
+    }
+    jsi::Value getCurrentUserID(jsi::Runtime &rt) override {
+      static_assert(
+          bridging::getParameterCount(&T::getCurrentUserID) == 1,
+          "Expected getCurrentUserID(...) to have 1 parameters");
+
+      return bridging::callFromJs<jsi::Value>(
+          rt, &T::getCurrentUserID, jsInvoker_, instance_);
+    }
+    jsi::Value setDeviceID(jsi::Runtime &rt, jsi::String deviceType) override {
+      static_assert(
+          bridging::getParameterCount(&T::setDeviceID) == 2,
+          "Expected setDeviceID(...) to have 2 parameters");
+
+      return bridging::callFromJs<jsi::Value>(
+          rt, &T::setDeviceID, jsInvoker_, instance_, std::move(deviceType));
+    }
+    jsi::Value getDeviceID(jsi::Runtime &rt) override {
+      static_assert(
+          bridging::getParameterCount(&T::getDeviceID) == 1,
+          "Expected getDeviceID(...) to have 1 parameters");
+
+      return bridging::callFromJs<jsi::Value>(
+          rt, &T::getDeviceID, jsInvoker_, instance_);
+    }
+    jsi::Value clearSensitiveData(jsi::Runtime &rt) override {
+      static_assert(
+          bridging::getParameterCount(&T::clearSensitiveData) == 1,
+          "Expected clearSensitiveData(...) to have 1 parameters");
+
+      return bridging::callFromJs<jsi::Value>(
+          rt, &T::clearSensitiveData, jsInvoker_, instance_);
+    }
+
+  private:
+    T *instance_;
+  };
+
+  Delegate delegate_;
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/native/ios/Comm.xcodeproj/project.pbxproj b/native/ios/Comm.xcodeproj/project.pbxproj
--- a/native/ios/Comm.xcodeproj/project.pbxproj
+++ b/native/ios/Comm.xcodeproj/project.pbxproj
@@ -16,7 +16,6 @@
 		713EE41126C66B80003D7C48 /* CryptoTest.mm in Sources */ = {isa = PBXBuildFile; fileRef = 713EE41026C66B80003D7C48 /* CryptoTest.mm */; };
 		71762A75270D8AAE00F565ED /* PlatformSpecificTools.mm in Sources */ = {isa = PBXBuildFile; fileRef = 71762A74270D8AAE00F565ED /* PlatformSpecificTools.mm */; };
 		718DE99E2653D41C00365824 /* WorkerThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 718DE99C2653D41C00365824 /* WorkerThread.cpp */; };
-		71BE84492636A944002849D2 /* NativeModules.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 71BE843B2636A944002849D2 /* NativeModules.cpp */; };
 		71BE844A2636A944002849D2 /* CommCoreModule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 71BE843C2636A944002849D2 /* CommCoreModule.cpp */; };
 		71BE844B2636A944002849D2 /* SQLiteQueryExecutor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 71BE84412636A944002849D2 /* SQLiteQueryExecutor.cpp */; };
 		71BF5B7126B3FF0900EDE27D /* Session.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 71BF5B6F26B3FF0900EDE27D /* Session.cpp */; };
@@ -39,6 +38,7 @@
 		7F8D602926535F2A0053CB29 /* IBMPlexSans-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7F8D602626535EEE0053CB29 /* IBMPlexSans-Regular.ttf */; };
 		7FA2DCDE293E62F500991BA4 /* CommIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7FA2DCDC293E62F500991BA4 /* CommIcons.ttf */; };
 		7FA2DCDF293E62F500991BA4 /* SWMansionIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7FA2DCDD293E62F500991BA4 /* SWMansionIcons.ttf */; };
+		7FE4D9F5291DFE9300667BF6 /* commJSI-generated.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7FE4D9F4291DFE9300667BF6 /* commJSI-generated.cpp */; };
 		8B99BAAC28D50F3000EB5ADB /* libnative_rust_library.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B99BAAB28D50F3000EB5ADB /* libnative_rust_library.a */; };
 		8B99BAAE28D511FF00EB5ADB /* lib.rs.cc in Sources */ = {isa = PBXBuildFile; fileRef = 8B99BAAD28D511FF00EB5ADB /* lib.rs.cc */; };
 		8E43C32C291E5B4A009378F5 /* TerminateApp.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8E43C32B291E5B4A009378F5 /* TerminateApp.mm */; };
@@ -119,9 +119,7 @@
 		718DE99D2653D41C00365824 /* WorkerThread.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WorkerThread.h; sourceTree = "<group>"; };
 		71B8CCBD26BD4DEB0040C0A2 /* CommSecureStore.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CommSecureStore.h; sourceTree = "<group>"; };
 		71BE84392636A944002849D2 /* Logger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Logger.h; sourceTree = "<group>"; };
-		71BE843B2636A944002849D2 /* NativeModules.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NativeModules.cpp; sourceTree = "<group>"; };
 		71BE843C2636A944002849D2 /* CommCoreModule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CommCoreModule.cpp; sourceTree = "<group>"; };
-		71BE843D2636A944002849D2 /* NativeModules.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NativeModules.h; sourceTree = "<group>"; };
 		71BE843E2636A944002849D2 /* CommCoreModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommCoreModule.h; sourceTree = "<group>"; };
 		71BE84402636A944002849D2 /* DatabaseQueryExecutor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseQueryExecutor.h; sourceTree = "<group>"; };
 		71BE84412636A944002849D2 /* SQLiteQueryExecutor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SQLiteQueryExecutor.cpp; sourceTree = "<group>"; };
@@ -162,6 +160,8 @@
 		7FA2DCDD293E62F500991BA4 /* SWMansionIcons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = SWMansionIcons.ttf; path = ../fonts/SWMansionIcons.ttf; sourceTree = "<group>"; };
 		7FCEA2DC2444010B004017B1 /* Comm-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Comm-Bridging-Header.h"; sourceTree = "<group>"; };
 		7FCFD8BD1E81B8DF00629B0E /* Comm.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = Comm.entitlements; path = Comm/Comm.entitlements; sourceTree = "<group>"; };
+		7FE4D9F3291DFE9300667BF6 /* commJSI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = commJSI.h; sourceTree = "<group>"; };
+		7FE4D9F4291DFE9300667BF6 /* commJSI-generated.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "commJSI-generated.cpp"; sourceTree = "<group>"; };
 		891D1495EE1F375F3AF6C7ED /* Pods-NotificationService.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NotificationService.debug.xcconfig"; path = "Target Support Files/Pods-NotificationService/Pods-NotificationService.debug.xcconfig"; sourceTree = "<group>"; };
 		8B99AF6D28D50D4800EB5ADB /* lib.rs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lib.rs.h; sourceTree = "<group>"; };
 		8B99B59928D50D4900EB5ADB /* cxx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cxx.h; sourceTree = "<group>"; };
@@ -420,8 +420,8 @@
 		71F971B4270726C000DDC5BF /* _generated */ = {
 			isa = PBXGroup;
 			children = (
-				71BE843D2636A944002849D2 /* NativeModules.h */,
-				71BE843B2636A944002849D2 /* NativeModules.cpp */,
+				7FE4D9F4291DFE9300667BF6 /* commJSI-generated.cpp */,
+				7FE4D9F3291DFE9300667BF6 /* commJSI.h */,
 			);
 			path = _generated;
 			sourceTree = "<group>";
@@ -924,9 +924,9 @@
 				71BF5B7126B3FF0900EDE27D /* Session.cpp in Sources */,
 				71BF5B7526B401D300EDE27D /* Tools.cpp in Sources */,
 				13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */,
+				7FE4D9F5291DFE9300667BF6 /* commJSI-generated.cpp in Sources */,
 				71142A7726C2650B0039DCBD /* CommSecureStoreIOSWrapper.mm in Sources */,
 				CB38F2B1286C6C870010535C /* MessageOperationsUtilities.cpp in Sources */,
-				71BE84492636A944002849D2 /* NativeModules.cpp in Sources */,
 				71CA4A64262DA8E500835C89 /* Logger.mm in Sources */,
 				71BF5B7F26BBDD7400EDE27D /* CryptoModule.cpp in Sources */,
 				71BE844A2636A944002849D2 /* CommCoreModule.cpp in Sources */,
diff --git a/native/package.json b/native/package.json
--- a/native/package.json
+++ b/native/package.json
@@ -30,7 +30,7 @@
     "babel-jest": "^26.6.3",
     "babel-plugin-transform-remove-console": "^6.9.4",
     "babel-plugin-transform-remove-strict-mode": "0.0.2",
-    "comm-react-native-codegen": "npm:react-native-codegen@0.0.7",
+    "comm-react-native-codegen": "npm:react-native-codegen@^0.70.6",
     "flow-bin": "^0.182.0",
     "flow-mono-cli": "^1.5.0",
     "flow-typed": "^3.2.1",
diff --git a/patches/comm-react-native-codegen+0.0.7.patch b/patches/comm-react-native-codegen+0.0.7.patch
deleted file mode 100644
--- a/patches/comm-react-native-codegen+0.0.7.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/node_modules/comm-react-native-codegen/lib/generators/modules/GenerateModuleCpp.js b/node_modules/comm-react-native-codegen/lib/generators/modules/GenerateModuleCpp.js
-index e5fbfc4..21c8e0b 100644
---- a/node_modules/comm-react-native-codegen/lib/generators/modules/GenerateModuleCpp.js
-+++ b/node_modules/comm-react-native-codegen/lib/generators/modules/GenerateModuleCpp.js
-@@ -118,7 +118,7 @@ const FileTemplate = ({libraryName, modules}) => {
-  * ${'@'}generated by codegen project: GenerateModuleH.js
-  */
- 
--#include <react/modules/${libraryName}/NativeModules.h>
-+#include "NativeModules.h"
- 
- namespace facebook {
- namespace react {
diff --git a/yarn.lock b/yarn.lock
--- a/yarn.lock
+++ b/yarn.lock
@@ -148,7 +148,7 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.5.tgz#86f172690b093373a933223b4745deeb6049e733"
   integrity sha512-KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g==
 
-"@babel/core@^7.1.0", "@babel/core@^7.1.6", "@babel/core@^7.13.14", "@babel/core@^7.13.16", "@babel/core@^7.14.0", "@babel/core@^7.7.5":
+"@babel/core@^7.1.0", "@babel/core@^7.13.14", "@babel/core@^7.13.16", "@babel/core@^7.14.0", "@babel/core@^7.7.5":
   version "7.17.9"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.9.tgz#6bae81a06d95f4d0dec5bb9d74bbc1f58babdcfe"
   integrity sha512-5ug+SfZCpDAkVp9SFIZAzlW18rlzsOcJGaetCjkySnrXXDUw9AR8cDUm1iByTmdWM6yxX6/zycaV76w3YTF2gw==
@@ -608,7 +608,7 @@
     regenerator-runtime "^0.13.4"
     v8flags "^3.1.1"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.1.6", "@babel/parser@^7.13.16", "@babel/parser@^7.14.0", "@babel/parser@^7.16.7", "@babel/parser@^7.17.9", "@babel/parser@^7.7.0":
+"@babel/parser@^7.1.0", "@babel/parser@^7.13.16", "@babel/parser@^7.14.0", "@babel/parser@^7.16.7", "@babel/parser@^7.17.9", "@babel/parser@^7.7.0":
   version "7.17.9"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.9.tgz#9c94189a6062f0291418ca021077983058e171ef"
   integrity sha512-vqUSBLP8dQHFPdPi9bc5GK9vRkYHJ49fsZdtoJ8EQ8ibpwk5rPKfvNIwChB0KVXcIjcepEBBd2VHC5r9Gy8ueg==
@@ -658,7 +658,7 @@
     "@babel/helper-remap-async-to-generator" "^7.16.8"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
-"@babel/plugin-proposal-class-properties@^7.0.0", "@babel/plugin-proposal-class-properties@^7.1.0", "@babel/plugin-proposal-class-properties@^7.13.0", "@babel/plugin-proposal-class-properties@^7.16.7":
+"@babel/plugin-proposal-class-properties@^7.0.0", "@babel/plugin-proposal-class-properties@^7.13.0", "@babel/plugin-proposal-class-properties@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz#925cad7b3b1a2fcea7e59ecc8eb5954f961f91b0"
   integrity sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==
@@ -727,7 +727,7 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.0.0", "@babel/plugin-proposal-nullish-coalescing-operator@^7.1.0", "@babel/plugin-proposal-nullish-coalescing-operator@^7.13.8", "@babel/plugin-proposal-nullish-coalescing-operator@^7.16.7":
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.0.0", "@babel/plugin-proposal-nullish-coalescing-operator@^7.13.8", "@babel/plugin-proposal-nullish-coalescing-operator@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz#141fc20b6857e59459d430c850a0011e36561d99"
   integrity sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ==
@@ -773,7 +773,7 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
-"@babel/plugin-proposal-optional-chaining@^7.0.0", "@babel/plugin-proposal-optional-chaining@^7.1.0", "@babel/plugin-proposal-optional-chaining@^7.13.12", "@babel/plugin-proposal-optional-chaining@^7.16.7":
+"@babel/plugin-proposal-optional-chaining@^7.0.0", "@babel/plugin-proposal-optional-chaining@^7.13.12", "@babel/plugin-proposal-optional-chaining@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz#7cd629564724816c0e8a969535551f943c64c39a"
   integrity sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA==
@@ -1090,7 +1090,7 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-commonjs@^7.0.0", "@babel/plugin-transform-modules-commonjs@^7.1.0", "@babel/plugin-transform-modules-commonjs@^7.13.8", "@babel/plugin-transform-modules-commonjs@^7.16.8":
+"@babel/plugin-transform-modules-commonjs@^7.0.0", "@babel/plugin-transform-modules-commonjs@^7.13.8", "@babel/plugin-transform-modules-commonjs@^7.16.8":
   version "7.17.9"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.9.tgz#274be1a2087beec0254d4abd4d86e52442e1e5b6"
   integrity sha512-2TBFd/r2I6VlYn0YRTz2JdazS+FoUuQ2rIFHoAxtyP/0G3D82SBLaRq9rnUkpqlLg03Byfl/+M32mpxjO6KaPw==
@@ -1419,7 +1419,7 @@
     core-js-compat "^3.20.2"
     semver "^6.3.0"
 
-"@babel/preset-flow@^7.0.0", "@babel/preset-flow@^7.13.13", "@babel/preset-flow@^7.9.0":
+"@babel/preset-flow@^7.13.13", "@babel/preset-flow@^7.9.0":
   version "7.13.13"
   resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.13.13.tgz#a61a1c149b3f77589d795287744393444d5cdd9e"
   integrity sha512-MDtwtamMifqq3R2mC7l3A3uFalUb3NH5TIBQWjN/epEPlZktcLq4se3J+ivckKrLMGsR7H9LW8+pYuIUN9tsKg==
@@ -1451,7 +1451,7 @@
     "@babel/plugin-transform-react-jsx-development" "^7.12.17"
     "@babel/plugin-transform-react-pure-annotations" "^7.12.1"
 
-"@babel/preset-typescript@^7.1.0", "@babel/preset-typescript@^7.13.0", "@babel/preset-typescript@^7.16.7":
+"@babel/preset-typescript@^7.13.0", "@babel/preset-typescript@^7.16.7":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.18.6.tgz#ce64be3e63eddc44240c6358daefac17b3186399"
   integrity sha512-s9ik86kXBAnD760aybBucdpnLsAt0jK1xqJn2juOn9lkOvSHV60os5hxoVJsPzMQxvnUJFAlkont2DvvaYEBtQ==
@@ -1460,7 +1460,7 @@
     "@babel/helper-validator-option" "^7.18.6"
     "@babel/plugin-transform-typescript" "^7.18.6"
 
-"@babel/register@^7.0.0", "@babel/register@^7.13.16", "@babel/register@^7.13.8":
+"@babel/register@^7.13.16", "@babel/register@^7.13.8":
   version "7.16.9"
   resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.16.9.tgz#fcfb23cfdd9ad95c9771e58183de83b513857806"
   integrity sha512-jJ72wcghdRIlENfvALcyODhNoGE5j75cYHdC+aQMh6cU/P86tiiXTp9XYZct1UxUMo/4+BgQRyNZEGx0KWGS+g==
@@ -7646,7 +7646,7 @@
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
   integrity sha512-pFGrxThWcWQ2MsAz6RtgeWe4NK2kUE1WfsrvvlctdII745EW9I0yflqhe7++M5LEc7bV2c/9/5zc8sFcpL0Drw==
 
-colors@^1.1.2, colors@^1.4.0:
+colors@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
   integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
@@ -7658,13 +7658,14 @@
   dependencies:
     delayed-stream "~1.0.0"
 
-"comm-react-native-codegen@npm:react-native-codegen@0.0.7":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/react-native-codegen/-/react-native-codegen-0.0.7.tgz#86651c5c5fec67a8077ef7f4e36f7ed459043e14"
-  integrity sha512-dwNgR8zJ3ALr480QnAmpTiqvFo+rDtq6V5oCggKhYFlRjzOmVSFn3YD41u8ltvKS5G2nQ8gCs2vReFFnRGLYng==
+"comm-react-native-codegen@npm:react-native-codegen@^0.70.6", react-native-codegen@^0.70.6:
+  version "0.70.6"
+  resolved "https://registry.yarnpkg.com/react-native-codegen/-/react-native-codegen-0.70.6.tgz#2ce17d1faad02ad4562345f8ee7cbe6397eda5cb"
+  integrity sha512-kdwIhH2hi+cFnG5Nb8Ji2JwmcCxnaOOo9440ov7XDzSvGfmUStnCzl+MCW8jLjqHcE4icT7N9y+xx4f50vfBTw==
   dependencies:
+    "@babel/parser" "^7.14.0"
     flow-parser "^0.121.0"
-    jscodeshift "^0.11.0"
+    jscodeshift "^0.13.1"
     nullthrows "^1.1.1"
 
 command-exists@^1.2.4:
@@ -13508,31 +13509,6 @@
   resolved "https://registry.yarnpkg.com/jsc-android/-/jsc-android-250230.2.1.tgz#3790313a970586a03ab0ad47defbc84df54f1b83"
   integrity sha512-KmxeBlRjwoqCnBBKGsihFtvsBHyUFlBxJPK4FzeYcIuBfdjv6jFys44JITAgSTbQD+vIdwMEfyZklsuQX0yI1Q==
 
-jscodeshift@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/jscodeshift/-/jscodeshift-0.11.0.tgz#4f95039408f3f06b0e39bb4d53bc3139f5330e2f"
-  integrity sha512-SdRK2C7jjs4k/kT2mwtO07KJN9RnjxtKn03d9JVj6c3j9WwaLcFYsICYDnLAzY0hp+wG2nxl+Cm2jWLiNVYb8g==
-  dependencies:
-    "@babel/core" "^7.1.6"
-    "@babel/parser" "^7.1.6"
-    "@babel/plugin-proposal-class-properties" "^7.1.0"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.1.0"
-    "@babel/plugin-proposal-optional-chaining" "^7.1.0"
-    "@babel/plugin-transform-modules-commonjs" "^7.1.0"
-    "@babel/preset-flow" "^7.0.0"
-    "@babel/preset-typescript" "^7.1.0"
-    "@babel/register" "^7.0.0"
-    babel-core "^7.0.0-bridge.0"
-    colors "^1.1.2"
-    flow-parser "0.*"
-    graceful-fs "^4.2.4"
-    micromatch "^3.1.10"
-    neo-async "^2.5.0"
-    node-dir "^0.1.17"
-    recast "^0.20.3"
-    temp "^0.8.1"
-    write-file-atomic "^2.3.0"
-
 jscodeshift@^0.13.1:
   version "0.13.1"
   resolved "https://registry.yarnpkg.com/jscodeshift/-/jscodeshift-0.13.1.tgz#69bfe51e54c831296380585c6d9e733512aecdef"
@@ -17944,16 +17920,6 @@
   dependencies:
     prop-types "^15.6.2"
 
-react-native-codegen@^0.70.6:
-  version "0.70.6"
-  resolved "https://registry.yarnpkg.com/react-native-codegen/-/react-native-codegen-0.70.6.tgz#2ce17d1faad02ad4562345f8ee7cbe6397eda5cb"
-  integrity sha512-kdwIhH2hi+cFnG5Nb8Ji2JwmcCxnaOOo9440ov7XDzSvGfmUStnCzl+MCW8jLjqHcE4icT7N9y+xx4f50vfBTw==
-  dependencies:
-    "@babel/parser" "^7.14.0"
-    flow-parser "^0.121.0"
-    jscodeshift "^0.13.1"
-    nullthrows "^1.1.1"
-
 react-native-device-info@^8.0.7:
   version "8.0.7"
   resolved "https://registry.yarnpkg.com/react-native-device-info/-/react-native-device-info-8.0.7.tgz#c04f5dd50a977da21305b99088c0b42b588d07f9"
@@ -18481,7 +18447,7 @@
   resolved "https://registry.yarnpkg.com/readline/-/readline-1.3.0.tgz#c580d77ef2cfc8752b132498060dc9793a7ac01c"
   integrity sha1-xYDXfvLPyHUrEySYBg3JeTp6wBw=
 
-recast@^0.20.3, recast@^0.20.4:
+recast@^0.20.4:
   version "0.20.5"
   resolved "https://registry.yarnpkg.com/recast/-/recast-0.20.5.tgz#8e2c6c96827a1b339c634dd232957d230553ceae"
   integrity sha512-E5qICoPoNL4yU0H0NoBDntNB0Q5oMSNh9usFctYniLBluTthi3RsQVBXIJNbApOlvSwW/RGxIuokPcAc59J5fQ==
@@ -20690,7 +20656,7 @@
     os-tmpdir "^1.0.0"
     rimraf "~2.2.6"
 
-temp@^0.8.1, temp@^0.8.4:
+temp@^0.8.4:
   version "0.8.4"
   resolved "https://registry.yarnpkg.com/temp/-/temp-0.8.4.tgz#8c97a33a4770072e0a05f919396c7665a7dd59f2"
   integrity sha512-s0ZZzd0BzYv5tLSptZooSjK8oj6C+c19p7Vqta9+6NPOf7r+fxq0cJe6/oN4LTC79sy5NY8ucOJNgwsKCSbfqg==