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

In conversation header, only show video button for group calls

Browse source
This commit is contained in:
Evan Hahn 2020-11-19 10:37:56 -06:00 • committed by Josh Perez
parent 07ff4c9dcb
commit 05205c77cf
4 changed files with 94 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,13 +3,20 @@
import { connect } from 'react-redux';
import { pick } from 'lodash';
import { ConversationHeader } from '../../components/conversation/ConversationHeader';
import {
ConversationHeader,
OutgoingCallButtonStyle,
} from '../../components/conversation/ConversationHeader';
import { getConversationSelector } from '../selectors/conversations';
import { StateType } from '../reducer';
import { CallMode } from '../../types/Calling';
import { getConversationCallMode } from '../ducks/conversations';
import {
ConversationType,
getConversationCallMode,
} from '../ducks/conversations';
import { getActiveCall } from '../ducks/calling';
import { getIntl } from '../selectors/user';
import { missingCaseError } from '../../util/missingCaseError';
export interface OwnProps {
id: string;
@ -32,17 +39,36 @@ export interface OwnProps {
onShowSafetyNumber: () => void;
}
const getOutgoingCallButtonStyle = (
conversation: ConversationType,
state: StateType
): OutgoingCallButtonStyle => {
if (getActiveCall(state.calling)) {
return OutgoingCallButtonStyle.None;
}
const conversationCallMode = getConversationCallMode(conversation);
switch (conversationCallMode) {
case CallMode.None:
return OutgoingCallButtonStyle.None;
case CallMode.Direct:
return OutgoingCallButtonStyle.Both;
case CallMode.Group:
if (!window.GROUP_CALLING) {
return OutgoingCallButtonStyle.None;
}
return OutgoingCallButtonStyle.JustVideo;
default:
throw missingCaseError(conversationCallMode);
}
};
const mapStateToProps = (state: StateType, ownProps: OwnProps) => {
const conversation = getConversationSelector(state)(ownProps.id);
if (!conversation) {
throw new Error('Could not find conversation');
}
const conversationCallMode = getConversationCallMode(conversation);
const conversationSupportsCalls =
conversationCallMode === CallMode.Direct ||
(conversationCallMode === CallMode.Group && window.GROUP_CALLING);
return {
...pick(conversation, [
'acceptedMessageRequest',
@ -66,7 +92,7 @@ const mapStateToProps = (state: StateType, ownProps: OwnProps) => {
]),
i18n: getIntl(state),
showBackButton: state.conversations.selectedConversationPanelDepth > 0,
showCallButtons: conversationSupportsCalls && !getActiveCall(state.calling),
outgoingCallButtonStyle: getOutgoingCallButtonStyle(conversation, state),
};
};