Upgrade Prettier to 2.4.1

ts/test-both/reactions/util_test.ts

@@ -67,10 +67,8 @@ describe('reaction utilities', () => {
         { ...rxn('⭐️'), timestamp: 2 },
         { ...rxn('🔥', { isPending: true }), timestamp: 1 },
       ];
-      const {
-        pendingReaction,
-        emojiToRemove,
-      } = getNewestPendingOutgoingReaction(oldReactions, OUR_CONVO_ID);
+      const { pendingReaction, emojiToRemove } =
+        getNewestPendingOutgoingReaction(oldReactions, OUR_CONVO_ID);
 
       assert.isUndefined(pendingReaction);
       assert.isUndefined(emojiToRemove);
@@ -84,10 +82,8 @@ describe('reaction utilities', () => {
           { ...rxn('⭐️', { isPending: true }), timestamp: 2 },
         ],
       ].forEach(oldReactions => {
-        const {
-          pendingReaction,
-          emojiToRemove,
-        } = getNewestPendingOutgoingReaction(oldReactions, OUR_CONVO_ID);
+        const { pendingReaction, emojiToRemove } =
+          getNewestPendingOutgoingReaction(oldReactions, OUR_CONVO_ID);
 
         assert.strictEqual(pendingReaction?.emoji, '⭐️');
         assert.isUndefined(emojiToRemove);
@@ -100,10 +96,8 @@ describe('reaction utilities', () => {
         { ...rxn(undefined, { isPending: true }), timestamp: 3 },
         { ...rxn('🔥', { isPending: true }), timestamp: 2 },
       ];
-      const {
-        pendingReaction,
-        emojiToRemove,
-      } = getNewestPendingOutgoingReaction(oldReactions, OUR_CONVO_ID);
+      const { pendingReaction, emojiToRemove } =
+        getNewestPendingOutgoingReaction(oldReactions, OUR_CONVO_ID);
 
       assert.isDefined(pendingReaction);
       assert.isUndefined(pendingReaction?.emoji);

ts/test-both/state/selectors/conversations_test.ts

@@ -1364,11 +1364,8 @@ describe('both/state/selectors/conversations', () => {
         }),
       };
       const comparator = _getConversationComparator();
-      const {
-        archivedConversations,
-        conversations,
-        pinnedConversations,
-      } = _getLeftPaneLists(data, comparator);
+      const { archivedConversations, conversations, pinnedConversations } =
+        _getLeftPaneLists(data, comparator);
 
       assert.strictEqual(conversations[0].name, 'First!');
       assert.strictEqual(conversations[1].name, 'Á');
@@ -1467,16 +1464,8 @@ describe('both/state/selectors/conversations', () => {
 
         const pinnedConversationIds = ['pin1', 'pin2', 'pin3'];
         const comparator = _getConversationComparator();
-        const {
-          archivedConversations,
-          conversations,
-          pinnedConversations,
-        } = _getLeftPaneLists(
-          data,
-          comparator,
-          undefined,
-          pinnedConversationIds
-        );
+        const { archivedConversations, conversations, pinnedConversations } =
+          _getLeftPaneLists(data, comparator, undefined, pinnedConversationIds);
 
         assert.strictEqual(pinnedConversations[0].name, 'Pin One');
         assert.strictEqual(pinnedConversations[1].name, 'Pin Two');
@@ -1619,16 +1608,8 @@ describe('both/state/selectors/conversations', () => {
 
         const pinnedConversationIds = ['pin1', 'pin2', 'pin3'];
         const comparator = _getConversationComparator();
-        const {
-          archivedConversations,
-          conversations,
-          pinnedConversations,
-        } = _getLeftPaneLists(
-          data,
-          comparator,
-          undefined,
-          pinnedConversationIds
-        );
+        const { archivedConversations, conversations, pinnedConversations } =
+          _getLeftPaneLists(data, comparator, undefined, pinnedConversationIds);
 
         assert.strictEqual(pinnedConversations[0].name, 'Pin One');
         assert.strictEqual(pinnedConversations[1].name, 'Pin Two');

ts/test-both/util/getGroupMemberships_test.ts

@@ -30,8 +30,10 @@ describe('getGroupMemberships', () => {
     it('returns an empty array if passed undefined', () => {
       const conversation = {};
 
-      const result = getGroupMemberships(conversation, getConversationByUuid)
-        .memberships;
+      const result = getGroupMemberships(
+        conversation,
+        getConversationByUuid
+      ).memberships;
 
       assert.isEmpty(result);
     });
@@ -39,8 +41,10 @@ describe('getGroupMemberships', () => {
     it('returns an empty array if passed an empty array', () => {
       const conversation = { memberships: [] };
 
-      const result = getGroupMemberships(conversation, getConversationByUuid)
-        .memberships;
+      const result = getGroupMemberships(
+        conversation,
+        getConversationByUuid
+      ).memberships;
 
       assert.isEmpty(result);
     });
@@ -55,8 +59,10 @@ describe('getGroupMemberships', () => {
         ],
       };
 
-      const result = getGroupMemberships(conversation, getConversationByUuid)
-        .memberships;
+      const result = getGroupMemberships(
+        conversation,
+        getConversationByUuid
+      ).memberships;
 
       assert.isEmpty(result);
     });
@@ -71,8 +77,10 @@ describe('getGroupMemberships', () => {
         ],
       };
 
-      const result = getGroupMemberships(conversation, getConversationByUuid)
-        .memberships;
+      const result = getGroupMemberships(
+        conversation,
+        getConversationByUuid
+      ).memberships;
 
       assert.lengthOf(result, 1);
       assert.deepEqual(result[0], {
@@ -95,8 +103,10 @@ describe('getGroupMemberships', () => {
         ],
       };
 
-      const result = getGroupMemberships(conversation, getConversationByUuid)
-        .memberships;
+      const result = getGroupMemberships(
+        conversation,
+        getConversationByUuid
+      ).memberships;
 
       assert.lengthOf(result, 2);
       assert.deepEqual(result[0], {
@@ -114,8 +124,10 @@ describe('getGroupMemberships', () => {
     it('returns an empty array if passed undefined', () => {
       const conversation = {};
 
-      const result = getGroupMemberships(conversation, getConversationByUuid)
-        .pendingApprovalMemberships;
+      const result = getGroupMemberships(
+        conversation,
+        getConversationByUuid
+      ).pendingApprovalMemberships;
 
       assert.isEmpty(result);
     });
@@ -123,8 +135,10 @@ describe('getGroupMemberships', () => {
     it('returns an empty array if passed an empty array', () => {
       const conversation = { pendingApprovalMemberships: [] };
 
-      const result = getGroupMemberships(conversation, getConversationByUuid)
-        .pendingApprovalMemberships;
+      const result = getGroupMemberships(
+        conversation,
+        getConversationByUuid
+      ).pendingApprovalMemberships;
 
       assert.isEmpty(result);
     });
@@ -134,8 +148,10 @@ describe('getGroupMemberships', () => {
         pendingApprovalMemberships: [{ uuid: UUID.generate().toString() }],
       };
 
-      const result = getGroupMemberships(conversation, getConversationByUuid)
-        .pendingApprovalMemberships;
+      const result = getGroupMemberships(
+        conversation,
+        getConversationByUuid
+      ).pendingApprovalMemberships;
 
       assert.isEmpty(result);
     });
@@ -145,8 +161,10 @@ describe('getGroupMemberships', () => {
         pendingApprovalMemberships: [{ uuid: unregisteredConversation.uuid }],
       };
 
-      const result = getGroupMemberships(conversation, getConversationByUuid)
-        .pendingApprovalMemberships;
+      const result = getGroupMemberships(
+        conversation,
+        getConversationByUuid
+      ).pendingApprovalMemberships;
 
       assert.isEmpty(result);
     });
@@ -159,8 +177,10 @@ describe('getGroupMemberships', () => {
         ],
       };
 
-      const result = getGroupMemberships(conversation, getConversationByUuid)
-        .pendingApprovalMemberships;
+      const result = getGroupMemberships(
+        conversation,
+        getConversationByUuid
+      ).pendingApprovalMemberships;
 
       assert.lengthOf(result, 2);
       assert.deepEqual(result[0], { member: normalConversation2 });
@@ -172,8 +192,10 @@ describe('getGroupMemberships', () => {
     it('returns an empty array if passed undefined', () => {
       const conversation = {};
 
-      const result = getGroupMemberships(conversation, getConversationByUuid)
-        .pendingMemberships;
+      const result = getGroupMemberships(
+        conversation,
+        getConversationByUuid
+      ).pendingMemberships;
 
       assert.isEmpty(result);
     });
@@ -181,8 +203,10 @@ describe('getGroupMemberships', () => {
     it('returns an empty array if passed an empty array', () => {
       const conversation = { pendingMemberships: [] };
 
-      const result = getGroupMemberships(conversation, getConversationByUuid)
-        .pendingMemberships;
+      const result = getGroupMemberships(
+        conversation,
+        getConversationByUuid
+      ).pendingMemberships;
 
       assert.isEmpty(result);
     });
@@ -197,8 +221,10 @@ describe('getGroupMemberships', () => {
         ],
       };
 
-      const result = getGroupMemberships(conversation, getConversationByUuid)
-        .pendingMemberships;
+      const result = getGroupMemberships(
+        conversation,
+        getConversationByUuid
+      ).pendingMemberships;
 
       assert.isEmpty(result);
     });
@@ -213,8 +239,10 @@ describe('getGroupMemberships', () => {
         ],
       };
 
-      const result = getGroupMemberships(conversation, getConversationByUuid)
-        .pendingMemberships;
+      const result = getGroupMemberships(
+        conversation,
+        getConversationByUuid
+      ).pendingMemberships;
 
       assert.isEmpty(result);
     });
@@ -230,8 +258,10 @@ describe('getGroupMemberships', () => {
         ],
       };
 
-      const result = getGroupMemberships(conversation, getConversationByUuid)
-        .pendingMemberships;
+      const result = getGroupMemberships(
+        conversation,
+        getConversationByUuid
+      ).pendingMemberships;
 
       assert.lengthOf(result, 2);
       assert.deepEqual(result[0], {

ts/test-both/util/sessionTranslation_test.ts

@@ -69,8 +69,7 @@ describe('sessionTranslation', () => {
             messageKeys: {},
             chainKey: {
               counter: -1,
-              key:
-                "èB?7\u000f¯\u001e\u0010¨\u0007}:“?¹\u0010$\\ë~ª\u0000gM0՘'£\u0005",
+              key: "èB?7\u000f¯\u001e\u0010¨\u0007}:“?¹\u0010$\\ë~ª\u0000gM0՘'£\u0005",
             },
             chainType: 1,
           },
@@ -258,18 +257,19 @@ describe('sessionTranslation', () => {
             },
             chainType: 2,
           },
-          '\u0005„±@íN"Í\u0019HS{$ï\u0017”[Ñ\\\u001a*;>P\u0000\u001f\u000eHNaù)': {
-            messageKeys: {
-              '0': "1kÏ\u001cí+«<º‚\b'VÌ!×¼«PÃ[üáy;l'ƒ€€Ž",
-              '2': 'ö\u00047%L-…Wm)†›\u001d£ääíNô.Ô8…ÃÉ4r´ó^2',
-              '3': '¨¿¦›7T]\u001c\u001c“à4:x\u0019¿\u0002YÉÀ\u001bâjr¸»¤¢0,*',
-              '5': '™¥\u0006·q“gó4þ\u0011®ˆU4F\u001cl©\bŒäô…»ÊÇƎ[',
+          '\u0005„±@íN"Í\u0019HS{$ï\u0017”[Ñ\\\u001a*;>P\u0000\u001f\u000eHNaù)':
+            {
+              messageKeys: {
+                '0': "1kÏ\u001cí+«<º‚\b'VÌ!×¼«PÃ[üáy;l'ƒ€€Ž",
+                '2': 'ö\u00047%L-…Wm)†›\u001d£ääíNô.Ô8…ÃÉ4r´ó^2',
+                '3': '¨¿¦›7T]\u001c\u001c“à4:x\u0019¿\u0002YÉÀ\u001bâjr¸»¤¢0,*',
+                '5': '™¥\u0006·q“gó4þ\u0011®ˆU4F\u001cl©\bŒäô…»ÊÇƎ[',
+              },
+              chainKey: {
+                counter: 5,
+              },
+              chainType: 2,
             },
-            chainKey: {
-              counter: 5,
-            },
-            chainType: 2,
-          },
           '\u0005Þg”Åkéƒ\u0001\u0013—¡ÿûNXÈ(9\u0006¤’w˜®/عRi‹JI': {
             messageKeys: {
               '0': "]'8ŽWÄ\u0007…n˜º­Ö{ÿ7]ôäÄ!é\u000btA@°b¢)\u001ar",
@@ -306,8 +306,7 @@ describe('sessionTranslation', () => {
             messageKeys: {},
             chainKey: {
               counter: -1,
-              key:
-                "èB?7\u000f¯\u001e\u0010¨\u0007}:“?¹\u0010$\\ë~ª\u0000gM0՘'£\u0005",
+              key: "èB?7\u000f¯\u001e\u0010¨\u0007}:“?¹\u0010$\\ë~ª\u0000gM0՘'£\u0005",
             },
             chainType: 1,
           },
@@ -562,8 +561,7 @@ describe('sessionTranslation', () => {
             messageKeys: {},
             chainKey: {
               counter: -1,
-              key:
-                "èB?7\u000f¯\u001e\u0010¨\u0007}:“?¹\u0010$\\ë~ª\u0000gM0՘'£\u0005",
+              key: "èB?7\u000f¯\u001e\u0010¨\u0007}:“?¹\u0010$\\ë~ª\u0000gM0՘'£\u0005",
             },
             chainType: 1,
           },
@@ -670,8 +668,7 @@ describe('sessionTranslation', () => {
             messageKeys: {},
             chainKey: {
               counter: -1,
-              key:
-                "èB?7\u000f¯\u001e\u0010¨\u0007}:“?¹\u0010$\\ë~ª\u0000gM0՘'£\u0005",
+              key: "èB?7\u000f¯\u001e\u0010¨\u0007}:“?¹\u0010$\\ë~ª\u0000gM0՘'£\u0005",
             },
             chainType: 1,
           },
@@ -711,8 +708,7 @@ describe('sessionTranslation', () => {
             messageKeys: {},
             chainKey: {
               counter: -1,
-              key:
-                "èB?7\u000f¯\u001e\u0010¨\u0007}:“?¹\u0010$\\ë~ª\u0000gM0՘'£\u0005",
+              key: "èB?7\u000f¯\u001e\u0010¨\u0007}:“?¹\u0010$\\ë~ª\u0000gM0՘'£\u0005",
             },
             chainType: 1,
           },
@@ -752,8 +748,7 @@ describe('sessionTranslation', () => {
             messageKeys: {},
             chainKey: {
               counter: -1,
-              key:
-                "èB?7\u000f¯\u001e\u0010¨\u0007}:“?¹\u0010$\\ë~ª\u0000gM0՘'£\u0005",
+              key: "èB?7\u000f¯\u001e\u0010¨\u0007}:“?¹\u0010$\\ë~ª\u0000gM0՘'£\u0005",
             },
             chainType: 1,
           },