Skip to content
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

Fix workspace reimbursement section blinks #33962

Merged
merged 3 commits into from
Jan 8, 2024
Merged

Fix workspace reimbursement section blinks #33962

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
10797bb
remove debounce and simplify loading logic
bernhardoj Jan 4, 2024
17a0a33
remove unused import
bernhardoj Jan 4, 2024
711bc6b
add missing deps
bernhardoj Jan 4, 2024
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
26 changes: 10 additions & 16 deletions src/pages/workspace/reimburse/WorkspaceReimburseSection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,18 @@ import lodashGet from 'lodash/get';
import PropTypes from 'prop-types';
import React, {useEffect, useState} from 'react';
import {ActivityIndicator, View} from 'react-native';
import _ from 'underscore';
import ConnectBankAccountButton from '@components/ConnectBankAccountButton';
import * as Expensicons from '@components/Icon/Expensicons';
import * as Illustrations from '@components/Icon/Illustrations';
import networkPropTypes from '@components/networkPropTypes';
import Section from '@components/Section';
import Text from '@components/Text';
import usePrevious from '@hooks/usePrevious';
import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';
import BankAccount from '@libs/models/BankAccount';
import * as ReimbursementAccountProps from '@pages/ReimbursementAccount/reimbursementAccountPropTypes';
import * as Link from '@userActions/Link';
import CONST from '@src/CONST';

const propTypes = {
/** Policy values needed in the component */
Expand All @@ -35,19 +34,19 @@ const propTypes = {
function WorkspaceReimburseSection(props) {
const theme = useTheme();
const styles = useThemeStyles();
const [shouldShowLoadingSpinner, setShouldShowLoadingSpinner] = useState(false);
const [shouldShowLoadingSpinner, setShouldShowLoadingSpinner] = useState(true);
const achState = lodashGet(props.reimbursementAccount, 'achData.state', '');
const hasVBA = achState === BankAccount.STATE.OPEN;
const reimburseReceiptsUrl = `reports?policyID=${props.policy.id}&from=all&type=expense&showStates=Archived&isAdvancedFilterMode=true`;
const debounceSetShouldShowLoadingSpinner = _.debounce(() => {
const isLoading = props.reimbursementAccount.isLoading || false;
if (isLoading !== shouldShowLoadingSpinner) {
setShouldShowLoadingSpinner(isLoading);
}
}, CONST.TIMING.SHOW_LOADING_SPINNER_DEBOUNCE_TIME);
const isLoading = lodashGet(props.reimbursementAccount, 'isLoading', false);
const prevIsLoading = usePrevious(isLoading);

useEffect(() => {
debounceSetShouldShowLoadingSpinner();
}, [debounceSetShouldShowLoadingSpinner]);
if (prevIsLoading === isLoading) {
return;
}
setShouldShowLoadingSpinner(isLoading);
}, [prevIsLoading, isLoading]);

if (props.network.isOffline) {
return (
Expand All @@ -62,11 +61,6 @@ function WorkspaceReimburseSection(props) {
);
}

// If the reimbursementAccount is loading but not enough time has passed to show a spinner, then render nothing.
if (props.reimbursementAccount.isLoading && !shouldShowLoadingSpinner) {
return null;
}

if (shouldShowLoadingSpinner) {
return (
<View style={[styles.flex1, styles.alignItemsCenter, styles.justifyContentCenter]}>
Expand Down