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

Several text formatting fixes

Browse source
This commit is contained in:
Scott Nonnenberg 2023-04-17 18:16:41 -07:00 • committed by GitHub
parent f93b4235d5
commit 5395741f11
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 72 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

15
ts/state/smart/StoryViewer.tsx
View file

@ -16,6 +16,7 @@ import {
getEmojiSkinTone,
getHasStoryViewReceiptSetting,
getPreferredReactionEmoji,
getTextFormattingEnabled,
isInternalUser,
} from '../selectors/items';
import { getIntl, getPlatform } from '../selectors/user';
@ -40,8 +41,8 @@ import { useGlobalModalActions } from '../ducks/globalModals';
import { useStoriesActions } from '../ducks/stories';
import { useIsWindowActive } from '../../hooks/useIsWindowActive';
import {
getIsFormattingEnabled,
getIsFormattingSpoilersEnabled,
getIsFormattingFlagEnabled,
getIsFormattingSpoilersFlagEnabled,
} from '../selectors/composer';
export function SmartStoryViewer(): JSX.Element | null {
@ -93,10 +94,12 @@ export function SmartStoryViewer(): JSX.Element | null {
getHasStoryViewReceiptSetting
);
const isFormattingEnabled = useSelector(getIsFormattingEnabled);
const isFormattingSpoilersEnabled = useSelector(
getIsFormattingSpoilersEnabled
);
const isFormattingOptionEnabled = useSelector(getTextFormattingEnabled);
const isFormattingEnabled =
useSelector(getIsFormattingFlagEnabled) && isFormattingOptionEnabled;
const isFormattingSpoilersEnabled =
useSelector(getIsFormattingSpoilersFlagEnabled) &&
isFormattingOptionEnabled;
const { pauseVoiceNotePlayer } = useAudioPlayerActions();