diff --git a/native/android/app/CMakeLists.txt b/native/android/app/CMakeLists.txt
index 4bbcbf954..470727d34 100644
--- a/native/android/app/CMakeLists.txt
+++ b/native/android/app/CMakeLists.txt
@@ -1,229 +1,230 @@
 # For more information about using CMake with Android Studio, read the
 # documentation: https://d.android.com/studio/projects/add-native-code.html
 project(comm CXX C)
 
 set(CMAKE_CXX_STANDARD 17)
 
 # C0103 is a naming convention, but the variable names which need to be set
 # are determined by the upstream project
 # cmake-lint: disable=C0103
 # Disable line length as some paths are hard to reduce without becoming cryptic
 # cmake-lint: disable=C0301
 
 # Sets the minimum version of CMake required to build the native library.
 cmake_minimum_required(VERSION 3.18)
 
 # Creates and names a library, sets it as either STATIC
 # or SHARED, and provides the relative paths to its source code.
 # You can define multiple libraries, and CMake builds them for you.
 # Gradle automatically packages shared libraries with your APK.
 set(PACKAGE_NAME "comm_jni_module")
 
 find_library(log-lib log)
 find_package(fbjni REQUIRED CONFIG)
 
 set(BUILD_TESTING OFF)
 set(HAVE_SYMBOLIZE OFF)
 set(WITH_GTEST OFF CACHE BOOL "Use googletest" FORCE)
 set(WITH_GFLAGS OFF CACHE BOOL "Use gflags" FORCE)
 
 # General
 set(_third_party_dir ${CMAKE_CURRENT_SOURCE_DIR}/build/third-party-ndk)
 set(_android_build_dir build/${CMAKE_ANDROID_ARCH_ABI})
 
 include(FetchContent)
 
 if(CMAKE_ANDROID_ARCH_ABI STREQUAL arm64-v8a)
   set(Rust_CARGO_TARGET aarch64-linux-android)
 elseif(CMAKE_ANDROID_ARCH_ABI STREQUAL x86)
   set(Rust_CARGO_TARGET i686-linux-android)
 elseif(CMAKE_ANDROID_ARCH_ABI STREQUAL x86_64)
   set(Rust_CARGO_TARGET x86_64-linux-android)
 elseif(CMAKE_ANDROID_ARCH_ABI STREQUAL armeabi-v7a)
   set(Rust_CARGO_TARGET armv7-linux-androideabi)
 endif()
 
 string(TOLOWER ${CMAKE_HOST_SYSTEM_NAME} CMAKE_HOST_SYSTEM_NAME_LOWER)
 set(_toolchain_path
   "$ENV{ANDROID_HOME}/ndk/${NDK_VERSION}/toolchains/llvm/prebuilt/${CMAKE_HOST_SYSTEM_NAME_LOWER}-x86_64/bin"
 )
 if(EXISTS "${_toolchain_path}/${Rust_CARGO_TARGET}-ar")
   set(AR "${_toolchain_path}/${Rust_CARGO_TARGET}-ar")
 else()
   set(AR "${_toolchain_path}/llvm-ar")
 endif()
 
 FetchContent_Declare(
   Corrosion
   GIT_REPOSITORY https://github.com/corrosion-rs/corrosion.git
   GIT_TAG v0.2.1
 )
 
 FetchContent_MakeAvailable(Corrosion)
 
 include(../../../shared/cmake/corrosion-cxx.cmake)
 
 add_library_rust(PATH ../../native_rust_library NAMESPACE comm)
 
 # We're updating parameters below for Cmake's find_OpenSSL() function
 set(OPENSSL_ROOT_DIR
   "${_third_party_dir}/openssl/openssl-${OPENSSL_VERSION}/${_android_build_dir}"
 )
 list(APPEND CMAKE_FIND_ROOT_PATH "${OPENSSL_ROOT_DIR}")
 
 # Override HAVE_EXECINFO_H in glog's CMakeLists.txt
 if(
   CMAKE_ANDROID_ARCH_ABI STREQUAL arm64-v8a OR
   CMAKE_ANDROID_ARCH_ABI STREQUAL armeabi-v7a
 )
   set(HAVE_EXECINFO_H OFF CACHE BOOL "Whether platform has execinfo.h")
 endif()
 
 add_subdirectory(${_third_party_dir}/glog/glog-${GLOG_VERSION}/)
 
 file(GLOB LIBRN_DIR "${REACT_NATIVE_SO_DIR}/${ANDROID_ABI}")
 if (NOT LIBRN_DIR)
   # If /${ANDROID_ABI} dir not found, then ${REACT_NATIVE_SO_DIR} is probably:
   # ReactAndroid/build/react-ndk/exported
   file(GLOB LIBRN_DIR "${REACT_NATIVE_SO_DIR}")
 endif ()
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/folly-target.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/openssl-target.cmake)
 
 add_subdirectory(../../node_modules/olm ./build)
 
 set(_node_modules_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../node_modules)
 set(_react_native_dir ${_node_modules_dir}/react-native)
 
 add_subdirectory(../../cpp/CommonCpp/
   ${CMAKE_CURRENT_BINARY_DIR}/build/CommonCpp
   EXCLUDE_FROM_ALL
 )
 
 file(GLOB SQLCIPHER
   "${_node_modules_dir}/@commapp/sqlcipher-amalgamation/src/*.c"
 )
 
 # Add files which aren't a part of comm-tools
 list(APPEND ANDROID_NATIVE_CODE
   "./src/cpp/CommSecureStore.cpp"
   "./src/cpp/DatabaseInitializerJNIHelper.cpp"
   "./src/cpp/GlobalDBSingleton.cpp"
   "./src/cpp/Logger.cpp"
   "./src/cpp/MessageOperationsUtilitiesJNIHelper.cpp"
   "./src/cpp/PlatformSpecificTools.cpp"
   "./src/cpp/TerminateApp.cpp"
   "./src/cpp/ThreadOperationsJNIHelper.cpp"
   "./src/cpp/jsiInstaller.cpp"
 )
 
 set(GENERATED_NATIVE_CODE "../../cpp/CommonCpp/_generated/commJSI-generated.cpp")
 file(GLOB CRYPTO_NATIVE_CODE "../../cpp/CommonCpp/CryptoTools/*.cpp")
 file(GLOB DB_NATIVE_CODE "../../cpp/CommonCpp/DatabaseManagers/*.cpp")
 file(GLOB DB_ENTITIES_NATIVE_CODE "../../cpp/CommonCpp/DatabaseManagers/entities/*.cpp")
 file(GLOB_RECURSE MODULE_NATIVE_CODE "../../cpp/CommonCpp/NativeModules/**/*.cpp")
 file(GLOB MODULE_ROOT_NATIVE_CODE "../../cpp/CommonCpp/NativeModules/*.cpp")
 file(GLOB NOTIFICATIONS_NATIVE_CODE "../../cpp/CommonCpp/Notifications/**/*.cpp")
 
 add_library(
   # Sets the name of the library
   ${PACKAGE_NAME}
 
   # Sets the library as a shared library
   SHARED
 
   # React dependencies
   ${_react_native_dir}/ReactCommon/jsi/jsi/jsi.cpp
+  ${_react_native_dir}/ReactCommon/jsi/jsi/JSIDynamic.cpp
   ${_react_native_dir}/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/CallInvokerHolder.cpp
   ${_react_native_dir}/ReactCommon/react/nativemodule/core/ReactCommon/TurboModule.cpp
   ${_react_native_dir}/ReactCommon/react/bridging/LongLivedObject.cpp
   ${_react_native_dir}/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleUtils.cpp
 
   # Third party dependencies
   ${SQLCIPHER}
 
   # comm code
   ${ANDROID_NATIVE_CODE}
   ${GENERATED_NATIVE_CODE}
   ${CRYPTO_NATIVE_CODE}
   ${DB_NATIVE_CODE}
   ${DB_ENTITIES_NATIVE_CODE}
   ${MODULE_NATIVE_CODE}
   ${MODULE_ROOT_NATIVE_CODE}
   ${TOOLS_NATIVE_CODE}
   ${NOTIFICATIONS_NATIVE_CODE}
 )
 
 set(BUILD_DIR ${CMAKE_SOURCE_DIR}/build)
 
 target_include_directories(
   ${PACKAGE_NAME}
   PRIVATE
 
   # React Native
   ${_react_native_dir}/React
   ${_react_native_dir}/React/Base
   ${_react_native_dir}/ReactCommon
   ${_react_native_dir}/ReactCommon/jsi
   ${_react_native_dir}/ReactCommon/callinvoker
   ${_react_native_dir}/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon
 
   # SQLCipher amalgamation
   ${_node_modules_dir}/@commapp/sqlcipher-amalgamation/src
 
   # SQLite ORM
   ../../cpp/third-party/sqlite_orm
 
   # symlinked React Native headers
   ../headers
 
   # comm android specific code
   ./src/cpp
 
   # comm native mutual code
   ../../cpp/CommonCpp/
   ../../cpp/CommonCpp/NativeModules
   ../../cpp/CommonCpp/NativeModules/InternalModules
   ../../cpp/CommonCpp/NativeModules/PersistentStorageUtilities
   ../../cpp/CommonCpp/NativeModules/PersistentStorageUtilities/ThreadOperationsUtilities
   ../../cpp/CommonCpp/NativeModules/PersistentStorageUtilities/MessageOperationsUtilities
   ../../cpp/CommonCpp/NativeModules/PersistentStorageUtilities/MessageOperationsUtilities/MessageSpecs
   ../../cpp/CommonCpp/DatabaseManagers
   ../../cpp/CommonCpp/Notifications
   ../../cpp/CommonCpp/Notifications/BackgroundDataStorage
 
   # native rust library
   ${native_rust_library_include_dir}
 )
 
 add_definitions(
   # SQLCipher
   -DSQLITE_THREADSAFE=0
   -DSQLITE_HAS_CODEC
   -DSQLITE_TEMP_STORE=2
   -DSQLCIPHER_CRYPTO_OPENSSL
 )
 
 target_link_libraries(
   ${PACKAGE_NAME}
   fbjni::fbjni
   android
   ${log-lib}
   Folly::folly
   glog::glog
   olm
   openssl-crypto
   openssl-ssl
   comm::native_rust_library
   comm-tools
 )
 
 # add a dummy library which is required by CallInvokerHolderImpl.java
 add_library(
   turbomodulejsijni
   # Sets the library as a shared library.
   SHARED
   # Provides a relative path to your source file(s).
   ./src/cpp/dummy.cpp
 )
