Update MoneyRequestView.js to show Violations #32594
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| import lodashGet from 'lodash/get'; | ||
| import lodashValues from 'lodash/values'; | ||
| import PropTypes from 'prop-types'; | ||
| import React, {useCallback, useMemo} from 'react'; | ||
| import {View} from 'react-native'; | ||
| import {withOnyx} from 'react-native-onyx'; | ||
| import categoryPropTypes from '@components/categoryPropTypes'; | ||
|
|
@@ -14,12 +14,14 @@ import Switch from '@components/Switch'; | |
| import tagPropTypes from '@components/tagPropTypes'; | ||
| import Text from '@components/Text'; | ||
| import transactionPropTypes from '@components/transactionPropTypes'; | ||
| import ViolationMessages from '@components/ViolationMessages'; | ||
| import withCurrentUserPersonalDetails, {withCurrentUserPersonalDetailsPropTypes} from '@components/withCurrentUserPersonalDetails'; | ||
| import useLocalize from '@hooks/useLocalize'; | ||
| import usePermissions from '@hooks/usePermissions'; | ||
| import useStyleUtils from '@hooks/useStyleUtils'; | ||
| import useTheme from '@hooks/useTheme'; | ||
| import useThemeStyles from '@hooks/useThemeStyles'; | ||
| import useViolations from '@hooks/useViolations'; | ||
| import useWindowDimensions from '@hooks/useWindowDimensions'; | ||
| import * as CardUtils from '@libs/CardUtils'; | ||
| import compose from '@libs/compose'; | ||
|
|
@@ -41,6 +43,32 @@ import ONYXKEYS from '@src/ONYXKEYS'; | |
| import ROUTES from '@src/ROUTES'; | ||
| import ReportActionItemImage from './ReportActionItemImage'; | ||
|
|
||
| const violationNames = lodashValues(CONST.VIOLATIONS); | ||
|
|
||
| const transactionViolationPropType = PropTypes.shape({ | ||
| type: PropTypes.string.isRequired, | ||
| name: PropTypes.oneOf(violationNames).isRequired, | ||
| data: PropTypes.shape({ | ||
| rejectedBy: PropTypes.string, | ||
| rejectReason: PropTypes.string, | ||
| amount: PropTypes.string, | ||
| surcharge: PropTypes.number, | ||
| invoiceMarkup: PropTypes.number, | ||
| maxAge: PropTypes.number, | ||
| tagName: PropTypes.string, | ||
| formattedLimitAmount: PropTypes.string, | ||
| categoryLimit: PropTypes.string, | ||
| limit: PropTypes.string, | ||
| category: PropTypes.string, | ||
| brokenBankConnection: PropTypes.bool, | ||
| isAdmin: PropTypes.bool, | ||
| email: PropTypes.string, | ||
| isTransactionOlderThan7Days: PropTypes.bool, | ||
| member: PropTypes.string, | ||
| taxName: PropTypes.string, | ||
| }), | ||
| }); | ||
|
|
||
| const propTypes = { | ||
| /** The report currently being looked at */ | ||
| report: reportPropTypes.isRequired, | ||
|
|
@@ -61,6 +89,9 @@ const propTypes = { | |
| /** The transaction associated with the transactionThread */ | ||
| transaction: transactionPropTypes, | ||
|
|
||
| /** Violations detected in this transaction */ | ||
| transactionViolations: PropTypes.arrayOf(transactionViolationPropType), | ||
|
|
||
| /** Collection of tags attached to a policy */ | ||
| policyTags: tagPropTypes, | ||
|
|
||
|
|
@@ -76,10 +107,11 @@ const defaultProps = { | |
| currency: CONST.CURRENCY.USD, | ||
| comment: {comment: ''}, | ||
| }, | ||
| transactionViolations: [], | ||
| policyTags: {}, | ||
| }; | ||
|
|
||
| function MoneyRequestView({report, parentReport, parentReportActions, policyCategories, shouldShowHorizontalRule, transaction, policyTags, policy, transactionViolations}) { | ||
| const theme = useTheme(); | ||
| const styles = useThemeStyles(); | ||
| const StyleUtils = useStyleUtils(); | ||
|
|
@@ -131,6 +163,9 @@ function MoneyRequestView({report, parentReport, parentReportActions, policyCate | |
| const shouldShowTag = isPolicyExpenseChat && (transactionTag || OptionsListUtils.hasEnabledOptions(lodashValues(policyTagsList))); | ||
| const shouldShowBillable = isPolicyExpenseChat && (transactionBillable || !lodashGet(policy, 'disabledFields.defaultBillable', true)); | ||
|
|
||
| const {getViolationsForField} = useViolations(transactionViolations); | ||
| const hasViolations = useCallback((field) => canUseViolations && getViolationsForField(field).length > 0, [canUseViolations, getViolationsForField]); | ||
|
|
||
| let amountDescription = `${translate('iou.amount')}`; | ||
|
|
||
| if (isCardTransaction) { | ||
|
|
@@ -198,6 +233,7 @@ function MoneyRequestView({report, parentReport, parentReportActions, policyCate | |
| onPress={() => Navigation.navigate(ROUTES.EDIT_REQUEST.getRoute(report.reportID, CONST.EDIT_REQUEST_FIELD.RECEIPT))} | ||
| /> | ||
| )} | ||
| {canUseViolations && <ViolationMessages violations={getViolationsForField('receipt')} />} | ||
| <OfflineWithFeedback pendingAction={getPendingFieldAction('pendingFields.amount')}> | ||
| <MenuItemWithTopDescription | ||
| title={formattedTransactionAmount ? formattedTransactionAmount.toString() : ''} | ||
|
|
@@ -208,9 +244,10 @@ function MoneyRequestView({report, parentReport, parentReportActions, policyCate | |
| interactive={canEditAmount} | ||
| shouldShowRightIcon={canEditAmount} | ||
| onPress={() => Navigation.navigate(ROUTES.EDIT_REQUEST.getRoute(report.reportID, CONST.EDIT_REQUEST_FIELD.AMOUNT))} | ||
| brickRoadIndicator={hasViolations('amount') || (hasErrors && transactionAmount === 0) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : ''} | ||
| error={hasErrors && transactionAmount === 0 ? translate('common.error.enterAmount') : ''} | ||
| /> | ||
| {canUseViolations && <ViolationMessages violations={getViolationsForField('amount')} />} | ||
| </OfflineWithFeedback> | ||
| <OfflineWithFeedback pendingAction={getPendingFieldAction('pendingFields.comment')}> | ||
| <MenuItemWithTopDescription | ||
|
|
@@ -222,8 +259,10 @@ function MoneyRequestView({report, parentReport, parentReportActions, policyCate | |
| titleStyle={styles.flex1} | ||
| onPress={() => Navigation.navigate(ROUTES.EDIT_REQUEST.getRoute(report.reportID, CONST.EDIT_REQUEST_FIELD.DESCRIPTION))} | ||
| wrapperStyle={[styles.pv2, styles.taskDescriptionMenuItem]} | ||
| brickRoadIndicator={hasViolations('comment') ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : ''} | ||
| numberOfLinesTitle={0} | ||
| /> | ||
| {canUseViolations && <ViolationMessages violations={getViolationsForField('comment')} />} | ||
| </OfflineWithFeedback> | ||
| {isDistanceRequest ? ( | ||
| <OfflineWithFeedback pendingAction={lodashGet(transaction, 'pendingFields.waypoints') || lodashGet(transaction, 'pendingAction')}> | ||
|
|
@@ -245,9 +284,10 @@ function MoneyRequestView({report, parentReport, parentReportActions, policyCate | |
| shouldShowRightIcon={canEdit} | ||
| titleStyle={styles.flex1} | ||
| onPress={() => Navigation.navigate(ROUTES.EDIT_REQUEST.getRoute(report.reportID, CONST.EDIT_REQUEST_FIELD.MERCHANT))} | ||
| brickRoadIndicator={hasViolations('merchant') || (hasErrors && isEmptyMerchant) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : ''} | ||
| error={hasErrors && isEmptyMerchant ? translate('common.error.enterMerchant') : ''} | ||
| /> | ||
| {canUseViolations && <ViolationMessages violations={getViolationsForField('merchant')} />} | ||
| </OfflineWithFeedback> | ||
| )} | ||
| <OfflineWithFeedback pendingAction={getPendingFieldAction('pendingFields.created')}> | ||
|
|
@@ -258,9 +298,10 @@ function MoneyRequestView({report, parentReport, parentReportActions, policyCate | |
| shouldShowRightIcon={canEdit && !isSettled} | ||
| titleStyle={styles.flex1} | ||
| onPress={() => Navigation.navigate(ROUTES.EDIT_REQUEST.getRoute(report.reportID, CONST.EDIT_REQUEST_FIELD.DATE))} | ||
| brickRoadIndicator={hasViolations('date') || (hasErrors && transactionDate === '') ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : ''} | ||
| error={hasErrors && transactionDate === '' ? translate('common.error.enterDate') : ''} | ||
| /> | ||
| {canUseViolations && <ViolationMessages violations={getViolationsForField('date')} />} | ||
| </OfflineWithFeedback> | ||
| {shouldShowCategory && ( | ||
| <OfflineWithFeedback pendingAction={lodashGet(transaction, 'pendingFields.category') || lodashGet(transaction, 'pendingAction')}> | ||
|
|
@@ -271,7 +312,9 @@ function MoneyRequestView({report, parentReport, parentReportActions, policyCate | |
| shouldShowRightIcon={canEdit} | ||
| titleStyle={styles.flex1} | ||
| onPress={() => Navigation.navigate(ROUTES.EDIT_REQUEST.getRoute(report.reportID, CONST.EDIT_REQUEST_FIELD.CATEGORY))} | ||
| brickRoadIndicator={hasViolations('category') ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : ''} | ||
| /> | ||
| {canUseViolations && <ViolationMessages violations={getViolationsForField('category')} />} | ||
| </OfflineWithFeedback> | ||
| )} | ||
| {shouldShowTag && ( | ||
|
|
@@ -283,7 +326,9 @@ function MoneyRequestView({report, parentReport, parentReportActions, policyCate | |
| shouldShowRightIcon={canEdit} | ||
| titleStyle={styles.flex1} | ||
| onPress={() => Navigation.navigate(ROUTES.EDIT_REQUEST.getRoute(report.reportID, CONST.EDIT_REQUEST_FIELD.TAG))} | ||
| brickRoadIndicator={hasViolations('tag') ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : ''} | ||
| /> | ||
| {canUseViolations && <ViolationMessages violations={getViolationsForField('tag')} />} | ||
| </OfflineWithFeedback> | ||
| )} | ||
| {isCardTransaction && ( | ||
|
|
@@ -295,15 +340,24 @@ function MoneyRequestView({report, parentReport, parentReportActions, policyCate | |
| /> | ||
| </OfflineWithFeedback> | ||
| )} | ||
|
|
||
| {shouldShowBillable && ( | ||
| <> | ||
| <View style={[styles.flexRow, styles.optionRow, styles.justifyContentBetween, styles.alignItemsCenter, styles.ml5, styles.mr8]}> | ||
| <Text color={!transactionBillable ? theme.textSupporting : undefined}>{translate('common.billable')}</Text> | ||
| <Switch | ||
| accessibilityLabel={translate('common.billable')} | ||
| isOn={transactionBillable} | ||
| onToggle={(value) => IOU.editMoneyRequest(transaction, report.reportID, {billable: value})} | ||
| /> | ||
| </View> | ||
| {hasViolations('billable') && ( | ||
| <ViolationMessages | ||
| violations={getViolationsForField('billable')} | ||
| isLast | ||
| /> | ||
| )} | ||
| </> | ||
| )} | ||
| </View> | ||
| <SpacerView | ||
|
|
@@ -349,5 +403,15 @@ export default compose( | |
| return `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`; | ||
| }, | ||
| }, | ||
| transactionViolation: { | ||
|
Contributor
There was a problem hiding this comment. there's a typo here which I'm fixing here if you can review please @trevor-coleman . I was able to see the violations once I fixed it.
Contributor
There was a problem hiding this comment. Good catch! Let me review |
||
| key: ({report}) => { | ||
| const parentReportAction = ReportActionsUtils.getParentReportAction(report); | ||
|
Contributor
There was a problem hiding this comment. @trevor-coleman
Contributor
Author
There was a problem hiding this comment. Hi, I was a paid contractor and I'm no longer on this project.
Contributor
There was a problem hiding this comment. @tgolen can you do this as part of one of your PRs removing the method?
Contributor
There was a problem hiding this comment. I'll add it to the list. Thanks for responding @trevor-coleman and I hope you come back at some point! 👋 |
||
| const transactionID = lodashGet(parentReportAction, ['originalMessage', 'IOUTransactionID'], 0); | ||
| return `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`; | ||
| }, | ||
| }, | ||
| policyTags: { | ||
| key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_TAGS}${report.policyID}`, | ||
| }, | ||
| }), | ||
| )(MoneyRequestView); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| import React, {useMemo} from 'react'; | ||
|
hayata-suenaga marked this conversation as resolved.
|
||
| import {View} from 'react-native'; | ||
| import useLocalize from '@hooks/useLocalize'; | ||
| import useThemeStyles from '@hooks/useThemeStyles'; | ||
| import ViolationsUtils from '@libs/ViolationsUtils'; | ||
| import type {TransactionViolation} from '@src/types/onyx'; | ||
| import Text from './Text'; | ||
|
|
||
| export default function ViolationMessages({violations, isLast}: {violations: TransactionViolation[]; isLast?: boolean}) { | ||
| const styles = useThemeStyles(); | ||
| const {translate} = useLocalize(); | ||
| const violationMessages = useMemo(() => violations.map((violation) => [violation.name, ViolationsUtils.getViolationTranslation(violation, translate)]), [translate, violations]); | ||
|
|
||
| return ( | ||
|
trevor-coleman marked this conversation as resolved.
|
||
| <View style={[styles.mtn2, isLast ? styles.mb2 : styles.mb1]}> | ||
| {violationMessages.map(([name, message]) => ( | ||
| <Text | ||
| key={`violationMessages.${name}`} | ||
| style={[styles.ph5, styles.textLabelError]} | ||
| > | ||
| {message} | ||
| </Text> | ||
| ))} | ||
| </View> | ||
| ); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.