Skip to content
Merged
29 changes: 29 additions & 0 deletions src/hooks/useOptimisticDraftTransactions.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import type {OnyxEntry} from 'react-native-onyx';
import ONYXKEYS from '@src/ONYXKEYS';
import {transactionDraftValuesSelector} from '@src/selectors/TransactionDraft';
import type {Transaction} from '@src/types/onyx';
import useOnyx from './useOnyx';

/**
* A hook that retrieves all optimistic draft transactions,
* ensuring there is always a draft transaction available to display.
*
* If the draft transaction in Onyx data does not exist
* or contains only a single transaction, it will fallback to the provided transaction.
* Otherwise, it will use the draft transactions from Onyx data.
*/
const useOptimisticDraftTransactions = (transaction: OnyxEntry<Transaction>) => {
const [optimisticTransactions] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {
selector: transactionDraftValuesSelector,
canBeMissing: true,
});

const allTransactions = optimisticTransactions && optimisticTransactions.length > 1 ? optimisticTransactions : [transaction];
const transactions = allTransactions.filter((value): value is Transaction => !!value);

const optimisticDraftTransactions = [transactions, optimisticTransactions];

return optimisticDraftTransactions as [Transaction[], Array<OnyxEntry<Transaction>> | undefined];
};

export default useOptimisticDraftTransactions;
12 changes: 2 additions & 10 deletions src/pages/iou/request/step/IOURequestStepConfirmation.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import reportsSelector from '@selectors/Attributes';
import {hasSeenTourSelector} from '@selectors/Onboarding';
import {transactionDraftValuesSelector} from '@selectors/TransactionDraft';
import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
import {View} from 'react-native';
import DragAndDropConsumer from '@components/DragAndDrop/Consumer';
Expand All @@ -24,6 +23,7 @@ import useLocalize from '@hooks/useLocalize';
import useNetwork from '@hooks/useNetwork';
import useOnboardingTaskInformation from '@hooks/useOnboardingTaskInformation';
import useOnyx from '@hooks/useOnyx';
import useOptimisticDraftTransactions from '@hooks/useOptimisticDraftTransactions';
import useParentReportAction from '@hooks/useParentReportAction';
import useParticipantsInvoiceReport from '@hooks/useParticipantsInvoiceReport';
import usePermissions from '@hooks/usePermissions';
Expand Down Expand Up @@ -103,7 +103,6 @@ import type {RecentlyUsedCategories, Report} from '@src/types/onyx';
import type {Participant} from '@src/types/onyx/IOU';
import type {PaymentMethodType} from '@src/types/onyx/OriginalMessage';
import type {InvoiceReceiver} from '@src/types/onyx/Report';
import type Transaction from '@src/types/onyx/Transaction';
import type {Receipt} from '@src/types/onyx/Transaction';
import type {FileObject} from '@src/types/utils/Attachment';
import {isEmptyObject} from '@src/types/utils/EmptyObject';
Expand All @@ -129,14 +128,7 @@ function IOURequestStepConfirmation({
const personalDetails = usePersonalDetails();
const allPolicyCategories = usePolicyCategories();

const [optimisticTransactions] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {
selector: transactionDraftValuesSelector,
canBeMissing: true,
});
const transactions = useMemo(() => {
const allTransactions = optimisticTransactions && optimisticTransactions.length > 1 ? optimisticTransactions : [initialTransaction];
return allTransactions.filter((transaction): transaction is Transaction => !!transaction);
}, [initialTransaction, optimisticTransactions]);
const [transactions] = useOptimisticDraftTransactions(initialTransaction);
const hasMultipleTransactions = transactions.length > 1;
// Depend on transactions.length to avoid updating transactionIDs when only the transaction details change
// eslint-disable-next-line react-hooks/exhaustive-deps
Expand Down
12 changes: 2 additions & 10 deletions src/pages/iou/request/step/IOURequestStepParticipants.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import {useIsFocused} from '@react-navigation/core';
import {createPoliciesSelector} from '@selectors/Policy';
import {transactionDraftValuesSelector} from '@selectors/TransactionDraft';
import React, {useCallback, useEffect, useMemo, useRef} from 'react';
import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
import FormHelpMessage from '@components/FormHelpMessage';
import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
import useLocalize from '@hooks/useLocalize';
import useOnyx from '@hooks/useOnyx';
import useOptimisticDraftTransactions from '@hooks/useOptimisticDraftTransactions';
import usePolicyForMovingExpenses from '@hooks/usePolicyForMovingExpenses';
import useThemeStyles from '@hooks/useThemeStyles';
import {setTransactionReport} from '@libs/actions/Transaction';
Expand Down Expand Up @@ -41,7 +41,6 @@ import ROUTES from '@src/ROUTES';
import type SCREENS from '@src/SCREENS';
import type {Policy} from '@src/types/onyx';
import type {Participant} from '@src/types/onyx/IOU';
import type Transaction from '@src/types/onyx/Transaction';
import getEmptyArray from '@src/types/utils/getEmptyArray';
import KeyboardUtils from '@src/utils/keyboard';
import StepScreenWrapper from './StepScreenWrapper';
Expand Down Expand Up @@ -80,17 +79,10 @@ function IOURequestStepParticipants({
const isFocused = useIsFocused();
const {policyForMovingExpenses} = usePolicyForMovingExpenses();
const [skipConfirmation] = useOnyx(`${ONYXKEYS.COLLECTION.SKIP_CONFIRMATION}${initialTransactionID}`, {canBeMissing: true});
const [optimisticTransactions] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {
selector: transactionDraftValuesSelector,
canBeMissing: true,
});
const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: policiesSelector, canBeMissing: true});

