fix: Stale "Review fraudulent charge" task appears on home screen but the fraud flag was already cleared

src/libs/ReportUtils.ts

@@ -1037,7 +1037,7 @@
 };
 
 let conciergeReportIDOnyxConnect: OnyxEntry<string>;
 Onyx.connect({
     key: ONYXKEYS.CONCIERGE_REPORT_ID,
     callback: (value) => {
         conciergeReportIDOnyxConnect = value;
@@ -1045,7 +1045,7 @@
 });
 
 const defaultAvatarBuildingIconTestID = 'SvgDefaultAvatarBuilding Icon';
 Onyx.connect({
     key: ONYXKEYS.SESSION,
     callback: (value) => {
         // When signed out, val is undefined
@@ -1063,7 +1063,7 @@
 let allPersonalDetails: OnyxEntry<PersonalDetailsList>;
 let allPersonalDetailLogins: string[];
 let currentUserPersonalDetails: OnyxEntry<PersonalDetails>;
 Onyx.connect({
     key: ONYXKEYS.PERSONAL_DETAILS_LIST,
     callback: (value) => {
         if (deprecatedCurrentUserAccountID) {
@@ -1075,7 +1075,7 @@
 });
 
 let allReportsDraft: OnyxCollection<Report>;
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT_DRAFT,
     waitForCollectionCallback: true,
     callback: (value) => (allReportsDraft = value),
@@ -1083,7 +1083,7 @@
 
 let allPolicies: OnyxCollection<Policy>;
 let policiesArray: Policy[] = [];
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.POLICY,
     waitForCollectionCallback: true,
     callback: (value) => {
@@ -1093,7 +1093,7 @@
 });
 
 let allPolicyDrafts: OnyxCollection<Policy>;
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.POLICY_DRAFTS,
     waitForCollectionCallback: true,
     callback: (value) => (allPolicyDrafts = value),
@@ -1101,7 +1101,7 @@
 
 let deprecatedAllReports: OnyxCollection<Report>;
 let deprecatedReportsByPolicyID: ReportByPolicyMap;
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT,
     waitForCollectionCallback: true,
     callback: (value) => {
@@ -1137,14 +1137,14 @@
 });
 
 let betaConfiguration: OnyxEntry<BetaConfiguration> = {};
 Onyx.connect({
     key: ONYXKEYS.BETA_CONFIGURATION,
     callback: (value) => (betaConfiguration = value ?? {}),
 });
 
 let deprecatedAllTransactions: OnyxCollection<Transaction> = {};
 let deprecatedReportsTransactions: Record<string, Transaction[]> = {};
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.TRANSACTION,
     waitForCollectionCallback: true,
     callback: (value) => {
@@ -1170,7 +1170,7 @@
 });
 
 let allReportActions: OnyxCollection<ReportActions>;
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
     waitForCollectionCallback: true,
     callback: (actions) => {
@@ -4169,9 +4169,9 @@
 /**
  * Returns the unresolved card fraud alert action for a given report.
  */
-function getUnresolvedCardFraudAlertAction(reportID: string): OnyxEntry<ReportAction> {
-    const reportActions = getAllReportActions(reportID);
-    return Object.values(reportActions).find((action): action is ReportAction => isActionableCardFraudAlert(action) && !getOriginalMessage(action)?.resolution);
+function getUnresolvedCardFraudAlertAction(reportID: string, reportActions?: OnyxEntry<ReportActions>): OnyxEntry<ReportAction> {
+    const actions = reportActions ?? getAllReportActions(reportID);
+    return Object.values(actions).find((action): action is ReportAction => isActionableCardFraudAlert(action) && !getOriginalMessage(action)?.resolution);
 }
 
 /**
@@ -13694,6 +13694,7 @@
     hasMissingInvoiceBankAccount,
     reasonForReportToBeInOptionList,
     getReasonAndReportActionThatRequiresAttention,
+    getUnresolvedCardFraudAlertAction,
     buildOptimisticChangeFieldAction,
     isPolicyRelatedReport,
     hasReportErrorsOtherThanFailedReceipt,

src/libs/actions/Card.ts

@@ -33,7 +33,7 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {SpendRuleForm} from '@src/types/form';
 import type {Card, CompanyCardFeedWithDomainID, Report, Transaction} from '@src/types/onyx';
-import type {CardLimitType, ExpensifyCardDetails, IssueNewCardData, IssueNewCardStep} from '@src/types/onyx/Card';
+import type {CardLimitType, ExpensifyCardDetails, IssueNewCardData, IssueNewCardStep, PossibleFraudData} from '@src/types/onyx/Card';
 import type {ExpensifyCardRule} from '@src/types/onyx/ExpensifyCardSettings';
 import type {SelectedTimezone} from '@src/types/onyx/PersonalDetails';
 import type {ConnectionName} from '@src/types/onyx/Policy';
@@ -1669,15 +1669,21 @@ function deleteExpensifyCardRule(domainAccountID: number, cardRuleID: string, ex
  * Resolves a fraud alert for a given card.
  * When the user clicks on the whisper it sets the optimistic data to the resolution and calls the API
  */
-function resolveFraudAlert(cardID: number | undefined, isFraud: boolean, reportID: string | undefined, reportActionID: string | undefined) {
+function resolveFraudAlert(
+    cardID: number | undefined,
+    isFraud: boolean,
+    reportID: string | undefined,
+    reportActionID: string | undefined,
+    previousPossibleFraud: PossibleFraudData | null = null,
+) {
     if (!reportID || !reportActionID || !cardID) {
         Log.hmmm('[resolveFraudAlert] Missing required parameters');
         return;
     }
 
     const resolution = isFraud ? CONST.CARD_FRAUD_ALERT_RESOLUTION.FRAUD : CONST.CARD_FRAUD_ALERT_RESOLUTION.RECOGNIZED;
 
-    const optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS>> = [
+    const optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS | typeof ONYXKEYS.CARD_LIST>> = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
@@ -1690,6 +1696,17 @@ function resolveFraudAlert(cardID: number | undefined, isFraud: boolean, reportI
                 },
             },
         },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.CARD_LIST,
+            value: {
+                [cardID]: {
+                    nameValuePairs: {
+                        possibleFraud: null,
+                    },
+                },
+            },
+        },
     ];
 
     const successData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS>> = [
@@ -1704,7 +1721,7 @@ function resolveFraudAlert(cardID: number | undefined, isFraud: boolean, reportI
         },
     ];
 
-    const failureData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS>> = [
+    const failureData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS | typeof ONYXKEYS.CARD_LIST>> = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
@@ -1718,6 +1735,17 @@ function resolveFraudAlert(cardID: number | undefined, isFraud: boolean, reportI
                 },
             },
         },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.CARD_LIST,
+            value: {
+                [cardID]: {
+                    nameValuePairs: {
+                        possibleFraud: previousPossibleFraud,
+                    },
+                },
+            },
+        },
     ];
 
     const parameters: ResolveFraudAlertParams = {

src/pages/home/TimeSensitiveSection/hooks/useTimeSensitiveCards.ts

@@ -1,10 +1,12 @@
 import useOnyx from '@hooks/useOnyx';
 import {isCard, isCardPendingActivate, isCardPendingIssue, isCardWithCustomZeroLimit, isCardWithPotentialFraud, isExpensifyCard} from '@libs/CardUtils';
+import {getUnresolvedCardFraudAlertAction} from '@libs/ReportUtils';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Card} from '@src/types/onyx';
 
 function useTimeSensitiveCards() {
     const [cards] = useOnyx(ONYXKEYS.CARD_LIST);
+    const [allReportActions] = useOnyx(ONYXKEYS.COLLECTION.REPORT_ACTIONS);
 
     const cardsNeedingShippingAddress: Card[] = [];
     const cardsNeedingActivation: Card[] = [];
@@ -19,7 +21,11 @@ function useTimeSensitiveCards() {
             continue;
         }
 
-        if (isCardWithPotentialFraud(card) && card.nameValuePairs?.possibleFraud?.fraudAlertReportID) {
+        const fraudAlertReportID = card.nameValuePairs?.possibleFraud?.fraudAlertReportID;
+        const reportActions = fraudAlertReportID ? allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${fraudAlertReportID}`] : undefined;
+        const hasUnresolvedFraudAction = !!fraudAlertReportID && !!getUnresolvedCardFraudAlertAction(String(fraudAlertReportID), reportActions);
+
+        if (isCardWithPotentialFraud(card) && !!fraudAlertReportID && hasUnresolvedFraudAction) {
             cardsWithFraud.push(card);
         }
 

src/pages/inbox/report/actionContents/FraudAlertContent.tsx

@@ -1,12 +1,15 @@
+import {cardByIdSelector} from '@selectors/Card';
 import React from 'react';
 import {View} from 'react-native';
 import type {ActionableItem} from '@components/ReportActionItem/ActionableItemButtons';
 import ActionableItemButtons from '@components/ReportActionItem/ActionableItemButtons';
 import useLocalize from '@hooks/useLocalize';
+import useOnyx from '@hooks/useOnyx';
 import {getActionableCardFraudAlertMessage, getOriginalMessage} from '@libs/ReportActionsUtils';
 import ReportActionItemBasicMessage from '@pages/inbox/report/ReportActionItemBasicMessage';
 import {resolveFraudAlert} from '@userActions/Card';
 import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
 import type {ReportAction} from '@src/types/onyx';
 
 type FraudAlertContentProps = {
@@ -20,6 +23,8 @@ function FraudAlertContent({action, reportID}: FraudAlertContentProps) {
     const reportActionID = action?.reportActionID;
     const originalMessage = getOriginalMessage(action);
     const cardID = originalMessage?.cardID;
+    const [card] = useOnyx(ONYXKEYS.CARD_LIST, {selector: cardByIdSelector(String(cardID))});
+    const possibleFraud = card?.nameValuePairs?.possibleFraud ?? null;
 
     const buttons: ActionableItem[] = originalMessage?.resolution
         ? []
@@ -28,15 +33,15 @@ function FraudAlertContent({action, reportID}: FraudAlertContentProps) {
                   text: 'cardPage.cardFraudAlert.confirmButtonText',
                   key: `${action.reportActionID}-cardFraudAlert-confirm`,
                   onPress: () => {
-                      resolveFraudAlert(cardID, false, reportID, reportActionID);
+                      resolveFraudAlert(cardID, false, reportID, reportActionID, possibleFraud);
                   },
                   isPrimary: true,
               },
               {
                   text: 'cardPage.cardFraudAlert.reportFraudButtonText',
                   key: `${action.reportActionID}-cardFraudAlert-reportFraud`,
                   onPress: () => {
-                      resolveFraudAlert(cardID, true, reportID, reportActionID);
+                      resolveFraudAlert(cardID, true, reportID, reportActionID, possibleFraud);
                   },
               },
           ];

tests/unit/hooks/useTimeSensitiveCards.test.ts

@@ -6,6 +6,7 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Card, CardList} from '@src/types/onyx';
 import {createRandomExpensifyCard} from '../../utils/collections/card';
+import createRandomReportAction from '../../utils/collections/reportActions';
 import waitForBatchedUpdates from '../../utils/waitForBatchedUpdates';
 
 describe('useTimeSensitiveCards', () => {
@@ -178,8 +179,15 @@ describe('useTimeSensitiveCards', () => {
             possibleFraud: {triggerAmount: 5663, triggerMerchant: 'WAL-MART #2366', currency: 'USD', fraudAlertReportID: 123456},
         });
         const cardList: CardList = {'1': cardWithFraud};
+        const unresolvedFraudAction = {
+            ...createRandomReportAction(1),
+            actionName: CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_CARD_FRAUD_ALERT,
+        };
 
         await Onyx.merge(ONYXKEYS.CARD_LIST, cardList);
+        await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${cardWithFraud.nameValuePairs?.possibleFraud?.fraudAlertReportID}`, {
+            [unresolvedFraudAction.reportActionID]: unresolvedFraudAction,
+        });
         await waitForBatchedUpdates();
 
         const {result} = renderHook(() => useTimeSensitiveCards());
@@ -210,8 +218,15 @@ describe('useTimeSensitiveCards', () => {
             possibleFraud: {triggerAmount: 5663, triggerMerchant: 'WAL-MART #2366', currency: 'USD', fraudAlertReportID: 5230242215684213},
         });
         const cardList: CardList = {'1': cardWithPendingFraudAlert};
+        const unresolvedFraudAction = {
+            ...createRandomReportAction(2),
+            actionName: CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_CARD_FRAUD_ALERT,
+        };
 
         await Onyx.merge(ONYXKEYS.CARD_LIST, cardList);
+        await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${cardWithPendingFraudAlert.nameValuePairs?.possibleFraud?.fraudAlertReportID}`, {
+            [unresolvedFraudAction.reportActionID]: unresolvedFraudAction,
+        });
         await waitForBatchedUpdates();
 
         const {result} = renderHook(() => useTimeSensitiveCards());
@@ -283,8 +298,15 @@ describe('useTimeSensitiveCards', () => {
             } as Card['nameValuePairs'],
         };
         const cardList: CardList = {'1': zeroLimitFraudCard};
+        const unresolvedFraudAction = {
+            ...createRandomReportAction(3),
+            actionName: CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_CARD_FRAUD_ALERT,
+        };
 
         await Onyx.merge(ONYXKEYS.CARD_LIST, cardList);
+        await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${zeroLimitFraudCard.nameValuePairs?.possibleFraud?.fraudAlertReportID}`, {
+            [unresolvedFraudAction.reportActionID]: unresolvedFraudAction,
+        });
         await waitForBatchedUpdates();
 
         const {result} = renderHook(() => useTimeSensitiveCards());