From 4fed4611f5cb0b35d5e4d46c8733275883e7b371 Mon Sep 17 00:00:00 2001 From: dhairyasenjaliya Date: Mon, 15 May 2023 13:27:20 +0530 Subject: [PATCH 1/7] fix --- src/components/AttachmentModal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/AttachmentModal.js b/src/components/AttachmentModal.js index 7179aa502ddb..83be46c352ad 100755 --- a/src/components/AttachmentModal.js +++ b/src/components/AttachmentModal.js @@ -261,7 +261,7 @@ class AttachmentModal extends PureComponent { backgroundColor={themeColors.componentBG} onModalShow={() => { this.props.onModalShow(); - this.setState({shouldLoadAttachment: true}) + this.setState({shouldLoadAttachment: true}); }} onModalHide={(e) => { this.props.onModalHide(e); From 27c596273ddb65d338b193a4e54d1360cf2b220e Mon Sep 17 00:00:00 2001 From: dhairyasenjaliya Date: Mon, 15 May 2023 16:11:02 +0530 Subject: [PATCH 2/7] isMoneyRequestReport added into OptionListUtils --- src/components/OptionRow.js | 2 +- src/libs/OptionsListUtils.js | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/OptionRow.js b/src/components/OptionRow.js index 225ef6054e64..95156c874e93 100644 --- a/src/components/OptionRow.js +++ b/src/components/OptionRow.js @@ -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 ? ( Date: Mon, 15 May 2023 19:23:39 +0530 Subject: [PATCH 3/7] lastMessageTextFromReport as alternateText --- src/libs/OptionsListUtils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/OptionsListUtils.js b/src/libs/OptionsListUtils.js index 7814ddb9afe6..2e49cb5b07ab 100644 --- a/src/libs/OptionsListUtils.js +++ b/src/libs/OptionsListUtils.js @@ -451,7 +451,7 @@ 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 = Localize.translate(preferredLocale, 'footer.expenseReports'); + result.alternateText = lastMessageTextFromReport || Localize.translate(preferredLocale, 'report.noActivityYet'); } else { result.alternateText = showChatPreviewLine && lastMessageText ? lastMessageText : LocalePhoneNumber.formatPhoneNumber(personalDetail.login); } From 1f4318d0fdd1e9064a929bbb6fd28066ac6fc651 Mon Sep 17 00:00:00 2001 From: dhairyasenjaliya Date: Mon, 15 May 2023 19:55:04 +0530 Subject: [PATCH 4/7] code cleanup --- src/libs/OptionsListUtils.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/OptionsListUtils.js b/src/libs/OptionsListUtils.js index 2e49cb5b07ab..c7ecf9bc9080 100644 --- a/src/libs/OptionsListUtils.js +++ b/src/libs/OptionsListUtils.js @@ -431,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; @@ -451,7 +451,7 @@ 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 || Localize.translate(preferredLocale, 'report.noActivityYet'); + result.alternateText = lastMessageTextFromReport.length > 0 ? lastMessageTextFromReport : Localize.translate(preferredLocale, 'report.noActivityYet'); } else { result.alternateText = showChatPreviewLine && lastMessageText ? lastMessageText : LocalePhoneNumber.formatPhoneNumber(personalDetail.login); } From f6f3647d527555efdcf778488b36f360ed766b01 Mon Sep 17 00:00:00 2001 From: dhairyasenjaliya Date: Mon, 15 May 2023 20:08:24 +0530 Subject: [PATCH 5/7] lastMessageTextFromReport to lastMessageText --- src/libs/OptionsListUtils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/OptionsListUtils.js b/src/libs/OptionsListUtils.js index c7ecf9bc9080..e1ab2145189e 100644 --- a/src/libs/OptionsListUtils.js +++ b/src/libs/OptionsListUtils.js @@ -451,7 +451,7 @@ 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 ? lastMessageTextFromReport : Localize.translate(preferredLocale, 'report.noActivityYet'); + result.alternateText = lastMessageTextFromReport.length > 0 ? lastMessageText : Localize.translate(preferredLocale, 'report.noActivityYet'); } else { result.alternateText = showChatPreviewLine && lastMessageText ? lastMessageText : LocalePhoneNumber.formatPhoneNumber(personalDetail.login); } From 1e08f57669cb8fe91be8a8309299f8feca2a3631 Mon Sep 17 00:00:00 2001 From: dhairyasenjaliya Date: Mon, 15 May 2023 20:25:10 +0530 Subject: [PATCH 6/7] merge --- src/components/QRShare/QRShareWithDownload/index.js | 2 +- .../QRShare/QRShareWithDownload/index.native.js | 3 +-- src/components/QRShare/index.js | 2 +- .../ReimbursementAccount/BankAccountManualStep.js | 6 +----- src/pages/ReimbursementAccount/BankAccountPlaidStep.js | 10 +++------- 5 files changed, 7 insertions(+), 16 deletions(-) diff --git a/src/components/QRShare/QRShareWithDownload/index.js b/src/components/QRShare/QRShareWithDownload/index.js index 8cb7be79f7ad..310122b96d40 100644 --- a/src/components/QRShare/QRShareWithDownload/index.js +++ b/src/components/QRShare/QRShareWithDownload/index.js @@ -1,6 +1,6 @@ import React, {Component} from 'react'; import fileDownload from '../../../libs/fileDownload'; -import QRShare from '..' +import QRShare from '..'; import {qrShareDefaultProps, qrSharePropTypes} from '../propTypes'; import getQrCodeFileName from '../getQrCodeDownloadFileName'; diff --git a/src/components/QRShare/QRShareWithDownload/index.native.js b/src/components/QRShare/QRShareWithDownload/index.native.js index 27f05038733a..6154b8137bf3 100644 --- a/src/components/QRShare/QRShareWithDownload/index.native.js +++ b/src/components/QRShare/QRShareWithDownload/index.native.js @@ -1,11 +1,10 @@ import React, {Component} from 'react'; import ViewShot from 'react-native-view-shot'; import fileDownload from '../../../libs/fileDownload'; -import QRShare from '..' +import QRShare from '..'; import {qrShareDefaultProps, qrSharePropTypes} from '../propTypes'; import getQrCodeFileName from '../getQrCodeDownloadFileName'; - class QRShareWithDownload extends Component { qrCodeScreenshotRef = React.createRef(); diff --git a/src/components/QRShare/index.js b/src/components/QRShare/index.js index 014cddcf5090..8676432208a1 100644 --- a/src/components/QRShare/index.js +++ b/src/components/QRShare/index.js @@ -9,7 +9,7 @@ import withWindowDimensions, {windowDimensionsPropTypes} from '../withWindowDime import compose from '../../libs/compose'; import variables from '../../styles/variables'; import ExpensifyWordmark from '../../../assets/images/expensify-wordmark.svg'; -import {qrSharePropTypes, qrShareDefaultProps} from './propTypes' +import {qrSharePropTypes, qrShareDefaultProps} from './propTypes'; const propTypes = { ...qrSharePropTypes, diff --git a/src/pages/ReimbursementAccount/BankAccountManualStep.js b/src/pages/ReimbursementAccount/BankAccountManualStep.js index 02da681858cc..0cb6a706abf8 100644 --- a/src/pages/ReimbursementAccount/BankAccountManualStep.js +++ b/src/pages/ReimbursementAccount/BankAccountManualStep.js @@ -117,11 +117,7 @@ class BankAccountManualStep extends React.Component { LabelComponent={() => ( {this.props.translate('common.iAcceptThe')} - - {this.props.translate('common.expensifyTermsOfService')} - + {this.props.translate('common.expensifyTermsOfService')} )} defaultValue={this.props.getDefaultStateForField('acceptTerms', false)} diff --git a/src/pages/ReimbursementAccount/BankAccountPlaidStep.js b/src/pages/ReimbursementAccount/BankAccountPlaidStep.js index d4f505720a95..aade78afd54a 100644 --- a/src/pages/ReimbursementAccount/BankAccountPlaidStep.js +++ b/src/pages/ReimbursementAccount/BankAccountPlaidStep.js @@ -116,24 +116,20 @@ class BankAccountPlaidStep extends React.Component { bankAccountID={bankAccountID} selectedPlaidAccountID={selectedPlaidAccountID} /> - {Boolean(selectedPlaidAccountID) && !_.isEmpty(lodashGet(this.props.plaidData, 'bankAccounts')) && + {Boolean(selectedPlaidAccountID) && !_.isEmpty(lodashGet(this.props.plaidData, 'bankAccounts')) && ( ( {this.props.translate('common.iAcceptThe')} - - {this.props.translate('common.expensifyTermsOfService')} - + {this.props.translate('common.expensifyTermsOfService')} )} defaultValue={this.props.getDefaultStateForField('acceptTerms', false)} shouldSaveDraft /> - } + )} ); From adb69f4d65c0e0d4f6f6b86a8ce30a0e70935b7b Mon Sep 17 00:00:00 2001 From: dhairyasenjaliya Date: Mon, 15 May 2023 20:25:52 +0530 Subject: [PATCH 7/7] megre --- src/components/MagicCodeInput.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/components/MagicCodeInput.js b/src/components/MagicCodeInput.js index a9505e829c1e..7248e069a7d7 100644 --- a/src/components/MagicCodeInput.js +++ b/src/components/MagicCodeInput.js @@ -267,11 +267,7 @@ function MagicCodeInput(props) { key={index} style={[styles.w15]} > - + {decomposeString(props.value)[index] || ''}