Remove accepted message without explicit user action

2024-03-15 12:11:48 -07:00 · 2024-03-15 12:11:48 -07:00 · 11ea595457
commit 11ea595457
parent 8a21f8655f
6 changed files with 28 additions and 39 deletions
--- a/ts/models/conversations.ts
+++ b/ts/models/conversations.ts
@ -2163,11 +2163,15 @@ export class ConversationModel extends window.Backbone

      if (didResponseChange) {
        if (response === messageRequestEnum.ACCEPT) {
-          drop(
-            this.addMessageRequestResponseEventMessage(
-              MessageRequestResponseEvent.ACCEPT
-            )
-          );
+          // Only add a message when the user took an explicit action to accept
+          // the message request on one of their devices
+          if (!viaStorageServiceSync) {
+            drop(
+              this.addMessageRequestResponseEventMessage(
+                MessageRequestResponseEvent.ACCEPT
+              )
+            );
+          }
        }
        if (
          response === messageRequestEnum.BLOCK ||