From c017e381cd80b1bd7a0c6bb49555de907065bb8d Mon Sep 17 00:00:00 2001
From: automated-signal <37887102+automated-signal@users.noreply.github.com>
Date: Tue, 8 Oct 2024 16:55:25 -0500
Subject: [PATCH] Simplify about string logic

Co-authored-by: trevor-signal <131492920+trevor-signal@users.noreply.github.com>
---
 ts/components/ProfileEditor.tsx        | 29 --------------
 ts/test-node/util/getAboutText_test.ts | 53 --------------------------
 ts/util/getAboutText.ts                | 14 ++-----
 3 files changed, 3 insertions(+), 93 deletions(-)
 delete mode 100644 ts/test-node/util/getAboutText_test.ts

diff --git a/ts/components/ProfileEditor.tsx b/ts/components/ProfileEditor.tsx
index 89bbc34f8..25ff7b321 100644
--- a/ts/components/ProfileEditor.tsx
+++ b/ts/components/ProfileEditor.tsx
@@ -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}
diff --git a/ts/test-node/util/getAboutText_test.ts b/ts/test-node/util/getAboutText_test.ts
deleted file mode 100644
index 850a143ff..000000000
--- a/ts/test-node/util/getAboutText_test.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2024 Signal Messenger, LLC
-// SPDX-License-Identifier: AGPL-3.0-only
-
-import { assert } from 'chai';
-
-import enMessages from '../../../_locales/en/messages.json';
-import { getAboutText } from '../../util/getAboutText';
-import { setupI18n } from '../../util/setupI18n';
-
-const i18n = setupI18n('en', enMessages);
-
-describe('getAboutText', () => {
-  it('returns undefined when there is no text', () => {
-    assert.isUndefined(getAboutText({}, i18n));
-  });
-
-  it('returns text when there is text, but not emoji', () => {
-    assert.strictEqual(
-      getAboutText(
-        {
-          about: 'hello',
-        },
-        i18n
-      ),
-      'hello'
-    );
-  });
-
-  it('returns text and emoji', () => {
-    assert.strictEqual(
-      getAboutText(
-        {
-          about: 'hello',
-          aboutEmoji: '😁',
-        },
-        i18n
-      ),
-      '😁 hello'
-    );
-  });
-
-  it('simplifies text', () => {
-    assert.strictEqual(
-      getAboutText(
-        {
-          about: '✓✔☑√⛉⛊⛛hello',
-        },
-        i18n
-      ),
-      'hello'
-    );
-  });
-});
diff --git a/ts/util/getAboutText.ts b/ts/util/getAboutText.ts
index eb7f6e5e9..914039c9e 100644
--- a/ts/util/getAboutText.ts
+++ b/ts/util/getAboutText.ts
@@ -1,20 +1,12 @@
 // Copyright 2023 Signal Messenger, LLC
 // SPDX-License-Identifier: AGPL-3.0-only
 
-import type { LocalizerType } from '../types/Util';
 import type { ConversationAttributesType } from '../model-types';
 
-export function sanitizeAboutText(
-  text: string | undefined
-): string | undefined {
-  return text?.replace(/[✓✔☑√⛉⛊⛛]/g, '');
-}
-
 export function getAboutText(
-  attributes: Pick<ConversationAttributesType, 'about' | 'aboutEmoji'>,
-  i18n: LocalizerType = window.i18n
+  attributes: Pick<ConversationAttributesType, 'about' | 'aboutEmoji'>
 ): string | undefined {
-  const text = sanitizeAboutText(attributes.about);
+  const text = attributes.about;
 
   if (!text) {
     return undefined;
@@ -26,7 +18,7 @@ export function getAboutText(
     return text;
   }
 
-  return i18n('icu:message--getNotificationText--text-with-emoji', {
+  return window.i18n('icu:message--getNotificationText--text-with-emoji', {
     text,
     emoji,
   });