Skip to content

fix unreported expense skeletons #63042

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

Merged
luacmartins merged 4 commits into from
Jun 2, 2025
+6 −3
Merged

fix unreported expense skeletons #63042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb3fee1
fix skeletons
sumo-slonik May 29, 2025
5003527
add key to button
sumo-slonik May 30, 2025
4e03e2a
fix condition
sumo-slonik Jun 2, 2025
c4dc8fb
rename variable
sumo-slonik Jun 2, 2025
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
1 change: 1 addition & 0 deletions src/components/EmptyStateComponent/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ function EmptyStateComponent({
<View style={[styles.gap2, styles.mt5, !shouldUseNarrowLayout ? styles.flexRow : styles.mhAuto]}>
{buttons?.map(({buttonText, buttonAction, success, icon, isDisabled, style}) => (
<Button
key={buttonText}
success={success}
onPress={buttonAction}
text={buttonText}
Expand Down
8 changes: 5 additions & 3 deletions src/pages/AddUnreportedExpense.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import SelectionList from '@components/SelectionList';
import type {ListItem, SectionListDataType, SelectionListHandle} from '@components/SelectionList/types';
import UnreportedExpensesSkeleton from '@components/Skeletons/UnreportedExpensesSkeleton';
import useLocalize from '@hooks/useLocalize';
import useNetwork from '@hooks/useNetwork';
import useThemeStyles from '@hooks/useThemeStyles';
import {fetchUnreportedExpenses} from '@libs/actions/UnreportedExpenses';
import interceptAnonymousUser from '@libs/interceptAnonymousUser';
Expand All @@ -31,12 +32,13 @@ function AddUnreportedExpense({route}: AddUnreportedExpensePageType) {
const {translate} = useLocalize();
const [errorMessage, setErrorMessage] = useState<string>('');
const [offset, setOffset] = useState(0);
const {isOffline} = useNetwork();

const {reportID, backToReport} = route.params;
const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {canBeMissing: true});
const [hasMoreUnreportedTransactionsResults] = useOnyx(ONYXKEYS.HAS_MORE_UNREPORTED_TRANSACTIONS_RESULTS, {canBeMissing: true});
const [isLoadingUnreportedTransactions] = useOnyx(ONYXKEYS.IS_LOADING_UNREPORTED_TRANSACTIONS, {canBeMissing: true});

const shouldShowUnreportedTransactionsSkeletons = isLoadingUnreportedTransactions && hasMoreUnreportedTransactionsResults && !isOffline;
function getUnreportedTransactions(transactions: OnyxCollection<Transaction>) {
if (!transactions) {
return [];
Expand Down Expand Up @@ -174,8 +176,8 @@ function AddUnreportedExpense({route}: AddUnreportedExpensePageType) {
setErrorMessage('');
}}
onEndReached={fetchMoreUnreportedTransactions}
onEndReachedThreshold={0.9}
listFooterContent={isLoadingUnreportedTransactions ? <UnreportedExpensesSkeleton fixedNumberOfItems={3} /> : undefined}
onEndReachedThreshold={0.75}
listFooterContent={shouldShowUnreportedTransactionsSkeletons ? <UnreportedExpensesSkeleton fixedNumberOfItems={3} /> : undefined}
>
{!!errorMessage && (
<FormHelpMessage
Expand Down