const [lastSelectedDistanceRates] = useOnyx(ONYXKEYS.NVP_LAST_SELECTED_DISTANCE_RATES, {canBeMissing: true});
const transactions = useMemo(() => {
const allTransactions = optimisticTransactions && optimisticTransactions.length > 1 ? optimisticTransactions : [initialTransaction];
return allTransactions.filter((transaction): transaction is Transaction => !!transaction);
}, [initialTransaction, optimisticTransactions]);
const [transactions] = useOptimisticDraftTransactions(initialTransaction);
// Depend on transactions.length to avoid updating transactionIDs when only the transaction details change
// eslint-disable-next-line react-hooks/exhaustive-deps
const transactionIDs = useMemo(() => transactions?.map((transaction) => transaction.transactionID), [transactions.length]);
Expand Down
20 changes: 12 additions & 8 deletions src/pages/iou/request/step/IOURequestStepReport.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {useSearchContext} from '@components/Search/SearchContext';
import type {ListItem} from '@components/SelectionListWithSections/types';
import useConditionalCreateEmptyReportConfirmation from '@hooks/useConditionalCreateEmptyReportConfirmation';
import useOnyx from '@hooks/useOnyx';
import useOptimisticDraftTransactions from '@hooks/useOptimisticDraftTransactions';
import usePermissions from '@hooks/usePermissions';
import usePolicyForMovingExpenses from '@hooks/usePolicyForMovingExpenses';
import useRestartOnReceiptFailure from '@hooks/useRestartOnReceiptFailure';
Expand Down Expand Up @@ -80,6 +81,7 @@ function IOURequestStepReport({route, transaction}: IOURequestStepReportProps) {
useRestartOnReceiptFailure(transaction, reportIDFromRoute, iouType, action);
const isPerDiemTransaction = isPerDiemRequest(transaction);
const perDiemOriginalPolicy = getPolicyByCustomUnitID(transaction, allPolicies);
const [transactions] = useOptimisticDraftTransactions(transaction);

const handleGoBack = () => {
if (isEditing) {
Expand Down Expand Up @@ -112,14 +114,16 @@ function IOURequestStepReport({route, transaction}: IOURequestStepReportProps) {
const newPerDiemCustomUnit = getPerDiemCustomUnit(newPolicy);
const newCustomUnitID = newPerDiemCustomUnit?.customUnitID;

setTransactionReport(
transaction.transactionID,
{
reportID: item.value,
participants,
},
true,
);
for (const transactionItem of transactions) {
setTransactionReport(
transactionItem.transactionID,
{
reportID: item.value,
participants,
},
true,
);
}

// Clear subrates, and update customUnitID if policy changed for per diem transactions
if (policyChanged && isPerDiemTransaction) {
Expand Down
11 changes: 2 additions & 9 deletions src/pages/iou/request/step/IOURequestStepScan/index.native.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import {useFocusEffect} from '@react-navigation/core';
import reportsSelector from '@selectors/Attributes';
import {hasSeenTourSelector} from '@selectors/Onboarding';
import {transactionDraftValuesSelector} from '@selectors/TransactionDraft';
import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
import {Alert, AppState, InteractionManager, StyleSheet, View} from 'react-native';
import type {LayoutRectangle} from 'react-native';
Expand Down Expand Up @@ -30,6 +29,7 @@
import {useMemoizedLazyExpensifyIcons, useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
import useLocalize from '@hooks/useLocalize';
import useOnyx from '@hooks/useOnyx';
import useOptimisticDraftTransactions from '@hooks/useOptimisticDraftTransactions';
import usePermissions from '@hooks/usePermissions';
import usePersonalPolicy from '@hooks/usePersonalPolicy';
import usePolicy from '@hooks/usePolicy';
Expand Down Expand Up @@ -125,16 +125,9 @@
const transactionTaxCode = (initialTransaction?.taxCode ? initialTransaction?.taxCode : defaultTaxCode) ?? '';
const transactionTaxAmount = initialTransaction?.taxAmount ?? 0;

const [optimisticTransactions] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {
selector: transactionDraftValuesSelector,
canBeMissing: true,
});
const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${report?.policyID}`, {canBeMissing: true});
const [transactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS, {canBeMissing: true});
const transactions = useMemo(() => {
const allTransactions = optimisticTransactions && optimisticTransactions.length > 1 ? optimisticTransactions : [initialTransaction];
return allTransactions.filter((transaction): transaction is Transaction => !!transaction);
}, [initialTransaction, optimisticTransactions]);
const [transactions, optimisticTransactions] = useOptimisticDraftTransactions(initialTransaction);

const shouldAcceptMultipleFiles = !isEditing && !backTo;

Expand Down Expand Up @@ -299,7 +292,7 @@
isSelfTourViewed,
});
},
[

Check warning on line 295 in src/pages/iou/request/step/IOURequestStepScan/index.native.tsx

View workflow job for this annotation

GitHub Actions / Changed files ESLint check

React Hook useCallback has a missing dependency: 'reportNameValuePairs?.private_isArchived'. Either include it or remove the dependency array
backTo,
backToReport,
shouldGenerateTransactionThreadReport,
Expand Down Expand Up @@ -550,7 +543,7 @@
Log.warn('Error taking photo', error);
});
});
}, [

Check warning on line 546 in src/pages/iou/request/step/IOURequestStepScan/index.native.tsx

View workflow job for this annotation

GitHub Actions / Changed files ESLint check

React Hook useCallback has a missing dependency: 'askForPermissions'. Either include it or remove the dependency array
cameraPermissionStatus,
didCapturePhoto,
isMultiScanEnabled,
Expand Down
12 changes: 2 additions & 10 deletions src/pages/iou/request/step/IOURequestStepScan/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import {useIsFocused} from '@react-navigation/native';
import reportsSelector from '@selectors/Attributes';
import {hasSeenTourSelector} from '@selectors/Onboarding';
import {transactionDraftValuesSelector} from '@selectors/TransactionDraft';
import React, {useCallback, useContext, useEffect, useMemo, useReducer, useRef, useState} from 'react';
import type {LayoutRectangle} from 'react-native';
import {InteractionManager, PanResponder, StyleSheet, View} from 'react-native';
Expand Down Expand Up @@ -29,6 +28,7 @@
import {useMemoizedLazyExpensifyIcons, useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
import useLocalize from '@hooks/useLocalize';
import useOnyx from '@hooks/useOnyx';
import useOptimisticDraftTransactions from '@hooks/useOptimisticDraftTransactions';
import usePermissions from '@hooks/usePermissions';
import usePersonalPolicy from '@hooks/usePersonalPolicy';
import usePolicy from '@hooks/usePolicy';
Expand Down Expand Up @@ -117,16 +117,8 @@
const [activePolicyID] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID, {canBeMissing: true});
const [isSelfTourViewed = false] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {canBeMissing: true, selector: hasSeenTourSelector});

const [optimisticTransactions] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {
selector: transactionDraftValuesSelector,
canBeMissing: true,
});
const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${report?.policyID}`, {canBeMissing: true});

const transactions = useMemo(() => {
const allTransactions = optimisticTransactions && optimisticTransactions.length > 1 ? optimisticTransactions : [initialTransaction];
return allTransactions.filter((transaction): transaction is Transaction => !!transaction);
}, [initialTransaction, optimisticTransactions]);
const [transactions, optimisticTransactions] = useOptimisticDraftTransactions(initialTransaction);

const [videoConstraints, setVideoConstraints] = useState<MediaTrackConstraints>();
const isTabActive = useIsFocused();
Expand Down Expand Up @@ -352,7 +344,7 @@
isSelfTourViewed,
});
},
[

Check warning on line 347 in src/pages/iou/request/step/IOURequestStepScan/index.tsx

View workflow job for this annotation

GitHub Actions / Changed files ESLint check

React Hook useCallback has a missing dependency: 'reportNameValuePairs?.private_isArchived'. Either include it or remove the dependency array
backTo,
backToReport,
shouldGenerateTransactionThreadReport,
Expand Down
Loading
Loading