marcinwasowicz

diff --git a/native/profile/tunnelbroker-menu.react.js b/native/profile/tunnelbroker-menu.react.js
index 15522363a6..2a29a0a665 100644
--- a/native/profile/tunnelbroker-menu.react.js
+++ b/native/profile/tunnelbroker-menu.react.js
@@ -24,6 +24,7 @@ import type { ProfileNavigationProp } from './profile.react.js';
 import Button from '../components/button.react.js';
 import TextInput from '../components/text-input.react.js';
 import { olmAPI } from '../crypto/olm-api.js';
+import { commCoreModule } from '../native-modules.js';
 import type { NavigationRoute } from '../navigation/route-names.js';

marcinwasowicz

diff --git a/keyserver/docker-compose.yml b/keyserver/docker-compose.yml
index b9a0528e8f..7e79cb454a 100644
--- a/keyserver/docker-compose.yml
+++ b/keyserver/docker-compose.yml
@@ -10,10 +10,13 @@ services:
         - COMM_JSONCONFIG_secrets_alchemy=${COMM_JSONCONFIG_secrets_alchemy}
         - COMM_JSONCONFIG_secrets_walletconnect=${COMM_JSONCONFIG_secrets_walletconnect}
         - COMM_JSONCONFIG_secrets_geoip_license=${COMM_JSONCONFIG_secrets_geoip_license}
+        - COMM_JSONCONFIG_secrets_comm_apn_config=${COMM_JSONCONFIG_secrets_comm_apn_config}
     image: commapp/node-keyserver:1.0

marcinwasowicz

diff --git a/lib/utils/siwe-utils.js b/lib/utils/siwe-utils.js
index ec538c34b6..ef996a137c 100644
--- a/lib/utils/siwe-utils.js
+++ b/lib/utils/siwe-utils.js
@@ -3,7 +3,7 @@
 import invariant from 'invariant';
 import { SiweMessage } from 'siwe';
 
-import { isDev } from './dev-utils.js';
+// import { isDev } from './dev-utils.js';

marcinwasowicz

diff --git a/keyserver/docker-compose.yml b/keyserver/docker-compose.yml
index b9a0528e8f..adf04a8dd3 100644
--- a/keyserver/docker-compose.yml
+++ b/keyserver/docker-compose.yml
@@ -13,7 +13,7 @@ services:
     image: commapp/node-keyserver:1.0
     restart: always
     ports:
-      - '3000:3000'
+      - '3001:3000'

marcinwasowicz

diff --git a/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp b/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp
index 81680db56..301887be2 100644
--- a/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp
+++ b/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp
@@ -667,19 +667,19 @@ bool create_schema(sqlite3 *db) {
 void set_encryption_key(
     sqlite3 *db,
     const std::string &encryptionKey = SQLiteQueryExecutor::encryptionKey) {
-  std::string set_encryption_key_query =
-      "PRAGMA key = \"x'" + encryptionKey + "'\";";

marcinwasowicz

diff --git a/lib/ops/keyserver-store-ops.js b/lib/ops/keyserver-store-ops.js
index 26547a107..ae5992e71 100644
--- a/lib/ops/keyserver-store-ops.js
+++ b/lib/ops/keyserver-store-ops.js
@@ -130,7 +130,23 @@ const keyserverStoreOpsHandlers: BaseStoreOpsHandlers<
   },
 };
 
+function getKeyserversToRemoveFromNotifsStore(
+  ops: $ReadOnlyArray<KeyserverStoreOperation>,

marcinwasowicz

diff --git a/web/database/worker/db-worker.js b/web/database/worker/db-worker.js
index de512f5d4..ddefe642b 100644
--- a/web/database/worker/db-worker.js
+++ b/web/database/worker/db-worker.js
@@ -220,6 +220,26 @@ async function processAppRequest(
     message.type === workerRequestMessageTypes.REMOVE_PERSIST_STORAGE_ITEM
   ) {
     sqliteQueryExecutor.removePersistStorageItem(message.key);
+  } else if (message.type === workerRequestMessageTypes.RESTORE_DATABASE) {
+    const myPersist =

marcinwasowicz

diff --git a/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp b/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp
index 201ce2f95..e187415d1 100644
--- a/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp
+++ b/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp
@@ -571,19 +571,19 @@ bool create_schema(sqlite3 *db) {
 }
 
 void set_encryption_key(sqlite3 *db) {
-  std::string set_encryption_key_query =
-      "PRAGMA key = \"x'" + SQLiteQueryExecutor::encryptionKey + "'\";";

marcinwasowicz

diff --git a/web/database/_generated/comm_query_executor.wasm b/web/database/_generated/comm_query_executor.wasm
index 5ecc383df..2dab6475c 100755
Binary files a/web/database/_generated/comm_query_executor.wasm and b/web/database/_generated/comm_query_executor.wasm differ
diff --git a/web/database/worker/db-worker.js b/web/database/worker/db-worker.js
index de512f5d4..8ade1b44a 100644
--- a/web/database/worker/db-worker.js
+++ b/web/database/worker/db-worker.js
@@ -220,6 +220,30 @@ async function processAppRequest(
     message.type === workerRequestMessageTypes.REMOVE_PERSIST_STORAGE_ITEM
   ) {

marcinwasowicz

diff --git a/native/cpp/CommonCpp/NativeModules/DraftStoreOperations.h b/native/cpp/CommonCpp/NativeModules/DraftStoreOperations.h
index 4ae8b8e3a..2d6d6dff3 100644
--- a/native/cpp/CommonCpp/NativeModules/DraftStoreOperations.h
+++ b/native/cpp/CommonCpp/NativeModules/DraftStoreOperations.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "CommServicesAuthMetadataEmitter.h"
 #include "DatabaseManager.h"
 #include <jsi/jsi.h>