Skip to content

Fix search preview #18941

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
mountiny merged 14 commits into from
May 15, 2023
Merged

Fix search preview #18941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5545c08
Merge branch 'main' of https://github.com/dhairyasenjaliya/Expensify
dhairyasenjaliya May 14, 2023
bdcfec1
Merge branch 'main' of https://github.com/dhairyasenjaliya/Expensify
dhairyasenjaliya May 14, 2023
701b325
Merge branch 'main' of https://github.com/dhairyasenjaliya/Expensify
dhairyasenjaliya May 14, 2023
4fed461
fix
dhairyasenjaliya May 15, 2023
661b60a
Merge branch 'main' of https://github.com/dhairyasenjaliya/Expensify
dhairyasenjaliya May 15, 2023
27c5962
isMoneyRequestReport added into OptionListUtils
dhairyasenjaliya May 15, 2023
b54c4e6
Merge branch 'main' of https://github.com/dhairyasenjaliya/Expensify
dhairyasenjaliya May 15, 2023
0af44b3
lastMessageTextFromReport as alternateText
dhairyasenjaliya May 15, 2023
1f4318d
code cleanup
dhairyasenjaliya May 15, 2023
f6f3647
lastMessageTextFromReport to lastMessageText
dhairyasenjaliya May 15, 2023
1e08f57
merge
dhairyasenjaliya May 15, 2023
485b71d
Merge branch 'main' of https://github.com/dhairyasenjaliya/Expensify
dhairyasenjaliya May 15, 2023
adb69f4
megre
dhairyasenjaliya May 15, 2023
499dc6d
Merge branch 'main' of https://github.com/dhairyasenjaliya/Expensify …
dhairyasenjaliya May 15, 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
6 changes: 1 addition & 5 deletions src/components/MagicCodeInput.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,11 +267,7 @@ function MagicCodeInput(props) {
key={index}
style={[styles.w15]}
>
<View style={[
styles.textInputContainer,
focusedIndex === index ? styles.borderColorFocus : {},
props.hasError || props.errorText ? styles.borderColorDanger : {},
]}>
<View style={[styles.textInputContainer, focusedIndex === index ? styles.borderColorFocus : {}, props.hasError || props.errorText ? styles.borderColorDanger : {}]}>
<Text style={[styles.magicCodeInput, styles.textAlignCenter]}>{decomposeString(props.value)[index] || ''}</Text>
</View>
<View style={[StyleSheet.absoluteFillObject, styles.w100, styles.opacity0]}>
Expand Down
2 changes: 1 addition & 1 deletion src/components/OptionRow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ class OptionRow extends Component {
tooltipEnabled={this.props.showTitleTooltip}
numberOfLines={1}
textStyles={displayNameStyle}
shouldUseFullTitle={this.props.option.isChatRoom || this.props.option.isPolicyExpenseChat}
shouldUseFullTitle={this.props.option.isChatRoom || this.props.option.isPolicyExpenseChat || this.props.option.isMoneyRequestReport}
/>
{this.props.option.alternateText ? (
<Text
Expand Down
5 changes: 4 additions & 1 deletion src/libs/OptionsListUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,7 @@ function createOption(logins, personalDetails, report, reportActions = {}, {show
result.isDefaultRoom = ReportUtils.isDefaultRoom(report);
result.isArchivedRoom = ReportUtils.isArchivedRoom(report);
result.isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(report);
result.isMoneyRequestReport = ReportUtils.isMoneyRequestReport(report);
result.isThread = ReportUtils.isThread(report);
result.shouldShowSubscript = result.isPolicyExpenseChat && !report.isOwnPolicyExpenseChat && !result.isArchivedRoom;
result.allReportErrors = getAllReportErrors(report, reportActions);
Expand All @@ -430,7 +431,7 @@ function createOption(logins, personalDetails, report, reportActions = {}, {show
if (ReportUtils.isReportMessageAttachment({text: report.lastMessageText, html: report.lastMessageHtml})) {
lastMessageTextFromReport = `[${Localize.translateLocal('common.attachment')}]`;
} else {
lastMessageTextFromReport = report ? report.lastMessageText : '';
lastMessageTextFromReport = report ? report.lastMessageText || '' : '';
}

const lastActorDetails = personalDetailMap[report.lastActorEmail] || null;
Expand All @@ -449,6 +450,8 @@ function createOption(logins, personalDetails, report, reportActions = {}, {show

if (result.isChatRoom || result.isPolicyExpenseChat) {
result.alternateText = showChatPreviewLine && !forcePolicyNamePreview && lastMessageText ? lastMessageText : subtitle;
} else if (result.isMoneyRequestReport) {
result.alternateText = lastMessageTextFromReport.length > 0 ? lastMessageText : Localize.translate(preferredLocale, 'report.noActivityYet');
} else {
result.alternateText = showChatPreviewLine && lastMessageText ? lastMessageText : LocalePhoneNumber.formatPhoneNumber(personalDetail.login);
}
Expand Down