feat: [Auth Violations] Support isDismissed on newDot to hide violations. #54455
+219
−89
There are no files selected for viewing
This file contains 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 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 |
|---|---|---|
|
|
@@ -16,6 +16,7 @@ | |
| import variables from '@styles/variables'; | ||
| import * as IOU from '@userActions/IOU'; | ||
| import * as TransactionActions from '@userActions/Transaction'; | ||
| import CONST from '@src/CONST'; | ||
| import ONYXKEYS from '@src/ONYXKEYS'; | ||
| import ROUTES from '@src/ROUTES'; | ||
| import SCREENS from '@src/SCREENS'; | ||
|
|
@@ -50,35 +51,36 @@ | |
| // eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth | ||
| const {shouldUseNarrowLayout, isSmallScreenWidth} = useResponsiveLayout(); | ||
| const route = useRoute(); | ||
| const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID ?? CONST.DEFAULT_NUMBER_ID}`); | ||
| const [transaction] = useOnyx( | ||
| `${ONYXKEYS.COLLECTION.TRANSACTION}${ | ||
| ReportActionsUtils.isMoneyRequestAction(parentReportAction) | ||
| ? ReportActionsUtils.getOriginalMessage(parentReportAction)?.IOUTransactionID ?? CONST.DEFAULT_NUMBER_ID | ||
| : CONST.DEFAULT_NUMBER_ID | ||
| }`, | ||
| ); | ||
| const [dismissedHoldUseExplanation, dismissedHoldUseExplanationResult] = useOnyx(ONYXKEYS.NVP_DISMISSED_HOLD_USE_EXPLANATION, {initialValue: true}); | ||
| const isLoadingHoldUseExplained = isLoadingOnyxValue(dismissedHoldUseExplanationResult); | ||
| const styles = useThemeStyles(); | ||
| const theme = useTheme(); | ||
| const {translate} = useLocalize(); | ||
| const [shouldShowHoldMenu, setShouldShowHoldMenu] = useState(false); | ||
| const isOnHold = TransactionUtils.isOnHold(transaction); | ||
| const isDuplicate = TransactionUtils.isDuplicate(transaction?.transactionID); | ||
| const reportID = report?.reportID; | ||
|
|
||
| const isReportInRHP = route.name === SCREENS.SEARCH.REPORT_RHP; | ||
| const shouldDisplaySearchRouter = !isReportInRHP || isSmallScreenWidth; | ||
|
|
||
| const hasAllPendingRTERViolations = TransactionUtils.allHavePendingRTERViolation(transaction?.transactionID ? [transaction?.transactionID] : []); | ||
|
|
||
| const shouldShowBrokenConnectionViolation = TransactionUtils.shouldShowBrokenConnectionViolation(transaction?.transactionID, parentReport, policy); | ||
|
|
||
| const shouldShowMarkAsCashButton = | ||
| hasAllPendingRTERViolations || (shouldShowBrokenConnectionViolation && (!PolicyUtils.isPolicyAdmin(policy) || ReportUtils.isCurrentUserSubmitter(parentReport?.reportID))); | ||
|
|
||
| const markAsCash = useCallback(() => { | ||
| TransactionActions.markAsCash(transaction?.transactionID, reportID); | ||
| }, [reportID, transaction?.transactionID]); | ||
|
|
||
| const isScanning = TransactionUtils.hasReceipt(transaction) && TransactionUtils.isReceiptBeingScanned(transaction); | ||
|
|
@@ -105,14 +107,14 @@ | |
| icon: getStatusIcon(Expensicons.Hourglass), | ||
| description: ( | ||
| <BrokenConnectionDescription | ||
| transactionID={transaction?.transactionID} | ||
| report={report} | ||
| policy={policy} | ||
| /> | ||
| ), | ||
| }; | ||
| } | ||
| if (TransactionUtils.hasPendingRTERViolation(TransactionUtils.getTransactionViolations(transaction?.transactionID))) { | ||
|
There was a problem hiding this comment. @rojiphil, could you please check the ESLint failures below? I have already resolved dozens of those but it keeps increasing everytime I push a commit. I want your help especially in resolving the warning just below this comment and when we use There was a problem hiding this comment. In the case of calling The guidelines for the fix of the ESlint failures is already mentioned here. Please look for similar handling for ESlint failures elsewhere in code as that can help. But let me know if you get stuck otherwise. There was a problem hiding this comment. @rojiphil thanks for the help 🙇🏻. |
||
| return {icon: getStatusIcon(Expensicons.Hourglass), description: translate('iou.pendingMatchWithCreditCardDescription')}; | ||
| } | ||
| if (isScanning) { | ||
|
|
@@ -157,7 +159,7 @@ | |
| shouldShowPinButton={false} | ||
| report={{ | ||
| ...report, | ||
| reportID: reportID ?? '', | ||
|
Check failure on line 162 in src/components/MoneyRequestHeader.tsx
|
||
| ownerAccountID: parentReport?.ownerAccountID, | ||
| }} | ||
| policy={policy} | ||
|
|
@@ -179,7 +181,7 @@ | |
| text={translate('iou.reviewDuplicates')} | ||
| style={[styles.p0, styles.ml2]} | ||
| onPress={() => { | ||
| Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_PAGE.getRoute(reportID ?? '', Navigation.getReportRHPActiveRoute())); | ||
|
Check failure on line 184 in src/components/MoneyRequestHeader.tsx
|
||
| }} | ||
| /> | ||
| )} | ||
|
|
@@ -201,7 +203,7 @@ | |
| text={translate('iou.reviewDuplicates')} | ||
| style={[styles.w100, styles.pr0]} | ||
| onPress={() => { | ||
| Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_PAGE.getRoute(reportID ?? '', Navigation.getReportRHPActiveRoute())); | ||
|
Check failure on line 206 in src/components/MoneyRequestHeader.tsx
|
||
| }} | ||
| /> | ||
| </View> | ||
|
|
||
This file contains 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 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 |
|---|---|---|
|
|
@@ -71,9 +71,9 @@ | |
| const receiptFieldViolationNames: OnyxTypes.ViolationName[] = [CONST.VIOLATIONS.MODIFIED_AMOUNT, CONST.VIOLATIONS.MODIFIED_DATE]; | ||
|
|
||
| const getTransactionID = (report: OnyxEntry<OnyxTypes.Report>, parentReportActions: OnyxEntry<OnyxTypes.ReportActions>) => { | ||
| const parentReportAction = parentReportActions?.[report?.parentReportActionID ?? CONST.DEFAULT_NUMBER_ID]; | ||
Krishna2323 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| const originalMessage = parentReportAction && ReportActionsUtils.isMoneyRequestAction(parentReportAction) ? ReportActionsUtils.getOriginalMessage(parentReportAction) : undefined; | ||
| return originalMessage?.IOUTransactionID ?? undefined; | ||
| }; | ||
|
|
||
| function MoneyRequestView({report, shouldShowAnimatedBackground, readonly = false, updatedTransaction, isFromReviewDuplicates = false}: MoneyRequestViewProps) { | ||
|
|
@@ -81,8 +81,8 @@ | |
| const session = useSession(); | ||
| const {isOffline} = useNetwork(); | ||
| const {translate, toLocaleDigit} = useLocalize(); | ||
| const parentReportID = report?.parentReportID ?? '-1'; | ||
|
Check failure on line 84 in src/components/ReportActionItem/MoneyRequestView.tsx
|
||
| const policyID = report?.policyID ?? '-1'; | ||
|
Check failure on line 85 in src/components/ReportActionItem/MoneyRequestView.tsx
|
||
| const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${parentReportID}`); | ||
| const [chatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${parentReport?.parentReportID}`, { | ||
| selector: (chatReportValue) => chatReportValue && {reportID: chatReportValue.reportID, errorFields: chatReportValue.errorFields}, | ||
|
|
@@ -95,14 +95,14 @@ | |
| const [parentReportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReportID}`, { | ||
| canEvict: false, | ||
| }); | ||
| const transactionViolations = TransactionUtils.getTransactionViolations(getTransactionID(report, parentReportActions) ?? undefined); | ||
|
|
||
| const parentReportAction = parentReportActions?.[report?.parentReportActionID ?? '-1']; | ||
|
Check failure on line 100 in src/components/ReportActionItem/MoneyRequestView.tsx
|
||
| const isTrackExpense = ReportUtils.isTrackExpenseReport(report); | ||
| const moneyRequestReport = parentReport; | ||
| const linkedTransactionID = useMemo(() => { | ||
| const originalMessage = parentReportAction && ReportActionsUtils.isMoneyRequestAction(parentReportAction) ? ReportActionsUtils.getOriginalMessage(parentReportAction) : undefined; | ||
| return originalMessage?.IOUTransactionID ?? '-1'; | ||
|
Check failure on line 105 in src/components/ReportActionItem/MoneyRequestView.tsx
|
||
| }, [parentReportAction]); | ||
|
|
||
| const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${linkedTransactionID}`); | ||
|
|
@@ -227,7 +227,7 @@ | |
| if (newBillable === TransactionUtils.getBillable(transaction)) { | ||
| return; | ||
| } | ||
| IOU.updateMoneyRequestBillable(transaction?.transactionID ?? '-1', report?.reportID ?? '-1', newBillable, policy, policyTagList, policyCategories); | ||
|
Check failure on line 230 in src/components/ReportActionItem/MoneyRequestView.tsx
|
||
| }, | ||
| [transaction, report, policy, policyTagList, policyCategories], | ||
| ); | ||
|
|
@@ -323,7 +323,7 @@ | |
| ROUTES.MONEY_REQUEST_STEP_DISTANCE.getRoute( | ||
| CONST.IOU.ACTION.EDIT, | ||
| iouType, | ||
| transaction?.transactionID ?? '-1', | ||
|
Check failure on line 326 in src/components/ReportActionItem/MoneyRequestView.tsx
|
||
| report?.reportID ?? '-1', | ||
| Navigation.getReportRHPActiveRoute(), | ||
| ), | ||
|
|
||
This file contains 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.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let us use
||instead of??as that will help address empty strings as well.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We use
??everywhere in the app, otherwise we would need to disable eslint.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it’s fine to leave it as that is the more widely accepted pattern. Maybe this can be taken up later when it is considered in its entirety.