From 6e102644c3feb10944f577bcde0a7418d43e2a78 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 21 Dec 2021 09:49:22 +1100
Subject: [PATCH] update english translations

---
 _locales/en/messages.json  | 1 -
 ts/models/conversation.ts  | 5 ++++-
 ts/receiver/dataMessage.ts | 5 ++---
 ts/types/LocalizerKeys.ts  | 1 -
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index ee0034f22..b58f5f256 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -373,7 +373,6 @@
   "openGroupURL": "Open Group URL",
   "enterAnOpenGroupURL": "Enter an open group URL",
   "next": "Next",
-  "description": "1 minute",
   "invalidGroupNameTooShort": "Please enter a group name",
   "invalidGroupNameTooLong": "Please enter a shorter group name",
   "pickClosedGroupMember": "Please pick at least 1 group member",
diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 7d692f1f1..0f478b3e3 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -1069,7 +1069,10 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       return;
     }
     if (this.isPrivate() && read.length && options.sendReadReceipts) {
-      window?.log?.info(`Sending ${read.length} read receipts`);
+      window?.log?.info(
+        `Sending ${read.length} read receipts?`,
+        window.storage.get(SettingsKey.settingsReadReceipt) || false
+      );
       if (window.storage.get(SettingsKey.settingsReadReceipt)) {
         await Promise.all(
           _.map(_.groupBy(read, 'sender'), async (receipts, sender) => {
diff --git a/ts/receiver/dataMessage.ts b/ts/receiver/dataMessage.ts
index 03a57c1f7..1be4dafac 100644
--- a/ts/receiver/dataMessage.ts
+++ b/ts/receiver/dataMessage.ts
@@ -359,16 +359,15 @@ export async function isMessageDuplicate({
   sourceDevice,
   timestamp,
   message,
-  serverId,
   serverTimestamp,
 }: MessageId) {
   const { Errors } = window.Signal.Types;
   // serverId is only used for opengroupv2
   try {
     let result;
-    if (serverId || serverTimestamp) {
+    if (serverTimestamp) {
       // first try to find a duplicate with the same serverTimestamp from this sender
-      if (!result && serverTimestamp) {
+      if (serverTimestamp) {
         result = await getMessageBySenderAndServerTimestamp({
           source,
           serverTimestamp,
diff --git a/ts/types/LocalizerKeys.ts b/ts/types/LocalizerKeys.ts
index 9f3495947..b219e9794 100644
--- a/ts/types/LocalizerKeys.ts
+++ b/ts/types/LocalizerKeys.ts
@@ -102,7 +102,6 @@ export type LocalizerKeys =
   | 'autoUpdateNewVersionInstructions'
   | 'appMenuUnhide'
   | 'timerOption_30_minutes_abbreviated'
-  | 'description'
   | 'voiceMessage'
   | 'changePasswordTitle'
   | 'copyMessage'