Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Feat #23131] Display status on user page #24330

Merged
merged 9 commits into from
Aug 11, 2023
Merged

[Feat #23131] Display status on user page #24330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
efd5323
Merge branch 'main' of https://github.com/margelo/expensify-app-fork
perunt Aug 6, 2023
4c5aab5
Merge branch 'main' of https://github.com/margelo/expensify-app-fork
perunt Aug 7, 2023
939afdb
Merge branch 'main' of https://github.com/Expensify/App
perunt Aug 9, 2023
cf2f55b
fix saving empty status
perunt Aug 9, 2023
fe48a9b
add status line
perunt Aug 9, 2023
5eb0e86
add tooltip for status
perunt Aug 9, 2023
72c1ef0
center the position of the tooltip
perunt Aug 9, 2023
a722da7
refactor conditional rendering from ternary to logical AND
perunt Aug 9, 2023
5fb31e7
add translations and use betas flag
perunt Aug 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/CONST.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2532,6 +2532,7 @@ const CONST = {
SCAN: 'scan',
DISTANCE: 'distance',
},
STATUS_TEXT_MAX_LENGTH: 100,
};

export default CONST;
21 changes: 21 additions & 0 deletions src/pages/ProfilePage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import * as Illustrations from '../components/Icon/Illustrations';
import variables from '../styles/variables';
import ROUTES from '../ROUTES';
import * as ValidationUtils from '../libs/ValidationUtils';
import Permissions from '../libs/Permissions';

const matchType = PropTypes.shape({
params: PropTypes.shape({
Expand Down Expand Up @@ -133,6 +134,11 @@ function ProfilePage(props) {
// If the API returns an error for some reason there won't be any details and isLoading will get set to false, so we want to show a blocking screen
const shouldShowBlockingView = !hasMinimumDetails && !isLoading;

const statusEmojiCode = lodashGet(details, 'status.emojiCode', '');
const statusText = lodashGet(details, 'status.text', '');
const hasStatus = !!statusEmojiCode && Permissions.canUseCustomStatus(props.betas);
const statusContent = `${statusEmojiCode} ${statusText}`;

return (
<ScreenWrapper>
<HeaderWithBackButton
Expand Down Expand Up @@ -178,6 +184,18 @@ function ProfilePage(props) {
{displayName}
</Text>
)}
{hasStatus && (
perunt marked this conversation as resolved.
Show resolved Hide resolved
<View style={[styles.mb6, styles.detailsPageSectionContainer, styles.mw100]}>
<Text
style={[styles.textLabelSupporting, styles.mb1]}
numberOfLines={1}
>
{props.translate('statusPage.status')}
</Text>
<Text>{statusContent}</Text>
</View>
)}

{login ? (
<View style={[styles.mb6, styles.detailsPageSectionContainer, styles.w100]}>
<Text
Expand Down Expand Up @@ -248,5 +266,8 @@ export default compose(
isLoadingReportData: {
key: ONYXKEYS.IS_LOADING_REPORT_DATA,
},
betas: {
key: ONYXKEYS.BETAS,
},
}),
)(ProfilePage);
8 changes: 4 additions & 4 deletions src/pages/settings/Profile/CustomStatus/StatusPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,16 @@ function StatusPage({draftStatus, currentUserPersonalDetails}) {
const draftText = lodashGet(draftStatus, 'text');

const defaultEmoji = draftEmojiCode || currentUserEmojiCode;
const defaultText = draftText || currentUserStatusText;
const customStatus = defaultEmoji ? `${defaultEmoji} ${defaultText}` : '';
const defaultText = draftEmojiCode ? draftText : currentUserStatusText;
const customStatus = draftEmojiCode ? `${draftEmojiCode} ${draftText}` : `${currentUserEmojiCode || ''} ${currentUserStatusText || ''}`;
const hasDraftStatus = !!draftEmojiCode || !!draftText;

const updateStatus = useCallback(() => {
const endOfDay = moment().endOf('day').toDate();
User.updateCustomStatus({text: defaultText, emojiCode: defaultEmoji, clearAfter: endOfDay.toISOString()});

User.clearDraftCustomStatus();
Navigation.goBack(ROUTES.SETTINGS);
Navigation.goBack(ROUTES.SETTINGS_PROFILE);
}, [defaultText, defaultEmoji]);

const clearStatus = () => {
Expand Down Expand Up @@ -78,7 +78,7 @@ function StatusPage({draftStatus, currentUserPersonalDetails}) {
</View>
<MenuItemWithTopDescription
title={customStatus}
description="Status"
description={localize.translate('statusPage.status')}
shouldShowRightIcon
inputID="test"
onPress={() => Navigation.navigate(ROUTES.SETTINGS_STATUS_SET)}
Expand Down
6 changes: 3 additions & 3 deletions src/pages/settings/Profile/CustomStatus/StatusSetPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ function StatusSetPage({draftStatus, currentUserPersonalDetails}) {
const defaultText = lodashGet(draftStatus, 'text') || lodashGet(currentUserPersonalDetails, 'status.text', '');

const onSubmit = (value) => {
User.updateDraftCustomStatus({text: value.statusText, emojiCode: value.emojiCode});
User.updateDraftCustomStatus({text: value.statusText.trim(), emojiCode: value.emojiCode});
Navigation.goBack(ROUTES.SETTINGS_STATUS);
};

Expand All @@ -55,7 +55,7 @@ function StatusSetPage({draftStatus, currentUserPersonalDetails}) {
<Form
formID={ONYXKEYS.FORMS.SETTINGS_STATUS_SET_FORM}
style={[styles.flexGrow1, styles.ph5]}
submitButtonText="Save"
submitButtonText={translate('statusPage.save')}
onSubmit={onSubmit}
enabledWhenOffline
>
Expand All @@ -74,7 +74,7 @@ function StatusSetPage({draftStatus, currentUserPersonalDetails}) {
accessibilityLabel={INPUT_IDS.STATUS_TEXT}
accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
defaultValue={defaultText}
maxLength={100}
maxLength={CONST.STATUS_TEXT_MAX_LENGTH}
autoFocus
shouldDelayFocus
/>
Expand Down