From 4371996362928cc5ae233997ccf06dc8ab9667f3 Mon Sep 17 00:00:00 2001
From: Josh Perez <60019601+josh-signal@users.noreply.github.com>
Date: Mon, 23 Aug 2021 19:17:36 -0400
Subject: [PATCH] Reduce the amount of storage service conflicts

---
 ts/services/storageRecordOps.ts | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/ts/services/storageRecordOps.ts b/ts/services/storageRecordOps.ts
index 1af9d5ff6e..48520c61ea 100644
--- a/ts/services/storageRecordOps.ts
+++ b/ts/services/storageRecordOps.ts
@@ -374,20 +374,7 @@ function doRecordsConflict(
 ): boolean {
   const idForLogging = conversation.idForLogging();
 
-  const localKeys = Object.keys(localRecord);
-  const remoteKeys = Object.keys(remoteRecord);
-
-  if (localKeys.length !== remoteKeys.length) {
-    window.log.info(
-      'storageService.doRecordsConflict: Local keys do not match remote keys',
-      idForLogging,
-      localKeys.join(','),
-      remoteKeys.join(',')
-    );
-    return true;
-  }
-
-  return localKeys.some((key: string): boolean => {
+  return Object.keys(remoteRecord).some((key: string): boolean => {
     const localValue = localRecord[key];
     const remoteValue = remoteRecord[key];