diff --git a/native/cpp/CommonCpp/CryptoTools/DeviceID.h b/native/cpp/CommonCpp/CryptoTools/DeviceID.h
index 0bfb3d7e5..a943269f2 100644
--- a/native/cpp/CommonCpp/CryptoTools/DeviceID.h
+++ b/native/cpp/CommonCpp/CryptoTools/DeviceID.h
@@ -1,14 +1,16 @@
+#pragma once
+
 #include "lib.rs.h"
 #include <string>
 #include <unordered_map>
 
 namespace comm {
 
 class DeviceIDGenerator {
   static const std::unordered_map<std::string, DeviceType> DEVICE_TYPE_MAP;
 
 public:
   static std::string generateDeviceID(std::string deviceType);
 };
 
 } // namespace comm
diff --git a/native/cpp/CommonCpp/NativeModules/InternalModules/RustPromiseManager.cpp b/native/cpp/CommonCpp/NativeModules/InternalModules/RustPromiseManager.cpp
new file mode 100644
index 000000000..be63cc59d
--- /dev/null
+++ b/native/cpp/CommonCpp/NativeModules/InternalModules/RustPromiseManager.cpp
@@ -0,0 +1,65 @@
+#include "RustPromiseManager.h"
+
+namespace comm {
+
+RustPromiseManager RustPromiseManager::instance;
+
+RustPromiseManager::RustPromiseManager(){};
+
+uint32_t RustPromiseManager::addPromise(
+    std::shared_ptr<facebook::react::Promise> promise,
+    std::shared_ptr<facebook::react::CallInvoker> jsInvoker,
+    facebook::jsi::Runtime &rt) {
+  uint32_t id = getNextID();
+  PromiseInfo info = {promise, jsInvoker, rt};
+  // Acquire a lock for writing
+  std::unique_lock<std::shared_mutex> lock(mutex);
+  promises.insert({id, info});
+  return id;
+}
+
+void RustPromiseManager::removePromise(uint32_t id) {
+  // Acquire a lock for writing
+  std::unique_lock<std::shared_mutex> lock(mutex);
+  promises.erase(id);
+}
+
+void RustPromiseManager::resolvePromise(uint32_t id, folly::dynamic ret) {
+  // Acquire a shared lock for reading
+  std::shared_lock<std::shared_mutex> lock(mutex);
+  auto it = promises.find(id);
+  if (it == promises.end()) {
+    return;
+  }
+  // Release the shared lock
+  lock.unlock();
+  auto promiseInfo = it->second;
+  if (promiseInfo.jsInvoker) {
+    promiseInfo.jsInvoker->invokeAsync([promiseInfo, ret]() {
+      promiseInfo.promise->resolve(valueFromDynamic(promiseInfo.rt, ret));
+    });
+  } else {
+    promiseInfo.promise->resolve(valueFromDynamic(promiseInfo.rt, ret));
+  }
+  removePromise(id);
+}
+
+void RustPromiseManager::rejectPromise(uint32_t id, const std::string &error) {
+  // Acquire a shared lock for reading
+  std::shared_lock<std::shared_mutex> lock(mutex);
+  auto it = promises.find(id);
+  if (it == promises.end()) {
+    return;
+  }
+  // Release the shared lock
+  lock.unlock();
+  if (it->second.jsInvoker) {
+    it->second.jsInvoker->invokeAsync(
+        [promise = it->second.promise, error]() { promise->reject(error); });
+  } else {
+    it->second.promise->reject(error);
+  }
+  removePromise(id);
+}
+
+} // namespace comm
diff --git a/native/cpp/CommonCpp/NativeModules/InternalModules/RustPromiseManager.h b/native/cpp/CommonCpp/NativeModules/InternalModules/RustPromiseManager.h
new file mode 100644
index 000000000..ad3f51bba
--- /dev/null
+++ b/native/cpp/CommonCpp/NativeModules/InternalModules/RustPromiseManager.h
@@ -0,0 +1,40 @@
+#pragma once
+
+#include <ReactCommon/TurboModuleUtils.h>
+#include <folly/dynamic.h>
+#include <jsi/JSIDynamic.h>
+
+#include <atomic>
+#include <shared_mutex>
+
+namespace comm {
+
+class RustPromiseManager {
+  std::atomic<uint32_t> id{0};
+
+  RustPromiseManager();
+
+  uint32_t getNextID() {
+    return this->id++;
+  };
+
+public:
+  static RustPromiseManager instance;
+  uint32_t addPromise(
+      std::shared_ptr<facebook::react::Promise> promise,
+      std::shared_ptr<facebook::react::CallInvoker> jsInvoker,
+      facebook::jsi::Runtime &rt);
+  void removePromise(uint32_t id);
+  void resolvePromise(uint32_t id, folly::dynamic ret);
+  void rejectPromise(uint32_t id, const std::string &error);
+
+  struct PromiseInfo {
+    std::shared_ptr<facebook::react::Promise> promise;
+    std::shared_ptr<facebook::react::CallInvoker> jsInvoker;
+    facebook::jsi::Runtime &rt;
+  };
+  std::unordered_map<uint32_t, PromiseInfo> promises;
+  std::shared_mutex mutex;
+};
+
+} // namespace comm