Skip to content

Revert "fix: use correct receipt files with URIs when multi-scan via QAB [2]" #78055

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
grgia wants to merge 1 commit into from
Closed

Revert "fix: use correct receipt files with URIs when multi-scan via QAB [2]" #78055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions src/pages/iou/request/step/IOURequestStepScan/ReceiptPreviews/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import {transactionDraftReceiptsSelector} from '@selectors/TransactionDraft';
import React, {useEffect, useRef} from 'react';
import React, {useEffect, useMemo, useRef} from 'react';
import {View} from 'react-native';
import type {FlatList as FlatListType} from 'react-native';
import Animated, {useAnimatedStyle, useSharedValue, withTiming} from 'react-native-reanimated';
import Button from '@components/Button';
import FlatList from '@components/FlatList';
import * as Expensicons from '@components/Icon/Expensicons';

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

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

'@components/Icon/Expensicons' import is restricted from being used by a pattern. Direct imports from Icon/Expensicons are deprecated. Please use lazy loading hooks instead. Use `useMemoizedLazyExpensifyIcons` from @hooks/useLazyAsset. See docs/LAZY_ICONS_AND_ILLUSTRATIONS.md for details

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

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

'@components/Icon/Expensicons' import is restricted from being used. Direct imports from @components/Icon/Expensicons are deprecated. Please use lazy loading hooks instead. Use `useMemoizedLazyExpensifyIcons` from @hooks/useLazyAsset. See docs/LAZY_ICONS_AND_ILLUSTRATIONS.md for details
import Image from '@components/Image';
import {PressableWithFeedback} from '@components/Pressable';
import useLocalize from '@hooks/useLocalize';
Expand All @@ -15,6 +15,7 @@
import useThemeStyles from '@hooks/useThemeStyles';
import useWindowDimensions from '@hooks/useWindowDimensions';
import Navigation from '@libs/Navigation/Navigation';
import type {ReceiptFile} from '@pages/iou/request/step/IOURequestStepScan/types';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';
Expand All @@ -25,7 +26,7 @@

type ReceiptPreviewsProps = {
/** Submit method */
submit: () => void;
submit: (files: ReceiptFile[]) => void;

/** If the receipts preview should be shown */
isMultiScanEnabled: boolean;
Expand All @@ -39,12 +40,15 @@
const isPreviewsVisible = useSharedValue(false);
const previewsHeight = styles.receiptPlaceholder.height + styles.pv2.paddingVertical * 2;
const previewItemWidth = styles.receiptPlaceholder.width + styles.receiptPlaceholder.marginRight;
const initialReceiptsAmount = (windowWidth - styles.ph4.paddingHorizontal * 2 - styles.singleAvatarMedium.width) / previewItemWidth;
const initialReceiptsAmount = useMemo(
() => (windowWidth - styles.ph4.paddingHorizontal * 2 - styles.singleAvatarMedium.width) / previewItemWidth,
[windowWidth, styles, previewItemWidth],
);
const [optimisticTransactionsReceipts] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {
selector: transactionDraftReceiptsSelector,
canBeMissing: true,
});
const receipts = (() => {
const receipts = useMemo(() => {
if (optimisticTransactionsReceipts && optimisticTransactionsReceipts.length >= initialReceiptsAmount) {
return optimisticTransactionsReceipts;
}
Expand All @@ -53,7 +57,7 @@
receiptsWithPlaceholders.push(undefined);
}
return receiptsWithPlaceholders;
})();
}, [initialReceiptsAmount, optimisticTransactionsReceipts]);
const isScrollEnabled = optimisticTransactionsReceipts ? optimisticTransactionsReceipts.length >= receipts.length : false;
const flatListRef = useRef<FlatListType<ReceiptWithTransactionID | undefined>>(null);
const receiptsPhotosLength = optimisticTransactionsReceipts?.length ?? 0;
Expand Down Expand Up @@ -113,6 +117,11 @@
};
});

const submitReceipts = () => {
const transactionReceipts = (optimisticTransactionsReceipts ?? []).filter((receipt): receipt is ReceiptWithTransactionID & {source: string} => !!receipt.source);
submit(transactionReceipts);
};

return (
<Animated.View style={slideInStyle}>
<View style={styles.pr4}>
Expand All @@ -135,7 +144,7 @@
innerStyles={[styles.singleAvatarMedium, styles.bgGreenSuccess]}
icon={Expensicons.ArrowRight}
iconFill={theme.white}
onPress={submit}
onPress={submitReceipts}
/>
</SubmitButtonShadow>
</View>
Expand Down
8 changes: 1 addition & 7 deletions src/pages/iou/request/step/IOURequestStepScan/index.native.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@
navigateToParticipantPage(iouType, initialTransactionID, reportID);
}
},
[

Check warning on line 525 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: 'policyRecentlyUsedCurrencies'. Either include it or remove the dependency array
backTo,
initialTransaction?.isFromGlobalCreate,
initialTransaction?.currency,
Expand Down Expand Up @@ -667,12 +667,6 @@
[shouldSkipConfirmation, navigateToConfirmationStep, initialTransaction?.amount, iouType, shouldStartLocationPermissionFlow],
);

const submitMultiScanReceipts = () => {
const transactionIDs = new Set(optimisticTransactions?.map((transaction) => transaction?.transactionID));
const validReceiptFiles = receiptFiles.filter((receiptFile) => transactionIDs.has(receiptFile.transactionID));
submitReceipts(validReceiptFiles);
};

const viewfinderLayout = useRef<LayoutRectangle>(null);

const capturePhoto = useCallback(() => {
Expand Down Expand Up @@ -767,7 +761,7 @@
Log.warn('Error taking photo', error);
});
});
}, [

Check warning on line 764 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 Expand Up @@ -987,7 +981,7 @@
{canUseMultiScan && (
<ReceiptPreviews
isMultiScanEnabled={isMultiScanEnabled}
submit={submitMultiScanReceipts}
submit={submitReceipts}
/>
)}

Expand Down
8 changes: 1 addition & 7 deletions src/pages/iou/request/step/IOURequestStepScan/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,7 @@
navigateToParticipantPage(iouType, initialTransactionID, reportID);
}
},
[

Check warning on line 580 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: 'policyRecentlyUsedCurrencies'. Either include it or remove the dependency array
backTo,
initialTransaction?.isFromGlobalCreate,
initialTransaction?.currency,
Expand Down Expand Up @@ -849,12 +849,6 @@
});
};

const submitMultiScanReceipts = () => {
const transactionIDs = new Set(optimisticTransactions?.map((transaction) => transaction?.transactionID));
const validReceiptFiles = receiptFiles.filter((receiptFile) => transactionIDs.has(receiptFile.transactionID));
submitReceipts(validReceiptFiles);
};

const mobileCameraView = () => (
<>
<View style={[styles.cameraView]}>
Expand Down Expand Up @@ -1028,7 +1022,7 @@
{canUseMultiScan && (
<ReceiptPreviews
isMultiScanEnabled={isMultiScanEnabled}
submit={submitMultiScanReceipts}
submit={submitReceipts}
/>
)}
</>
Expand Down
Loading