diff --git a/native/components/user-profile.react.js b/native/components/user-profile.react.js index 5ef366568..3822029a8 100644 --- a/native/components/user-profile.react.js +++ b/native/components/user-profile.react.js @@ -1,117 +1,118 @@ // @flow import Clipboard from '@react-native-clipboard/clipboard'; import * as React from 'react'; import { View, Text, TouchableOpacity } from 'react-native'; -import type { AccountUserInfo } from 'lib/types/user-types'; +import { stringForUserExplicit } from 'lib/shared/user-utils.js'; +import type { UserInfo } from 'lib/types/user-types'; import sleep from 'lib/utils/sleep.js'; import SWMansionIcon from './swmansion-icon.react.js'; import UserAvatar from '../avatars/user-avatar.react.js'; import SingleLine from '../components/single-line.react.js'; import { useStyles } from '../themes/colors.js'; type Props = { - +userInfo: AccountUserInfo, + +userInfo: UserInfo, }; function UserProfile(props: Props): React.Node { const { userInfo } = props; + const usernameText = stringForUserExplicit(userInfo); + const [usernameCopied, setUsernameCopied] = React.useState(false); const styles = useStyles(unboundStyles); const onPressCopyUsername = React.useCallback(async () => { - Clipboard.setString(userInfo.username); + Clipboard.setString(usernameText); setUsernameCopied(true); await sleep(3000); setUsernameCopied(false); - }, [userInfo.username]); + }, [usernameText]); const copyUsernameButton = React.useMemo(() => { if (usernameCopied) { return ( Username copied! ); } return ( Copy username ); }, [ onPressCopyUsername, styles.copyUsernameContainer, styles.copyUsernameIcon, styles.copyUsernameText, usernameCopied, ]); return ( - - {userInfo.username} - + {usernameText} {copyUsernameButton} ); } const unboundStyles = { container: { paddingHorizontal: 16, }, moreIcon: { color: 'modalButtonLabel', alignSelf: 'flex-end', }, userInfoContainer: { flexDirection: 'row', }, usernameContainer: { flex: 1, justifyContent: 'center', alignItems: 'flex-start', paddingLeft: 16, }, usernameText: { color: 'modalForegroundLabel', fontSize: 18, fontWeight: '500', }, copyUsernameContainer: { flexDirection: 'row', justifyContent: 'center', paddingTop: 8, }, copyUsernameIcon: { color: 'purpleLink', marginRight: 4, }, copyUsernameText: { color: 'purpleLink', fontSize: 12, }, }; export default UserProfile;