From 87f3abb80fa41b5d2128f2e1ee6a028b83388d42 Mon Sep 17 00:00:00 2001
From: Thomas Beumer <t.beumer@carebeat.nl>
Date: Thu, 5 Feb 2026 10:46:53 +0100
Subject: [PATCH 1/2] Fix read receipt sender comparison using
 toFlatCommunicationIdentifier

---
 packages/chat-stateful-client/src/ChatContext.ts |  5 ++++-
 samples/Server/appsettings.json.sample           | 14 --------------
 2 files changed, 4 insertions(+), 15 deletions(-)
 delete mode 100644 samples/Server/appsettings.json.sample

diff --git a/packages/chat-stateful-client/src/ChatContext.ts b/packages/chat-stateful-client/src/ChatContext.ts
index 92eb64960bb..921e4a643be 100644
--- a/packages/chat-stateful-client/src/ChatContext.ts
+++ b/packages/chat-stateful-client/src/ChatContext.ts
@@ -292,7 +292,10 @@ export class ChatContext {
       const readReceipts = thread?.readReceipts;
       if (thread && readReceipts) {
         // TODO(prprabhu): Replace `this.getState()` with `draft`?
-        if (readReceipt.sender !== this.getState().userId && thread.latestReadTime < readReceipt.readOn) {
+        if (
+          toFlatCommunicationIdentifier(readReceipt.sender) !== toFlatCommunicationIdentifier(this.getState().userId) &&
+          thread.latestReadTime < readReceipt.readOn
+        ) {
           thread.latestReadTime = readReceipt.readOn;
         }
         readReceipts.push(readReceipt);
diff --git a/samples/Server/appsettings.json.sample b/samples/Server/appsettings.json.sample
deleted file mode 100644
index 2690781b74c..00000000000
--- a/samples/Server/appsettings.json.sample
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Trace",
-      "System": "Information",
-      "Microsoft": "Information"
-    }
-  },
-  "AllowedHosts": "*",
-  "ResourceConnectionString": "REPLACE_WITH_COMMUNICATION_RESOURCE_CONNECTION_STRING",
-  "EndpointUrl": "REPLACE_WITH_ENDPOINT_URL",
-  "AdminUserId": "REPLACE_WITH_ADMIN_USER_ID",
-  "AzureBlobStorageConnectionString": "REPLACE_WITH_BLOB_STORAGE_CONNECTION_STRING"
-}
\ No newline at end of file

From d2a344768e2a13b118120cc5383007a1eff2c22a Mon Sep 17 00:00:00 2001
From: Thomas Beumer <t.beumer@carebeat.nl>
Date: Thu, 5 Feb 2026 11:12:43 +0100
Subject: [PATCH 2/2] Revert appsettings.sample.json

---
 samples/Server/appsettings.json.sample | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 samples/Server/appsettings.json.sample

diff --git a/samples/Server/appsettings.json.sample b/samples/Server/appsettings.json.sample
new file mode 100644
index 00000000000..2690781b74c
--- /dev/null
+++ b/samples/Server/appsettings.json.sample
@@ -0,0 +1,14 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Trace",
+      "System": "Information",
+      "Microsoft": "Information"
+    }
+  },
+  "AllowedHosts": "*",
+  "ResourceConnectionString": "REPLACE_WITH_COMMUNICATION_RESOURCE_CONNECTION_STRING",
+  "EndpointUrl": "REPLACE_WITH_ENDPOINT_URL",
+  "AdminUserId": "REPLACE_WITH_ADMIN_USER_ID",
+  "AzureBlobStorageConnectionString": "REPLACE_WITH_BLOB_STORAGE_CONNECTION_STRING"
+}
\ No newline at end of file