Skip to content

Fix Static emoji autosuggestion issues #15871

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
luacmartins merged 3 commits into from
Mar 13, 2023
Merged

Fix Static emoji autosuggestion issues #15871

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
f668cce
Escape prefix
fedirjh Mar 11, 2023
5be9a94
Fix scoping issue
fedirjh Mar 11, 2023
772cf30
fix undefined returned value
fedirjh Mar 12, 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
4 changes: 3 additions & 1 deletion src/libs/GetStyledTextArray.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import Str from 'expensify-common/lib/str';

/**
* Render a suggestion menu item component.
* @param {String} name
Expand All @@ -6,7 +8,7 @@
*/
const getStyledTextArray = (name, prefix) => {
const texts = [];
const prefixLocation = name.search(prefix);
const prefixLocation = name.search(Str.escapeForRegExp(prefix));

if (prefixLocation === 0 && prefix.length === name.length) {
texts.push({text: prefix, isColored: true});
Expand Down
4 changes: 2 additions & 2 deletions src/libs/ReportUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,12 +416,12 @@ function canShowReportRecipientLocalTime(personalDetails, report) {
const reportRecipient = personalDetails[participantsWithoutExpensifyEmails[0]];
const reportRecipientTimezone = lodashGet(reportRecipient, 'timezone', CONST.DEFAULT_TIME_ZONE);
const isReportParticipantValidated = lodashGet(reportRecipient, 'validated', false);
return !hasMultipleParticipants
return Boolean(!hasMultipleParticipants
&& !isChatRoom(report)
&& reportRecipient
&& reportRecipientTimezone
&& reportRecipientTimezone.selected
&& isReportParticipantValidated;
&& isReportParticipantValidated);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/pages/home/report/ReportActionCompose.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -830,7 +830,7 @@ class ReportActionCompose extends React.Component {
}
this.setState({composerHeight});
}}
onScroll={this.setShouldShowSuggestionMenuToFalse}
onScroll={() => this.setShouldShowSuggestionMenuToFalse()}
/>
</DragAndDrop>
</View>
Expand Down