Skip to content

Commit a9e10c1

Browse files
authored
Revert "Hover-to-view for receipt thumbnails"
1 parent 74b0c6c commit a9e10c1

10 files changed

Lines changed: 9 additions & 252 deletions

File tree

src/CONST/index.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1058,7 +1058,6 @@ const CONST = {
10581058
SHUTTER_SIZE: 90,
10591059
MAX_REPORT_PREVIEW_RECEIPTS: 3,
10601060
},
1061-
RECEIPT_PREVIEW_TOP_BOTTOM_MARGIN: 120,
10621061
REPORT: {
10631062
ROLE: {
10641063
ADMIN: 'admin',
@@ -1533,8 +1532,6 @@ const CONST = {
15331532
SEARCH_MOST_RECENT_OPTIONS: 'search_most_recent_options',
15341533
DEBOUNCE_HANDLE_SEARCH: 'debounce_handle_search',
15351534
FAST_SEARCH_TREE_CREATION: 'fast_search_tree_creation',
1536-
SHOW_HOVER_PREVIEW_DELAY: 270,
1537-
SHOW_HOVER_PREVIEW_ANIMATION_DURATION: 200,
15381535
},
15391536
PRIORITY_MODE: {
15401537
GSD: 'gsd',

src/components/DistanceEReceipt.tsx

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,9 @@ import Text from './Text';
2222
type DistanceEReceiptProps = {
2323
/** The transaction for the distance expense */
2424
transaction: Transaction;
25-
26-
/** Whether the distanceEReceipt is shown as hover preview */
27-
hoverPreview?: boolean;
2825
};
2926

30-
function DistanceEReceipt({transaction, hoverPreview = false}: DistanceEReceiptProps) {
27+
function DistanceEReceipt({transaction}: DistanceEReceiptProps) {
3128
const styles = useThemeStyles();
3229
const {translate} = useLocalize();
3330
const thumbnail = hasReceipt(transaction) ? getThumbnailAndImageURIs(transaction).thumbnail : null;
@@ -45,7 +42,7 @@ function DistanceEReceipt({transaction, hoverPreview = false}: DistanceEReceiptP
4542
[waypoints],
4643
);
4744
return (
48-
<View style={[styles.flex1, styles.alignItemsCenter, hoverPreview && styles.mhv5]}>
45+
<View style={[styles.flex1, styles.alignItemsCenter]}>
4946
<ScrollView
5047
style={styles.w100}
5148
contentContainerStyle={[styles.flexGrow1, styles.justifyContentCenter, styles.alignItemsCenter]}

src/components/SelectionList/types.ts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -276,20 +276,11 @@ type TransactionListItemType = ListItem &
276276
/** Key used internally by React */
277277
keyForList: string;
278278

279-
/** The name of the file used for a receipt */
280-
filename?: string;
281-
282279
/** Attendees in the transaction */
283280
attendees?: Attendee[];
284281

285282
/** Precomputed violations */
286283
violations?: TransactionViolation[];
287-
288-
/** The CC for this transaction */
289-
cardID?: number;
290-
291-
/** The display name of the purchaser card, if any */
292-
cardName?: string;
293284
};
294285

295286
type ReportActionListItemType = ListItem &

src/components/TransactionItemRow/DataCells/ReceiptCell.tsx

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ import {View} from 'react-native';
33
import type {ViewStyle} from 'react-native';
44
import {Receipt} from '@components/Icon/Expensicons';
55
import ReceiptImage from '@components/ReceiptImage';
6-
import ReceiptPreview from '@components/TransactionItemRow/ReceiptPreview';
7-
import useHover from '@hooks/useHover';
86
import useStyleUtils from '@hooks/useStyleUtils';
97
import useTheme from '@hooks/useTheme';
108
import useThemeStyles from '@hooks/useThemeStyles';
@@ -20,10 +18,10 @@ function ReceiptCell({transactionItem, isSelected, style}: {transactionItem: Tra
2018
const styles = useThemeStyles();
2119
const StyleUtils = useStyleUtils();
2220
const backgroundStyles = isSelected ? StyleUtils.getBackgroundColorStyle(theme.buttonHoveredBG) : StyleUtils.getBackgroundColorStyle(theme.border);
23-
const {hovered, bind} = useHover();
24-
const isEReceipt = transactionItem.hasEReceipt && !hasReceiptSource(transactionItem);
21+
2522
let source = transactionItem?.receipt?.source ?? '';
26-
if (source) {
23+
24+
if (source && typeof source === 'string') {
2725
const filename = getFileName(source);
2826
const receiptURIs = getThumbnailAndImageURIs(transactionItem, null, filename);
2927
source = tryResolveUrlFromApiRoot(receiptURIs.thumbnail ?? receiptURIs.image ?? '');
@@ -38,12 +36,10 @@ function ReceiptCell({transactionItem, isSelected, style}: {transactionItem: Tra
3836
backgroundStyles,
3937
style,
4038
]}
41-
onMouseEnter={bind.onMouseEnter}
42-
onMouseLeave={bind.onMouseLeave}
4339
>
4440
<ReceiptImage
4541
source={source}
46-
isEReceipt={isEReceipt}
42+
isEReceipt={transactionItem.hasEReceipt && !hasReceiptSource(transactionItem)}
4743
transactionID={transactionItem.transactionID}
4844
shouldUseThumbnailImage={!transactionItem?.receipt?.source}
4945
isAuthTokenRequired
@@ -56,12 +52,6 @@ function ReceiptCell({transactionItem, isSelected, style}: {transactionItem: Tra
5652
loadingIndicatorStyles={styles.bgTransparent}
5753
transactionItem={transactionItem}
5854
/>
59-
<ReceiptPreview
60-
source={source}
61-
hovered={hovered}
62-
isEReceipt={!!isEReceipt}
63-
transactionItem={transactionItem}
64-
/>
6555
</View>
6656
);
6757
}

src/components/TransactionItemRow/ReceiptPreview/index.native.tsx

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/components/TransactionItemRow/ReceiptPreview/index.tsx

Lines changed: 0 additions & 146 deletions
This file was deleted.

src/libs/SearchUIUtils.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -750,10 +750,12 @@ function getTransactionsSections(data: OnyxTypes.SearchResults['data'], metadata
750750
const report = data[`${ONYXKEYS.COLLECTION.REPORT}${transactionItem.reportID}`];
751751
const policy = data[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`];
752752
const shouldShowBlankTo = !report || isOpenExpenseReport(report);
753+
753754
const transactionViolations = getTransactionViolations(allViolations, transactionItem);
754755
// Use Map.get() for faster lookups with default values
755756
const from = personalDetailsMap.get(transactionItem.accountID.toString()) ?? emptyPersonalDetails;
756757
const to = transactionItem.managerID && !shouldShowBlankTo ? (personalDetailsMap.get(transactionItem.managerID.toString()) ?? emptyPersonalDetails) : emptyPersonalDetails;
758+
757759
const {formattedFrom, formattedTo, formattedTotal, formattedMerchant, date} = getTransactionItemCommonFormattedProperties(transactionItem, from, to, policy);
758760

759761
const transactionSection: TransactionListItemType = {
@@ -778,7 +780,7 @@ function getTransactionsSections(data: OnyxTypes.SearchResults['data'], metadata
778780
isAmountColumnWide: shouldShowAmountInWideColumn,
779781
isTaxAmountColumnWide: shouldShowTaxAmountInWideColumn,
780782
violations: transactionViolations,
781-
filename: transactionItem.filename,
783+
782784
// Manually copying all the properties from transactionItem
783785
transactionID: transactionItem.transactionID,
784786
created: transactionItem.created,
@@ -816,8 +818,6 @@ function getTransactionsSections(data: OnyxTypes.SearchResults['data'], metadata
816818
errors: transactionItem.errors,
817819
isActionLoading: transactionItem.isActionLoading,
818820
hasViolation: transactionItem.hasViolation,
819-
cardID: transactionItem.cardID,
820-
cardName: transactionItem.cardName,
821821
};
822822

823823
transactionsSections.push(transactionSection);

src/styles/index.ts

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5689,32 +5689,6 @@ const styles = (theme: ThemeColors) =>
56895689
aspectRatio: 1.7,
56905690
},
56915691

5692-
receiptPreview: {
5693-
position: 'absolute',
5694-
left: 60,
5695-
top: 60,
5696-
width: 380,
5697-
maxHeight: 'calc(100vh - 120px)',
5698-
borderRadius: variables.componentBorderRadiusLarge,
5699-
borderWidth: 1,
5700-
borderColor: theme.border,
5701-
overflow: 'hidden',
5702-
boxShadow: theme.shadow,
5703-
backgroundColor: theme.appBG,
5704-
},
5705-
5706-
receiptPreviewEReceiptsContainer: {
5707-
...sizing.w100,
5708-
...sizing.h100,
5709-
backgroundColor: colors.green800,
5710-
},
5711-
5712-
receiptPreviewEReceipt: {
5713-
...flex.flexColumn,
5714-
...flex.justifyContentCenter,
5715-
...flex.alignItemsCenter,
5716-
},
5717-
57185692
topBarWrapper: {
57195693
zIndex: 15,
57205694
},

src/types/onyx/SearchResults.ts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -409,9 +409,6 @@ type SearchTransaction = {
409409
/** The ID of the report the transaction is associated with */
410410
reportID: string;
411411

412-
/** The name of the file used for a receipt */
413-
filename?: string;
414-
415412
/** The report ID of the transaction thread associated with the transaction */
416413
transactionThreadReportID: string;
417414

@@ -438,12 +435,6 @@ type SearchTransaction = {
438435

439436
/** The type of action that's pending */
440437
pendingAction?: OnyxCommon.PendingAction;
441-
442-
/** The CC for this transaction */
443-
cardID?: number;
444-
445-
/** The display name of the purchaser card, if any */
446-
cardName?: string;
447438
};
448439

449440
/** Model of tasks search result */

0 commit comments

Comments
 (0)