mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

fix flaky mock server test

Browse source
This commit is contained in:
Fedor Indutny 2023-02-08 09:19:13 -08:00 • committed by GitHub
parent 8ed13b2247
commit 22b4fa4c43
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 34 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ts/services/storageRecordOps.ts
View file

@ -19,6 +19,7 @@ import { assertDev } from '../util/assert';
import { dropNull } from '../util/dropNull';
import { normalizeUuid } from '../util/normalizeUuid';
import { missingCaseError } from '../util/missingCaseError';
import { isNotNil } from '../util/isNotNil';
import {
PhoneNumberSharingMode,
parsePhoneNumberSharingMode,
@ -1269,8 +1270,8 @@ export async function mergeAccountRecord(
`remote pinned=${pinnedConversations.length}`
);
const remotelyPinnedConversationPromises = pinnedConversations.map(
async ({ contact, legacyGroupId, groupMasterKey }) => {
const remotelyPinnedConversations = pinnedConversations
.map(({ contact, legacyGroupId, groupMasterKey }) => {
let conversation: ConversationModel | undefined;
if (contact) {
@ -1307,15 +1308,8 @@ export async function mergeAccountRecord(
}
return conversation;
}
);
const remotelyPinnedConversations = (
await Promise.all(remotelyPinnedConversationPromises)
).filter(
(conversation): conversation is ConversationModel =>
conversation !== undefined
);
})
.filter(isNotNil);
const remotelyPinnedConversationIds = remotelyPinnedConversations.map(
({ id }) => id