Control UI visibility in ProfileEditor

This commit is contained in:
Fedor Indutny 2024-02-14 12:30:32 -08:00 committed by GitHub
parent 0fe797e511
commit 9b98e20a8c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 29 additions and 1 deletions

View file

@ -5683,6 +5683,10 @@
"messageformat": "Delete", "messageformat": "Delete",
"description": "Shown in dialog button if user has saved an empty string to delete their username" "description": "Shown in dialog button if user has saved an empty string to delete their username"
}, },
"icu:ProfileEditor--username--delete-unavailable-notice": {
"messageformat": "To delete your username, open Signal on your phone and navigate to Settings > Profile.",
"description": "Shown in dialog body if user is trying to delete username, but it is only supported on mobile"
},
"icu:ProfileEditor--username--context-menu": { "icu:ProfileEditor--username--context-menu": {
"messageformat": "Copy or delete username", "messageformat": "Copy or delete username",
"description": "Shown as aria label for context menu next to username" "description": "Shown as aria label for context menu next to username"

View file

@ -44,6 +44,9 @@ export default {
usernameLinkCorrupted: { usernameLinkCorrupted: {
control: 'boolean', control: 'boolean',
}, },
isUsernameDeletionEnabled: {
control: 'boolean',
},
}, },
args: { args: {
aboutEmoji: '', aboutEmoji: '',
@ -60,6 +63,7 @@ export default {
usernameLinkColor: Proto.AccountRecord.UsernameLink.Color.PURPLE, usernameLinkColor: Proto.AccountRecord.UsernameLink.Color.PURPLE,
usernameEditState: UsernameEditState.Editing, usernameEditState: UsernameEditState.Editing,
usernameLinkState: UsernameLinkState.Ready, usernameLinkState: UsernameLinkState.Ready,
isUsernameDeletionEnabled: true,
recentEmojis: [], recentEmojis: [],
skinTone: 0, skinTone: 0,

View file

@ -88,6 +88,7 @@ export type PropsDataType = {
usernameLinkColor?: number; usernameLinkColor?: number;
usernameLink?: string; usernameLink?: string;
usernameLinkCorrupted: boolean; usernameLinkCorrupted: boolean;
isUsernameDeletionEnabled: boolean;
} & Pick<EmojiButtonProps, 'recentEmojis' | 'skinTone'>; } & Pick<EmojiButtonProps, 'recentEmojis' | 'skinTone'>;
type PropsActionType = { type PropsActionType = {
@ -175,6 +176,7 @@ export function ProfileEditor({
usernameLinkColor, usernameLinkColor,
usernameLink, usernameLink,
usernameLinkCorrupted, usernameLinkCorrupted,
isUsernameDeletionEnabled,
}: PropsType): JSX.Element { }: PropsType): JSX.Element {
const focusInputRef = useRef<HTMLInputElement | null>(null); const focusInputRef = useRef<HTMLInputElement | null>(null);
const [editState, setEditState] = useState<EditState>(initialEditState); const [editState, setEditState] = useState<EditState>(initialEditState);
@ -208,6 +210,7 @@ export function ProfileEditor({
firstName, firstName,
}); });
const [isResettingUsername, setIsResettingUsername] = useState(false); const [isResettingUsername, setIsResettingUsername] = useState(false);
const [isUsernameNoticeVisible, setIsUsernameNoticeVisible] = useState(false);
const [isResettingUsernameLink, setIsResettingUsernameLink] = useState(false); const [isResettingUsernameLink, setIsResettingUsernameLink] = useState(false);
// Reset username edit state when leaving // Reset username edit state when leaving
@ -567,7 +570,11 @@ export function ProfileEditor({
icon: 'ProfileEditor__username-menu__trash-icon', icon: 'ProfileEditor__username-menu__trash-icon',
label: i18n('icu:ProfileEditor--username--delete'), label: i18n('icu:ProfileEditor--username--delete'),
onClick: () => { onClick: () => {
if (isUsernameDeletionEnabled) {
setUsernameEditState(UsernameEditState.ConfirmingDelete); setUsernameEditState(UsernameEditState.ConfirmingDelete);
} else {
setIsUsernameNoticeVisible(true);
}
}, },
}, },
]; ];
@ -760,6 +767,17 @@ export function ProfileEditor({
</ConfirmationDialog> </ConfirmationDialog>
)} )}
{isUsernameNoticeVisible && (
<ConfirmationDialog
dialogName="ProfileEditor.confirmDeleteUsername"
i18n={i18n}
onClose={() => setIsUsernameNoticeVisible(false)}
cancelText={i18n('icu:ok')}
>
{i18n('icu:ProfileEditor--username--delete-unavailable-notice')}
</ConfirmationDialog>
)}
{confirmDiscardAction && ( {confirmDiscardAction && (
<ConfirmDiscardDialog <ConfirmDiscardDialog
i18n={i18n} i18n={i18n}

View file

@ -18,6 +18,7 @@ import {
getUsernameLinkColor, getUsernameLinkColor,
getUsernameLink, getUsernameLink,
getUsernameLinkCorrupted, getUsernameLinkCorrupted,
isInternalUser,
} from '../selectors/items'; } from '../selectors/items';
import { getMe } from '../selectors/conversations'; import { getMe } from '../selectors/conversations';
import { selectRecentEmojis } from '../selectors/emojis'; import { selectRecentEmojis } from '../selectors/emojis';
@ -81,6 +82,7 @@ function mapStateToProps(
usernameLinkColor, usernameLinkColor,
usernameLinkCorrupted, usernameLinkCorrupted,
usernameLink, usernameLink,
isUsernameDeletionEnabled: isInternalUser(state),
renderEditUsernameModalBody, renderEditUsernameModalBody,
}; };