Skip to content

Commit df93f4f

Browse files
committed
minor fix
1 parent 2a61223 commit df93f4f

6 files changed

Lines changed: 17 additions & 13 deletions

File tree

src/components/EReceiptThumbnail.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ type EReceiptThumbnailProps = {
3939
function EReceiptThumbnail({transactionID, borderRadius, fileExtension, isReceiptThumbnail = false, centerIconV = true, iconSize = 'large'}: EReceiptThumbnailProps) {
4040
const styles = useThemeStyles();
4141
const StyleUtils = useStyleUtils();
42-
const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(transactionID)}`);
42+
const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(transactionID)}`, {
43+
canBeMissing: true,
44+
});
4345

4446
const {primaryColor, secondaryColor, MCCIcon, tripIcon, backgroundImage} = useEReceipt(transaction, fileExtension, isReceiptThumbnail);
4547
const isPerDiemRequest = isPerDiemRequestTransactionUtils(transaction);

src/components/MoneyReportHeader.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -367,14 +367,13 @@ function MoneyReportHeader({
367367
if (!requestParentReportAction) {
368368
return;
369369
}
370-
const iouTransactionID = isMoneyRequestAction(requestParentReportAction) ? getOriginalMessage(requestParentReportAction)?.IOUTransactionID : undefined;
371370
const reportID = transactionThreadReport?.reportID;
372371

373372
if (!iouTransactionID || !reportID) {
374373
return;
375374
}
376375
markAsCashAction(iouTransactionID, reportID);
377-
}, [requestParentReportAction, transactionThreadReport?.reportID]);
376+
}, [iouTransactionID, requestParentReportAction, transactionThreadReport?.reportID]);
378377

379378
const getStatusIcon: (src: IconAsset) => React.ReactNode = (src) => (
380379
<Icon

src/components/PerDiemEReceipt.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,9 @@ function PerDiemEReceipt({transactionID}: PerDiemEReceiptProps) {
5252
const styles = useThemeStyles();
5353
const StyleUtils = useStyleUtils();
5454
const {translate} = useLocalize();
55-
const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(transactionID)}`);
55+
const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(transactionID)}`, {
56+
canBeMissing: true,
57+
});
5658

5759
// Get receipt colorway, or default to Yellow.
5860
const {backgroundColor: primaryColor, color: secondaryColor} = StyleUtils.getEReceiptColorStyles(StyleUtils.getEReceiptColorCode(transaction)) ?? {};

src/components/ReportActionItem/TransactionPreview/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ function TransactionPreview(props: TransactionPreviewProps) {
4747
const report = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${iouReportID}`];
4848
const route = useRoute<PlatformStackRouteProp<TransactionDuplicateNavigatorParamList, typeof SCREENS.TRANSACTION_DUPLICATE.REVIEW>>();
4949
const isMoneyRequestAction = isMoneyRequestActionReportActionsUtils(action);
50-
const transactionID = transactionIDFromProps ?? (isMoneyRequestAction ? getOriginalMessage(action)?.IOUTransactionID : null);
50+
const transactionID = transactionIDFromProps ?? (isMoneyRequestAction ? getOriginalMessage(action)?.IOUTransactionID : undefined);
5151
const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(transactionID)}`, {canBeMissing: true});
5252
const violations = useTransactionViolations(transaction?.transactionID);
5353
const [walletTerms] = useOnyx(ONYXKEYS.WALLET_TERMS, {canBeMissing: true});

src/pages/Debug/Transaction/DebugTransactionPage.tsx

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ import useOnyx from '@hooks/useOnyx';
88
import useThemeStyles from '@hooks/useThemeStyles';
99
import Debug from '@libs/actions/Debug';
1010
import DebugUtils from '@libs/DebugUtils';
11-
import * as DeviceCapabilities from '@libs/DeviceCapabilities';
11+
import {canUseTouchScreen} from '@libs/DeviceCapabilities';
1212
import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
1313
import type {DebugTabNavigatorRoutes} from '@libs/Navigation/DebugTabNavigator';
1414
import DebugTabNavigator from '@libs/Navigation/DebugTabNavigator';
1515
import Navigation from '@libs/Navigation/Navigation';
1616
import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
1717
import type {DebugParamList} from '@libs/Navigation/types';
18-
import * as PolicyUtils from '@libs/PolicyUtils';
19-
import * as TagsOptionsListUtils from '@libs/TagsOptionsListUtils';
18+
import {getTagLists} from '@libs/PolicyUtils';
19+
import {hasEnabledTags} from '@libs/TagsOptionsListUtils';
2020
import DebugDetails from '@pages/Debug/DebugDetails';
2121
import DebugJSON from '@pages/Debug/DebugJSON';
2222
import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
@@ -34,10 +34,12 @@ function DebugTransactionPage({
3434
},
3535
}: DebugTransactionPageProps) {
3636
const {translate} = useLocalize();
37-
const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(transactionID)}`);
37+
const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(transactionID)}`, {
38+
canBeMissing: true,
39+
});
3840
const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${transaction?.reportID}`);
3941
const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${report?.policyID}`);
40-
const policyTagLists = useMemo(() => PolicyUtils.getTagLists(policyTags), [policyTags]);
42+
const policyTagLists = useMemo(() => getTagLists(policyTags), [policyTags]);
4143

4244
const styles = useThemeStyles();
4345

@@ -47,7 +49,7 @@ function DebugTransactionPage({
4749
formType={CONST.DEBUG.FORMS.TRANSACTION}
4850
data={transaction}
4951
policyID={report?.policyID}
50-
policyHasEnabledTags={TagsOptionsListUtils.hasEnabledTags(policyTagLists)}
52+
policyHasEnabledTags={hasEnabledTags(policyTagLists)}
5153
onSave={(data) => {
5254
Debug.setDebugData(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, data);
5355
}}
@@ -95,7 +97,7 @@ function DebugTransactionPage({
9597
<ScreenWrapper
9698
includeSafeAreaPaddingBottom={false}
9799
shouldEnableKeyboardAvoidingView={false}
98-
shouldEnableMinHeight={DeviceCapabilities.canUseTouchScreen()}
100+
shouldEnableMinHeight={canUseTouchScreen()}
99101
testID={DebugTransactionPage.displayName}
100102
>
101103
{({safeAreaPaddingBottomStyle}) => (

src/pages/TransactionDuplicate/Review.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import useOnyx from '@hooks/useOnyx';
1212
import useThemeStyles from '@hooks/useThemeStyles';
1313
import useTransactionViolations from '@hooks/useTransactionViolations';
1414
import {dismissDuplicateTransactionViolation} from '@libs/actions/Transaction';
15-
import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
1615
import Navigation from '@libs/Navigation/Navigation';
1716
import type {PlatformStackRouteProp} from '@libs/Navigation/PlatformStackNavigation/types';
1817
import type {TransactionDuplicateNavigatorParamList} from '@libs/Navigation/types';

0 commit comments

Comments
 (0)