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

Fix call link delete to require inactive call

Browse source
This commit is contained in:
ayumi-signal 2024-10-18 13:19:45 -07:00 • committed by GitHub
parent 902c1f4634
commit 3f8b8bdb2d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 98 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ts/components/CallLinkDetails.tsx
View file

@ -33,6 +33,7 @@ export type CallLinkDetailsProps = Readonly<{
callHistoryGroup: CallHistoryGroup;
callLink: CallLinkType | undefined;
isAnybodyInCall: boolean;
isCallActiveOnServer: boolean;
isInCall: boolean;
isInAnotherCall: boolean;
i18n: LocalizerType;
@ -48,6 +49,7 @@ export function CallLinkDetails({
callLink,
i18n,
isAnybodyInCall,
isCallActiveOnServer,
isInCall,
isInAnotherCall,
onDeleteCallLink,
@ -88,7 +90,7 @@ export function CallLinkDetails({
);
const callLinkRestrictionsSelect = (
<CallLinkRestrictionsSelect
disabled={isAnybodyInCall}
disabled={isCallActiveOnServer}
i18n={i18n}
value={callLink.restrictions}
onChange={onUpdateCallLinkRestrictions}
@ -159,7 +161,7 @@ export function CallLinkDetails({
}
label={i18n('icu:CallLinkDetails__ApproveAllMembersLabel')}
right={
isAnybodyInCall ? (
isCallActiveOnServer ? (
<Tooltip
className="CallLinkDetails__ApproveAllMembersDisabledTooltip"
content={i18n(
@ -207,9 +209,9 @@ export function CallLinkDetails({
className={classNames({
CallLinkDetails__DeleteLink: true,
'CallLinkDetails__DeleteLink--disabled-for-active-call':
isAnybodyInCall,
isCallActiveOnServer,
})}
disabled={isAnybodyInCall}
disabled={isCallActiveOnServer}
icon={
<ConversationDetailsIcon
ariaLabel={i18n('icu:CallLinkDetails__DeleteLink')}
@ -217,7 +219,7 @@ export function CallLinkDetails({
/>
}
label={
isAnybodyInCall ? (
isCallActiveOnServer ? (
<Tooltip
className="CallLinkDetails__DeleteLinkTooltip"
content={i18n(