Skip to content

Commit

Permalink
Merge pull request #22460 from c3024/22051-move-headerMessage-in-Sear…
Browse files Browse the repository at this point in the history
…chPage-inside-render

move headerMessage in SearchPage inside render
  • Loading branch information
yuwenmemon authored Jul 11, 2023
2 parents 9584980 + 76f69ee commit 702d8e2
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions src/pages/SearchPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ class SearchPage extends Component {

this.state = {
searchValue: '',
headerMessage: '',
recentReports,
personalDetails,
userToInvite,
Expand Down Expand Up @@ -129,14 +128,10 @@ class SearchPage extends Component {
this.state.searchValue.trim(),
this.props.betas,
);
this.setState((prevState) => {
const headerMessage = OptionsListUtils.getHeaderMessage(recentReports.length + personalDetails.length !== 0, Boolean(userToInvite), prevState.searchValue);
return {
headerMessage,
userToInvite,
recentReports,
personalDetails,
};
this.setState({
userToInvite,
recentReports,
personalDetails,
});
}

Expand Down Expand Up @@ -167,6 +162,11 @@ class SearchPage extends Component {
render() {
const sections = this.getSections();
const isOptionsDataReady = ReportUtils.isReportDataReady() && OptionsListUtils.isPersonalDetailsReady(this.props.personalDetails);
const headerMessage = OptionsListUtils.getHeaderMessage(
this.state.recentReports.length + this.state.personalDetails.length !== 0,
Boolean(this.state.userToInvite),
this.state.searchValue,
);

return (
<ScreenWrapper includeSafeAreaPaddingBottom={false}>
Expand All @@ -179,7 +179,7 @@ class SearchPage extends Component {
value={this.state.searchValue}
onSelectRow={this.selectReport}
onChangeText={this.onChangeText}
headerMessage={this.state.headerMessage}
headerMessage={headerMessage}
hideSectionHeaders
showTitleTooltip
shouldShowOptions={didScreenTransitionEnd && isOptionsDataReady}
Expand Down

0 comments on commit 702d8e2

Please sign in to comment.