Skip to content

Commit

Permalink
Merge pull request #42131 from bernhardoj/fix/41925-multiline-merchant
Browse files Browse the repository at this point in the history
Wrap the merchant text in the transaction field view
  • Loading branch information
chiragsalian authored May 24, 2024
2 parents b168d20 + 12999c1 commit 2f16abb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/components/MoneyRequestConfirmationList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -946,6 +946,7 @@ function MoneyRequestConfirmationList({
brickRoadIndicator={shouldDisplayMerchantError ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
errorText={shouldDisplayMerchantError ? translate('common.error.fieldRequired') : ''}
rightLabel={isMerchantRequired && !shouldDisplayMerchantError ? translate('common.required') : ''}
numberOfLinesTitle={2}
/>
),
shouldShow: shouldShowMerchant,
Expand Down
2 changes: 2 additions & 0 deletions src/components/ReportActionItem/MoneyRequestView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -427,8 +427,10 @@ function MoneyRequestView({
onPress={() =>
Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_MERCHANT.getRoute(CONST.IOU.ACTION.EDIT, iouType, transaction?.transactionID ?? '', report.reportID))
}
wrapperStyle={[styles.taskDescriptionMenuItem]}
brickRoadIndicator={getErrorForField('merchant') ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
errorText={getErrorForField('merchant')}
numberOfLinesTitle={0}
/>
</OfflineWithFeedback>
)}
Expand Down

0 comments on commit 2f16abb

Please sign in to comment.