Discriminator in username

ts/state/smart/ProfileEditorModal.tsx

@@ -0,0 +1,68 @@
+// Copyright 2021-2022 Signal Messenger, LLC
+// SPDX-License-Identifier: AGPL-3.0-only
+
+import React from 'react';
+
+import { connect } from 'react-redux';
+import { mapDispatchToProps } from '../actions';
+import type { PropsDataType as ProfileEditorModalPropsType } from '../../components/ProfileEditorModal';
+import { ProfileEditorModal } from '../../components/ProfileEditorModal';
+import type { PropsDataType } from '../../components/ProfileEditor';
+import { SmartEditUsernameModalBody } from './EditUsernameModalBody';
+import type { StateType } from '../reducer';
+import { getIntl } from '../selectors/user';
+import { getEmojiSkinTone, getUsernamesEnabled } from '../selectors/items';
+import { getMe } from '../selectors/conversations';
+import { selectRecentEmojis } from '../selectors/emojis';
+import { getUsernameEditState } from '../selectors/username';
+
+function renderEditUsernameModalBody(props: {
+  onClose: () => void;
+}): JSX.Element {
+  return <SmartEditUsernameModalBody {...props} />;
+}
+
+function mapStateToProps(
+  state: StateType
+): Omit<PropsDataType, 'onEditStateChange' | 'onProfileChanged'> &
+  ProfileEditorModalPropsType {
+  const {
+    profileAvatarPath,
+    avatars: userAvatarData = [],
+    aboutText,
+    aboutEmoji,
+    color,
+    firstName,
+    familyName,
+    id: conversationId,
+    username,
+  } = getMe(state);
+  const recentEmojis = selectRecentEmojis(state);
+  const skinTone = getEmojiSkinTone(state);
+  const isUsernameFlagEnabled = getUsernamesEnabled(state);
+  const usernameEditState = getUsernameEditState(state);
+
+  return {
+    aboutEmoji,
+    aboutText,
+    profileAvatarPath,
+    color,
+    conversationId,
+    familyName,
+    firstName: String(firstName),
+    hasError: state.globalModals.profileEditorHasError,
+    i18n: getIntl(state),
+    isUsernameFlagEnabled,
+    recentEmojis,
+    skinTone,
+    userAvatarData,
+    username,
+    usernameEditState,
+
+    renderEditUsernameModalBody,
+  };
+}
+
+const smart = connect(mapStateToProps, mapDispatchToProps);
+
+export const SmartProfileEditorModal = smart(ProfileEditorModal);