Respond to CR.

SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m

@@ -804,7 +804,8 @@ NSString *NSStringForOutgoingMessageRecipientState(OWSOutgoingMessageRecipientSt
                                        // b) "Sent updates" should never downgrade the "recipient state" for any
                                        //    recipients.  Prefer existing "recipient state"; "sent updates" only
                                        //    add new recipients at the "sent" state.
-                                       [recipientStateMap removeObjectsForKeys:self.recipientStateMap.allKeys];
+                                       //
+                                       // Therefore we retain all existing entries in the recipient state map.
                                        [recipientStateMap addEntriesFromDictionary:self.recipientStateMap];
                                    }
 

SignalServiceKit/src/Messages/OWSMessageSender.m

@@ -1391,19 +1391,12 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
         return success();
     }
 
-    BOOL shouldSendTranscript = NO;
+    BOOL shouldSendTranscript = (AreRecipientUpdatesEnabled() || !message.hasSyncedTranscript);
-    BOOL isRecipientUpdate = NO;
-    if (message.hasSyncedTranscript) {
-        shouldSendTranscript = YES;
-    } else if (AreRecipientUpdatesEnabled()) {
-        shouldSendTranscript = YES;
-        isRecipientUpdate = YES;
-    }
-
     if (!shouldSendTranscript) {
         return success();
     }
 
+    BOOL isRecipientUpdate = message.hasSyncedTranscript;
     [self
         sendSyncTranscriptForMessage:message
                    isRecipientUpdate:isRecipientUpdate