Skip to content

Hide message header when editing #7225

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

Merged
danieldoglas merged 3 commits into from
Jan 20, 2022
Merged

Hide message header when editing #7225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4fce77b
Conditional display of header
robertjchen Jan 14, 2022
58f7e4d
Merge branch 'main' of github.com:Expensify/App into robert-editBoxHi…
robertjchen Jan 17, 2022
2e950a0
Hide header when editing
robertjchen Jan 17, 2022
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
2 changes: 1 addition & 1 deletion src/pages/home/report/ReportActionItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ class ReportActionItem extends Component {
>
{!this.props.displayAsGroup
? (
<ReportActionItemSingle action={this.props.action}>
<ReportActionItemSingle action={this.props.action} showHeader={!this.props.draftMessage}>
{children}
</ReportActionItemSingle>
)
Expand Down
36 changes: 21 additions & 15 deletions src/pages/home/report/ReportActionItemSingle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,16 @@ const propTypes = {
/** Children view component for this action item */
children: PropTypes.node.isRequired,

/** Show header for action */
showHeader: PropTypes.bool,

...withLocalizePropTypes,
};

const defaultProps = {
personalDetails: {},
wrapperStyles: [styles.chatItem],
showHeader: true,
};

const showUserDetails = (email) => {
Expand Down Expand Up @@ -65,21 +69,23 @@ const ReportActionItemSingle = (props) => {
/>
</Pressable>
<View style={[styles.chatItemRight]}>
<View style={[styles.chatItemMessageHeader]}>
<Pressable style={[styles.flexShrink1]} onPress={() => showUserDetails(props.action.actorEmail)}>
{_.map(personArray, (fragment, index) => (
<ReportActionItemFragment
key={`person-${props.action.sequenceNumber}-${index}`}
fragment={fragment}
tooltipText={props.action.actorEmail}
isAttachment={props.action.isAttachment}
isLoading={props.action.loading}
isSingleLine
/>
))}
</Pressable>
<ReportActionItemDate timestamp={props.action.timestamp} />
</View>
{props.showHeader ? (
<View style={[styles.chatItemMessageHeader]}>
<Pressable style={[styles.flexShrink1]} onPress={() => showUserDetails(props.action.actorEmail)}>
{_.map(personArray, (fragment, index) => (
<ReportActionItemFragment
key={`person-${props.action.sequenceNumber}-${index}`}
fragment={fragment}
tooltipText={props.action.actorEmail}
isAttachment={props.action.isAttachment}
isLoading={props.action.loading}
isSingleLine
/>
))}
</Pressable>
<ReportActionItemDate timestamp={props.action.timestamp} />
</View>
) : null}
{props.children}
</View>
</View>
Expand Down