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

Simplify about string logic

Browse source
This commit is contained in:
trevor-signal 2024-10-07 23:15:50 -04:00 • committed by GitHub
parent 25d206e4f7
commit c1b5811c39
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 3 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

29
ts/components/ProfileEditor.tsx
View file

@ -36,7 +36,6 @@ import type { ShowToastAction } from '../state/ducks/toast';
import { getEmojiData, unifiedToEmoji } from './emoji/lib';
import { assertDev } from '../util/assert';
import { missingCaseError } from '../util/missingCaseError';
import { sanitizeAboutText } from '../util/getAboutText';
import { ConfirmationDialog } from './ConfirmationDialog';
import { ContextMenu } from './ContextMenu';
import { UsernameLinkModalBody } from './UsernameLinkModalBody';
@ -210,7 +209,6 @@ export function ProfileEditor({
});
const [isResettingUsername, setIsResettingUsername] = useState(false);
const [isResettingUsernameLink, setIsResettingUsernameLink] = useState(false);
const [isInvalidAboutText, setIsInvalidAboutText] = useState(false);
// Reset username edit state when leaving
useEffect(() => {
@ -497,14 +495,6 @@ export function ProfileEditor({
<Button
disabled={shouldDisableSave}
onClick={() => {
if (
sanitizeAboutText(stagedProfile.aboutText) !==
stagedProfile.aboutText
) {
setIsInvalidAboutText(true);
return;
}
setFullBio({
aboutEmoji: stagedProfile.aboutEmoji,
aboutText: stagedProfile.aboutText,
@ -778,25 +768,6 @@ export function ProfileEditor({
/>
)}
{isInvalidAboutText && (
<ConfirmationDialog
dialogName="ProfileEditorModal.invalidAboutText"
title={i18n('icu:ProfileEditor__invalid-about__title')}
cancelButtonVariant={ButtonVariant.Primary}
cancelText={i18n('icu:Confirmation--confirm')}
i18n={i18n}
onClose={() => {
setStagedProfile(profileData => ({
...profileData,
aboutText: sanitizeAboutText(profileData?.aboutText),
}));
setIsInvalidAboutText(false);
}}
>
{i18n('icu:ProfileEditor__invalid-about__body')}
</ConfirmationDialog>
)}
{isResettingUsernameLink && (
<ConfirmationDialog
i18n={i18n}