diff --git a/ts/services/calling.ts b/ts/services/calling.ts index 2bc6015f55..fc120df518 100644 --- a/ts/services/calling.ts +++ b/ts/services/calling.ts @@ -127,6 +127,7 @@ import { } from '../util/callDisposition'; import { isNormalNumber } from '../util/isNormalNumber'; import { LocalCallEvent } from '../types/CallDisposition'; +import { isServiceIdString } from '../types/ServiceId'; import { isInSystemContacts } from '../util/isInSystemContacts'; import { getRoomIdFromRootKey, @@ -2287,7 +2288,10 @@ export class CallingClass { Boolean(message.offer); try { - assertDev(isAciString(remoteUserId), 'remoteUserId is not a aci'); + assertDev( + isServiceIdString(remoteUserId), + 'remoteUserId is not a service id' + ); const result = await handleMessageSend( window.textsecure.messaging.sendCallingMessage( remoteUserId, diff --git a/ts/state/smart/CallManager.tsx b/ts/state/smart/CallManager.tsx index 8d20c010b4..150b0e72bc 100644 --- a/ts/state/smart/CallManager.tsx +++ b/ts/state/smart/CallManager.tsx @@ -27,7 +27,6 @@ import type { ConversationsByDemuxIdType, GroupCallRemoteParticipantType, } from '../../types/Calling'; -import { isAciString } from '../../util/isAciString'; import type { AciString } from '../../types/ServiceId'; import { CallMode, CallState } from '../../types/Calling'; import type { CallLinkType } from '../../types/CallLink'; @@ -194,11 +193,6 @@ const mapStateToActiveCallProp = ( return; } - strictAssert( - isAciString(conversation.serviceId), - 'Conversation must have aci' - ); - return { ...baseResult, callEndedReason: call.callEndedReason,