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

Fetch PNI group credentials

Browse source
This commit is contained in:
Fedor Indutny 2022-07-08 13:46:25 -07:00 • committed by GitHub
parent b9ba732724
commit a450e13a99
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
61 changed files with 1911 additions and 875 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ts/state/smart/ConversationHeader.tsx
View file

@ -17,7 +17,7 @@ import { CallMode } from '../../types/Calling';
import type { ConversationType } from '../ducks/conversations';
import { getConversationCallMode } from '../ducks/conversations';
import { getActiveCall, isAnybodyElseInGroupCall } from '../ducks/calling';
import { getUserUuid, getIntl, getTheme } from '../selectors/user';
import { getUserACI, getIntl, getTheme } from '../selectors/user';
import { getOwn } from '../../util/getOwn';
import { missingCaseError } from '../../util/missingCaseError';
import { isConversationSMSOnly } from '../../util/isConversationSMSOnly';
@ -47,8 +47,8 @@ const getOutgoingCallButtonStyle = (
state: StateType
): OutgoingCallButtonStyle => {
const { calling } = state;
const ourUuid = getUserUuid(state);
strictAssert(ourUuid, 'getOutgoingCallButtonStyle missing our uuid');
const ourACI = getUserACI(state);
strictAssert(ourACI, 'getOutgoingCallButtonStyle missing our uuid');
if (getActiveCall(calling)) {
return OutgoingCallButtonStyle.None;
@ -64,7 +64,7 @@ const getOutgoingCallButtonStyle = (
const call = getOwn(calling.callsByConversation, conversation.id);
if (
call?.callMode === CallMode.Group &&
isAnybodyElseInGroupCall(call.peekInfo, ourUuid)
isAnybodyElseInGroupCall(call.peekInfo, ourACI)
) {
return OutgoingCallButtonStyle.Join;
}