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

isMuted -> isConversationMuted

Browse source
This commit is contained in:
Evan Hahn 2022-05-23 18:37:53 +00:00 • committed by GitHub
parent 3f0ed541f6
commit 28ab6e11f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 44 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ts/components/conversation/conversation-details/ConversationDetails.tsx
View file

@ -44,7 +44,7 @@ import type {
ReplaceAvatarActionType,
SaveAvatarToDiskActionType,
} from '../../../types/Avatar';
import { isMuted } from '../../../util/isMuted';
import { isConversationMuted } from '../../../util/isConversationMuted';
enum ModalState {
NothingOpen,
@ -305,7 +305,7 @@ export const ConversationDetails: React.ComponentType<Props> = ({
throw missingCaseError(modalState);
}
const isConversationMuted = isMuted(conversation.muteExpiresAt);
const isMuted = isConversationMuted(conversation);
return (
<div className="conversation-details-panel">
@ -348,11 +348,9 @@ export const ConversationDetails: React.ComponentType<Props> = ({
</>
)}
<Button
icon={
isConversationMuted ? ButtonIconType.muted : ButtonIconType.unmuted
}
icon={isMuted ? ButtonIconType.muted : ButtonIconType.unmuted}
onClick={() => {
if (isConversationMuted) {
if (isMuted) {
setModalState(ModalState.UnmuteNotifications);
} else {
setModalState(ModalState.MuteNotifications);
@ -360,7 +358,7 @@ export const ConversationDetails: React.ComponentType<Props> = ({
}}
variant={ButtonVariant.Details}
>
{isConversationMuted ? i18n('unmute') : i18n('mute')}
{isMuted ? i18n('unmute') : i18n('mute')}
</Button>
<Button
icon={ButtonIconType.search}

4
ts/components/conversation/conversation-details/ConversationNotificationsSettings.tsx
View file

@ -10,7 +10,7 @@ import { PanelSection } from './PanelSection';
import { PanelRow } from './PanelRow';
import { ConversationDetailsIcon, IconType } from './ConversationDetailsIcon';
import { Select } from '../../Select';
import { isMuted } from '../../../util/isMuted';
import { isConversationMuted } from '../../../util/isConversationMuted';
import { getMuteOptions } from '../../../util/getMuteOptions';
import { parseIntOrThrow } from '../../../util/parseIntOrThrow';
import { useUniqueId } from '../../../hooks/useUniqueId';
@ -40,7 +40,7 @@ export const ConversationNotificationsSettings: FunctionComponent<
const mentionsSelectId = useUniqueId();
const muteOptions = useMemo(
() => [
...(isMuted(muteExpiresAt)
...(isConversationMuted({ muteExpiresAt })
? []
: [
{