diff --git a/src/components/ReportActionItem/MoneyRequestReportPreview/EmptyMoneyRequestReportPreview.tsx b/src/components/ReportActionItem/MoneyRequestReportPreview/EmptyMoneyRequestReportPreview.tsx index 54b2522e98ff..52dd5a2977f4 100644 --- a/src/components/ReportActionItem/MoneyRequestReportPreview/EmptyMoneyRequestReportPreview.tsx +++ b/src/components/ReportActionItem/MoneyRequestReportPreview/EmptyMoneyRequestReportPreview.tsx @@ -1,5 +1,4 @@ import React from 'react'; -import type {ReactNode} from 'react'; import {View} from 'react-native'; import * as Expensicons from '@components/Icon/Expensicons'; import ImageSVG from '@components/ImageSVG'; @@ -9,7 +8,7 @@ import useResponsiveLayout from '@hooks/useResponsiveLayout'; import useTheme from '@hooks/useTheme'; import useThemeStyles from '@hooks/useThemeStyles'; -function EmptyMoneyRequestReportPreview({emptyReportPreviewAction}: {emptyReportPreviewAction: ReactNode | undefined}) { +function EmptyMoneyRequestReportPreview() { const styles = useThemeStyles(); const theme = useTheme(); const {translate} = useLocalize(); @@ -18,7 +17,7 @@ function EmptyMoneyRequestReportPreview({emptyReportPreviewAction}: {emptyReport return ( - + {translate('search.moneyRequestReport.emptyStateTitle')} - {!!emptyReportPreviewAction && emptyReportPreviewAction} ); } diff --git a/src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx b/src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx index 3fd942bbba81..96ba5d141dde 100644 --- a/src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx +++ b/src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx @@ -110,7 +110,9 @@ function MoneyRequestReportPreviewContent({ // so we defer the loading state update to ensure transactions are loaded const shouldShowLoadingDeferred = useDeferredValue(shouldShowLoading); const lastTransaction = transactions?.at(0); - const shouldShowEmptyPlaceholder = transactions.length === 0; + const shouldShowSkeleton = shouldShowLoading && transactions.length === 0; + const shouldShowEmptyPlaceholder = transactions.length === 0 && !shouldShowLoading; + const showStatusAndSkeleton = !shouldShowEmptyPlaceholder; const theme = useTheme(); const styles = useThemeStyles(); const StyleUtils = useStyleUtils(); @@ -636,13 +638,15 @@ function MoneyRequestReportPreviewContent({ - {shouldShowEmptyPlaceholder ? ( + {showStatusAndSkeleton && shouldShowSkeleton ? ( ) : ( - - {isIconNeeded && {approvedOrSettledIcon}} - {`${reportStatus} ${CONST.DOT_SEPARATOR} ${expenseCount}`} - + !shouldShowEmptyPlaceholder && ( + + {isIconNeeded && {approvedOrSettledIcon}} + {`${reportStatus} ${CONST.DOT_SEPARATOR} ${expenseCount}`} + + ) )} {!shouldUseNarrowLayout && transactions.length > 2 && reportPreviewStyles.expenseCountVisible && ( @@ -727,7 +731,7 @@ function MoneyRequestReportPreviewContent({ ListFooterComponent={} ListHeaderComponent={} /> - {shouldShowEmptyPlaceholder && } + {shouldShowEmptyPlaceholder && } )}