Display status emojis in the LHN (including the user's own status) #24414
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| /* eslint-disable rulesdir/onyx-props-must-have-default */ | ||
| import React, {useCallback} from 'react'; | ||
| import {View} from 'react-native'; | ||
| import PropTypes from 'prop-types'; | ||
| import PressableWithoutFeedback from '../../../components/Pressable/PressableWithoutFeedback'; | ||
| import Text from '../../../components/Text'; | ||
| import PressableAvatarWithIndicator from './PressableAvatarWithIndicator'; | ||
| import Navigation from '../../../libs/Navigation/Navigation'; | ||
| import useLocalize from '../../../hooks/useLocalize'; | ||
| import styles from '../../../styles/styles'; | ||
| import ROUTES from '../../../ROUTES'; | ||
| import CONST from '../../../CONST'; | ||
|
|
||
| const propTypes = { | ||
| /** Whether the create menu is open or not */ | ||
| isCreateMenuOpen: PropTypes.bool, | ||
|
|
||
| /** Emoji status */ | ||
| emojiStatus: PropTypes.string, | ||
| }; | ||
|
|
||
| const defaultProps = { | ||
| isCreateMenuOpen: false, | ||
| emojiStatus: '', | ||
| }; | ||
|
|
||
| function AvatarWithOptionalStatus({emojiStatus, isCreateMenuOpen}) { | ||
| const {translate} = useLocalize(); | ||
|
|
||
| const showStatusPage = useCallback(() => { | ||
| if (isCreateMenuOpen) { | ||
| // Prevent opening Settings page when click profile avatar quickly after clicking FAB icon | ||
| return; | ||
| } | ||
|
|
||
| Navigation.setShouldPopAllStateOnUP(); | ||
| Navigation.navigate(ROUTES.SETTINGS_STATUS); | ||
| }, [isCreateMenuOpen]); | ||
|
|
||
| return ( | ||
| <View style={styles.sidebarStatusAvatarContainer}> | ||
| <PressableWithoutFeedback | ||
| accessibilityLabel={translate('sidebarScreen.buttonMySettings')} | ||
| accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON} | ||
| onPress={showStatusPage} | ||
| style={styles.flex1} | ||
| > | ||
| <View style={styles.sidebarStatusAvatar}> | ||
| <Text | ||
| style={styles.emojiStatusLHN} | ||
| numberOfLines={1} | ||
| > | ||
| {emojiStatus} | ||
| </Text> | ||
| </View> | ||
| </PressableWithoutFeedback> | ||
| <PressableAvatarWithIndicator isCreateMenuOpen={isCreateMenuOpen} /> | ||
| </View> | ||
| ); | ||
| } | ||
|
|
||
| AvatarWithOptionalStatus.propTypes = propTypes; | ||
| AvatarWithOptionalStatus.defaultProps = defaultProps; | ||
| AvatarWithOptionalStatus.displayName = 'AvatarWithOptionalStatus'; | ||
| export default AvatarWithOptionalStatus; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| /* eslint-disable rulesdir/onyx-props-must-have-default */ | ||
| import lodashGet from 'lodash/get'; | ||
| import React, {useCallback} from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
| import withCurrentUserPersonalDetails from '../../../components/withCurrentUserPersonalDetails'; | ||
| import PressableWithoutFeedback from '../../../components/Pressable/PressableWithoutFeedback'; | ||
| import AvatarWithIndicator from '../../../components/AvatarWithIndicator'; | ||
| import OfflineWithFeedback from '../../../components/OfflineWithFeedback'; | ||
| import Navigation from '../../../libs/Navigation/Navigation'; | ||
| import * as UserUtils from '../../../libs/UserUtils'; | ||
| import useLocalize from '../../../hooks/useLocalize'; | ||
| import ROUTES from '../../../ROUTES'; | ||
| import CONST from '../../../CONST'; | ||
| import personalDetailsPropType from '../../personalDetailsPropType'; | ||
|
|
||
| const propTypes = { | ||
| /** Whether the create menu is open or not */ | ||
| isCreateMenuOpen: PropTypes.bool, | ||
|
|
||
| /** The personal details of the person who is logged in */ | ||
| currentUserPersonalDetails: personalDetailsPropType, | ||
| }; | ||
|
|
||
| const defaultProps = { | ||
| isCreateMenuOpen: false, | ||
| currentUserPersonalDetails: { | ||
| pendingFields: {avatar: ''}, | ||
| accountID: '', | ||
| avatar: '', | ||
| }, | ||
| }; | ||
|
|
||
| function PressableAvatarWithIndicator({isCreateMenuOpen, currentUserPersonalDetails}) { | ||
| const {translate} = useLocalize(); | ||
|
|
||
| const showSettingsPage = useCallback(() => { | ||
| if (isCreateMenuOpen) { | ||
| // Prevent opening Settings page when click profile avatar quickly after clicking FAB icon | ||
| return; | ||
| } | ||
|
|
||
| Navigation.navigate(ROUTES.SETTINGS); | ||
| }, [isCreateMenuOpen]); | ||
|
|
||
| return ( | ||
| <PressableWithoutFeedback | ||
| accessibilityLabel={translate('sidebarScreen.buttonMySettings')} | ||
| accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON} | ||
| onPress={showSettingsPage} | ||
| > | ||
| <OfflineWithFeedback pendingAction={lodashGet(currentUserPersonalDetails, 'pendingFields.avatar', null)}> | ||
| <AvatarWithIndicator | ||
| source={UserUtils.getAvatar(currentUserPersonalDetails.avatar, currentUserPersonalDetails.accountID)} | ||
| tooltipText={translate('common.settings')} | ||
| /> | ||
| </OfflineWithFeedback> | ||
| </PressableWithoutFeedback> | ||
| ); | ||
| } | ||
|
|
||
| PressableAvatarWithIndicator.propTypes = propTypes; | ||
| PressableAvatarWithIndicator.defaultProps = defaultProps; | ||
|
perunt marked this conversation as resolved.
|
||
| PressableAvatarWithIndicator.displayName = 'PressableAvatarWithIndicator'; | ||
| export default withCurrentUserPersonalDetails(PressableAvatarWithIndicator); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,31 +14,26 @@ import Navigation from '../../../libs/Navigation/Navigation'; | |
| import ROUTES from '../../../ROUTES'; | ||
| import Icon from '../../../components/Icon'; | ||
| import * as Expensicons from '../../../components/Icon/Expensicons'; | ||
| import Tooltip from '../../../components/Tooltip'; | ||
| import CONST from '../../../CONST'; | ||
| import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize'; | ||
| import * as App from '../../../libs/actions/App'; | ||
| import withWindowDimensions from '../../../components/withWindowDimensions'; | ||
| import LHNOptionsList from '../../../components/LHNOptionsList/LHNOptionsList'; | ||
| import SidebarUtils from '../../../libs/SidebarUtils'; | ||
| import Header from '../../../components/Header'; | ||
| import defaultTheme from '../../../styles/themes/default'; | ||
| import OptionsListSkeletonView from '../../../components/OptionsListSkeletonView'; | ||
| import variables from '../../../styles/variables'; | ||
| import LogoComponent from '../../../../assets/images/expensify-wordmark.svg'; | ||
| import PressableWithoutFeedback from '../../../components/Pressable/PressableWithoutFeedback'; | ||
| import * as Session from '../../../libs/actions/Session'; | ||
| import KeyboardShortcut from '../../../libs/KeyboardShortcut'; | ||
| import onyxSubscribe from '../../../libs/onyxSubscribe'; | ||
| import * as ReportActionContextMenu from '../report/ContextMenu/ReportActionContextMenu'; | ||
| import withCurrentReportID from '../../../components/withCurrentReportID'; | ||
| import OptionRowLHNData from '../../../components/LHNOptionsList/OptionRowLHNData'; | ||
| import SignInOrAvatarWithOptionalStatus from './SignInOrAvatarWithOptionalStatus'; | ||
|
|
||
| const basePropTypes = { | ||
| /** Toggles the navigation menu open and closed */ | ||
|
|
@@ -58,8 +53,6 @@ const propTypes = { | |
|
|
||
| isLoading: PropTypes.bool.isRequired, | ||
|
|
||
| priorityMode: PropTypes.oneOf(_.values(CONST.PRIORITY_MODE)), | ||
|
|
||
| /** The top most report id */ | ||
|
|
@@ -75,9 +68,6 @@ const propTypes = { | |
| }; | ||
|
|
||
| const defaultProps = { | ||
| priorityMode: CONST.PRIORITY_MODE.DEFAULT, | ||
| currentReportID: '', | ||
| report: {}, | ||
|
|
@@ -88,7 +78,6 @@ class SidebarLinks extends React.PureComponent { | |
| super(props); | ||
|
|
||
| this.showSearchPage = this.showSearchPage.bind(this); | ||
| this.showReportPage = this.showReportPage.bind(this); | ||
|
|
||
| if (this.props.isSmallScreenWidth) { | ||
|
|
@@ -147,15 +136,6 @@ class SidebarLinks extends React.PureComponent { | |
| Navigation.navigate(ROUTES.SEARCH); | ||
| } | ||
|
|
||
| /** | ||
| * Show Report page with selected report id | ||
| * | ||
|
|
@@ -204,29 +184,7 @@ class SidebarLinks extends React.PureComponent { | |
| <Icon src={Expensicons.MagnifyingGlass} /> | ||
| </PressableWithoutFeedback> | ||
| </Tooltip> | ||
| <SignInOrAvatarWithOptionalStatus isCreateMenuOpen={this.props.isCreateMenuOpen} /> | ||
|
Contributor
There was a problem hiding this comment. @perunt could you elaborate where does
Contributor
Author
There was a problem hiding this comment. Hmm, tbh I didn't dig where it comes from but now I can see that it was undefined
Contributor
There was a problem hiding this comment. Ok thanks for the input. |
||
| </View> | ||
| {this.props.isLoading ? ( | ||
| <> | ||
|
|
@@ -258,7 +216,6 @@ SidebarLinks.propTypes = propTypes; | |
| SidebarLinks.defaultProps = defaultProps; | ||
| export default compose( | ||
| withLocalize, | ||
| withWindowDimensions, | ||
| withCurrentReportID, | ||
| withOnyx({ | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.