Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 0 additions & 10 deletions config/oxlint/oxlint.seatbelt.tsv
Original file line number Diff line number Diff line change
Expand Up @@ -1803,9 +1803,7 @@
"../../src/pages/workspace/companyCards/addNew/CardTypeStep.tsx" "no-restricted-imports" 1
"../../src/pages/workspace/companyCards/addNew/CompanyCardLayoutNamePage.tsx" "no-restricted-imports" 1
"../../src/pages/workspace/companyCards/addNew/CompanyCardsImportedPage.tsx" "no-restricted-imports" 1
"../../src/pages/workspace/companyCards/addNew/CompanyCardsImportedPage.tsx" "rulesdir/no-onyx-loading-status" 2
"../../src/pages/workspace/companyCards/addNew/DetailsStep.tsx" "no-restricted-imports" 1
"../../src/pages/workspace/companyCards/addNew/DynamicAddNewCardPage.tsx" "rulesdir/no-onyx-loading-status" 1
"../../src/pages/workspace/companyCards/addNew/ImportFromFileStep.tsx" "no-restricted-imports" 1
"../../src/pages/workspace/companyCards/addNew/PlaidConnectionStep.tsx" "no-restricted-imports" 1
"../../src/pages/workspace/companyCards/addNew/SelectBankStep.tsx" "no-restricted-imports" 1
Expand All @@ -1814,28 +1812,21 @@
"../../src/pages/workspace/companyCards/addNew/SelectFeedType.tsx" "no-restricted-imports" 1
"../../src/pages/workspace/companyCards/assignCard/CardNameStep.tsx" "no-restricted-imports" 1
"../../src/pages/workspace/companyCards/assignCard/TransactionStartDateStep.tsx" "react-hooks/purity" 1
"../../src/pages/workspace/companyCards/assignCard/TransactionStartDateStep.tsx" "rulesdir/no-onyx-loading-status" 1
"../../src/pages/workspace/companyCards/BankConnection/index.native.tsx" "no-restricted-imports" 1
"../../src/pages/workspace/companyCards/BankConnection/index.tsx" "no-restricted-imports" 1
"../../src/pages/workspace/companyCards/BankConnection/index.tsx" "react-hooks/set-state-in-effect" 1
"../../src/pages/workspace/companyCards/DynamicWorkspaceCompanyCardDetailsPage.tsx" "@typescript-eslint/no-deprecated/MenuItemWithTopDescription" 1
"../../src/pages/workspace/companyCards/DynamicWorkspaceCompanyCardDetailsPage.tsx" "@typescript-eslint/no-unsafe-type-assertion" 1
"../../src/pages/workspace/companyCards/DynamicWorkspaceCompanyCardDetailsPage.tsx" "no-restricted-imports" 1
"../../src/pages/workspace/companyCards/DynamicWorkspaceCompanyCardDetailsPage.tsx" "rulesdir/no-onyx-loading-status" 2
"../../src/pages/workspace/companyCards/WorkspaceCompanyCardAddWorkEmailPage.tsx" "no-restricted-imports" 1
"../../src/pages/workspace/companyCards/WorkspaceCompanyCardEditCardNamePage.tsx" "no-restricted-imports" 1
"../../src/pages/workspace/companyCards/WorkspaceCompanyCardEditCardNamePage.tsx" "rulesdir/no-onyx-loading-status" 1
"../../src/pages/workspace/companyCards/WorkspaceCompanyCardEditTransactionStartDatePage.tsx" "react-hooks/purity" 1
"../../src/pages/workspace/companyCards/WorkspaceCompanyCardFeedSelectorPage.tsx" "@typescript-eslint/no-unsafe-type-assertion" 2
"../../src/pages/workspace/companyCards/WorkspaceCompanyCardFeedSelectorPage.tsx" "no-restricted-imports" 1
"../../src/pages/workspace/companyCards/WorkspaceCompanyCardsBulkEditTransactionStartDatePage.tsx" "rulesdir/no-onyx-loading-status" 1
"../../src/pages/workspace/companyCards/WorkspaceCompanyCardsErrorConfirmation.tsx" "@typescript-eslint/no-unsafe-type-assertion" 1
"../../src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx" "rulesdir/no-onyx-loading-status" 1
"../../src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsFeedNamePage.tsx" "no-restricted-imports" 1
"../../src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsFeedNamePage.tsx" "rulesdir/no-onyx-loading-status" 2
"../../src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx" "@typescript-eslint/no-unsafe-type-assertion" 1
"../../src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx" "no-restricted-imports" 1
"../../src/pages/workspace/companyCards/WorkspaceCompanyCardStatementCloseDatePage.tsx" "rulesdir/no-onyx-loading-status" 2
"../../src/pages/workspace/companyCards/WorkspaceCompanyCardStatementCloseDateSelectionList/index.tsx" "@typescript-eslint/no-deprecated/MenuItemWithTopDescription" 1
"../../src/pages/workspace/companyCards/WorkspaceCompanyCardStatementCloseDateSelectionList/index.tsx" "no-restricted-imports" 1
"../../src/pages/workspace/companyCards/WorkspaceVerifyWorkAccountPage.tsx" "@typescript-eslint/no-unsafe-type-assertion" 2
Expand Down Expand Up @@ -1887,7 +1878,6 @@
"../../src/pages/workspace/expensifyCard/issueNew/spendRules/SetSpendRulesStep.tsx" "@typescript-eslint/no-unsafe-type-assertion" 1
"../../src/pages/workspace/expensifyCard/issueNew/spendRules/SetSpendRulesStep.tsx" "react-hooks/purity" 2
"../../src/pages/workspace/expensifyCard/issueNew/spendRules/SpendRuleSelectionPage.tsx" "no-restricted-imports" 1
"../../src/pages/workspace/expensifyCard/issueNew/spendRules/SpendRuleSelectionPage.tsx" "rulesdir/no-onyx-loading-status" 1
"../../src/pages/workspace/expensifyCard/WorkspaceCardSettingsPage.tsx" "no-restricted-imports" 1
"../../src/pages/workspace/expensifyCard/WorkspaceCardsListLabel.tsx" "react-hooks/purity" 1
"../../src/pages/workspace/expensifyCard/WorkspaceExpensifyCardAddWorkEmailPage.tsx" "no-restricted-imports" 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
import type SCREENS from '@src/SCREENS';
import type {CompanyCardFeedWithDomainID} from '@src/types/onyx';
import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';

import {companyCardCustomNamesSelector} from '@selectors/Card';
import {format, parseISO} from 'date-fns';
Expand Down Expand Up @@ -113,8 +112,8 @@ function DynamicWorkspaceCompanyCardDetailsPage({route}: DynamicWorkspaceCompany
const [connectionSyncProgress] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CONNECTION_SYNC_PROGRESS}${policyID}`);
const [customCardNames] = useOnyx(ONYXKEYS.NVP_EXPENSIFY_COMPANY_CARDS_CUSTOM_NAMES);
const [activeServer = getActiveServer()] = useOnyx(ONYXKEYS.ACTIVE_SERVER);
const [allBankCards, allBankCardsMetadata] = useCardsList(feedName);
const [cardList, cardListMetadata] = useOnyx(ONYXKEYS.CARD_LIST);
const [allBankCards] = useCardsList(feedName);
const [cardList] = useOnyx(ONYXKEYS.CARD_LIST);
const [cardFeeds] = useCardFeeds(policyID);

const [isUnassigning, setIsUnassigning] = useState(false);
Expand Down Expand Up @@ -194,8 +193,8 @@ function DynamicWorkspaceCompanyCardDetailsPage({route}: DynamicWorkspaceCompany

const navigateToTransactions = () => navigateToCardTransactions(cardID);

// Don't show NotFoundPage if the card is being unassigned or data is still loading.
if ((!card && !isUnassigning && !isLoadingOnyxValue(allBankCardsMetadata) && !isLoadingOnyxValue(cardListMetadata)) || (isCardBeingUnassigned && !isUnassigning)) {
// Don't show NotFoundPage while this page is unassigning the card.
if (!isUnassigning && (!card || isCardBeingUnassigned)) {
return <NotFoundPage />;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import type SCREENS from '@src/SCREENS';
import INPUT_IDS from '@src/types/form/EditExpensifyCardNameForm';
import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';

import {companyCardCustomNamesSelector} from '@selectors/Card';
import React from 'react';
Expand All @@ -40,18 +39,18 @@ type WorkspaceCompanyCardEditCardNamePageProps = PlatformStackScreenProps<Settin
function WorkspaceCompanyCardEditCardNamePage({route, navigation}: WorkspaceCompanyCardEditCardNamePageProps) {
const {policyID, cardID, feed} = route.params;
const workspaceAccountID = useWorkspaceAccountID(policyID);
const [customCardNames, customCardNamesMetadata] = useOnyx(ONYXKEYS.NVP_EXPENSIFY_COMPANY_CARDS_CUSTOM_NAMES);
const [customCardNames] = useOnyx(ONYXKEYS.NVP_EXPENSIFY_COMPANY_CARDS_CUSTOM_NAMES);

const {translate} = useLocalize();
const {inputCallbackRef} = useAutoFocusInput();
const styles = useThemeStyles();

const [cardFeeds, cardFeedsMetadata] = useCardFeeds(policyID);
const [cardFeeds] = useCardFeeds(policyID);
const companyFeeds = getCompanyFeeds(cardFeeds);
const domainOrWorkspaceAccountID = getDomainOrWorkspaceAccountID(workspaceAccountID, companyFeeds[feed]);
const goBackToCardDetails = () => Navigation.goBack(getCompanyCardDetailsBackPath(policyID, feed, cardID, navigation.getState()));

const [sharedCardCustomNames, sharedCardCustomNamesMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${domainOrWorkspaceAccountID}`, {
const [sharedCardCustomNames] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${domainOrWorkspaceAccountID}`, {
selector: companyCardCustomNamesSelector,
});
const defaultValue = getCompanyCardCustomName(cardID, sharedCardCustomNames, customCardNames);
Expand All @@ -72,10 +71,6 @@ function WorkspaceCompanyCardEditCardNamePage({route, navigation}: WorkspaceComp
return errors;
};

if (isLoadingOnyxValue(customCardNamesMetadata, sharedCardCustomNamesMetadata, cardFeedsMetadata)) {
return null;
}

return (
<AccessOrNotFoundWrapper
policyID={policyID}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';

import useCardFeeds from '@hooks/useCardFeeds';
import useLocalize from '@hooks/useLocalize';
import useOnyx from '@hooks/useOnyx';
Expand All @@ -18,7 +16,6 @@ import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';
import type SCREENS from '@src/SCREENS';
import type {StatementPeriodEnd, StatementPeriodEndDay} from '@src/types/onyx/CardFeeds';
import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';

import React from 'react';

Expand All @@ -32,8 +29,8 @@ function WorkspaceCompanyCardStatementCloseDatePage({
},
}: WorkspaceCompanyCardStatementCloseDatePageProps) {
const {translate} = useLocalize();
const [lastSelectedFeed, lastSelectedFeedResult] = useOnyx(`${ONYXKEYS.COLLECTION.LAST_SELECTED_FEED}${policyID}`);
const [cardFeeds, cardFeedsResult] = useCardFeeds(policyID);
const [lastSelectedFeed] = useOnyx(`${ONYXKEYS.COLLECTION.LAST_SELECTED_FEED}${policyID}`);
const [cardFeeds] = useCardFeeds(policyID);
const selectedFeed = getSelectedFeed(lastSelectedFeed, cardFeeds);
const feed = selectedFeed ? getCompanyCardFeed(selectedFeed) : undefined;
const workspaceAccountID = useWorkspaceAccountID(policyID);
Expand Down Expand Up @@ -66,10 +63,6 @@ function WorkspaceCompanyCardStatementCloseDatePage({
clearErrorField(feed, domainOrWorkspaceAccountID, 'statementPeriodEndDay');
};

if (isLoadingOnyxValue(cardFeedsResult) || isLoadingOnyxValue(lastSelectedFeedResult)) {
return <FullScreenLoadingIndicator />;
}

return (
<AccessOrNotFoundWrapper
accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import FullscreenLoadingIndicator from '@components/FullscreenLoadingIndicator';

import useCardFeeds from '@hooks/useCardFeeds';
import useCardsList from '@hooks/useCardsList';
import useLocalize from '@hooks/useLocalize';
Expand All @@ -19,7 +17,6 @@ import CONST from '@src/CONST';
import ROUTES from '@src/ROUTES';
import type SCREENS from '@src/SCREENS';
import type {CompanyCardFeedWithDomainID} from '@src/types/onyx';
import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';

import {format, parseISO} from 'date-fns';
import React from 'react';
Expand All @@ -43,11 +40,10 @@ function WorkspaceCompanyCardsBulkEditTransactionStartDatePage({route}: Workspac
const policy = usePolicy(policyID);
const workspaceAccountID = policy?.policyAccountID ?? CONST.DEFAULT_NUMBER_ID;

const [cardFeeds, cardFeedsMetadata] = useCardFeeds(policyID);
const [cardFeeds] = useCardFeeds(policyID);
const companyFeeds = getCompanyFeeds(cardFeeds);
const domainOrWorkspaceAccountID = getDomainOrWorkspaceAccountID(workspaceAccountID, companyFeeds[feedName]);
const [allBankCards, cardsMetadata] = useCardsList(feedName);
const isLoading = isLoadingOnyxValue(cardFeedsMetadata, cardsMetadata);
const [allBankCards] = useCardsList(feedName);
const hasMissingCards = cardIDs.some((cardID) => !allBankCards?.[cardID]);
const selectedDates = cardIDs.map((cardID) => allBankCards?.[cardID]?.scrapeMinDate ?? '');
const uniqueDates = new Set(selectedDates);
Expand Down Expand Up @@ -78,23 +74,19 @@ function WorkspaceCompanyCardsBulkEditTransactionStartDatePage({route}: Workspac
featureName={CONST.POLICY.MORE_FEATURES.ARE_COMPANY_CARDS_ENABLED}
policyFeature={CONST.POLICY.POLICY_FEATURE.COMPANY_CARDS}
policyFeatureAccess={CONST.POLICY.POLICY_FEATURE_ACCESS.WRITE}
shouldBeBlocked={!isLoading && hasMissingCards}
shouldBeBlocked={hasMissingCards}
>
{isLoading ? (
<FullscreenLoadingIndicator onGoBack={goBackToCompanyCards} />
) : (
<CompanyCardTransactionStartDateForm
sentryLabel={CONST.SENTRY_LABEL.WORKSPACE.COMPANY_CARDS.BULK_TRANSACTION_START_DATE_SAVE}
testID="WorkspaceCompanyCardsBulkEditTransactionStartDatePage"
description={translate('workspace.companyCards.bulkEditStartDateDescription')}
initialDateOption={initialDateOption}
initialStartDate={initialStartDate}
onBackButtonPress={goBackToCompanyCards}
onSubmit={submit}
isSaveDisabled={cardIDs.length === 0 || hasMissingCards}
shouldResetStartDateOnCustomSelection={areAllFromBeginning}
/>
)}
<CompanyCardTransactionStartDateForm
sentryLabel={CONST.SENTRY_LABEL.WORKSPACE.COMPANY_CARDS.BULK_TRANSACTION_START_DATE_SAVE}
testID="WorkspaceCompanyCardsBulkEditTransactionStartDatePage"
description={translate('workspace.companyCards.bulkEditStartDateDescription')}
initialDateOption={initialDateOption}
initialStartDate={initialStartDate}
onBackButtonPress={goBackToCompanyCards}
onSubmit={submit}
isSaveDisabled={cardIDs.length === 0 || hasMissingCards}
shouldResetStartDateOnCustomSelection={areAllFromBeginning}
/>
</AccessOrNotFoundWrapper>
);
}
Expand Down
13 changes: 2 additions & 11 deletions src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import {clearBulkUpdateTransactionStartDateSuccess, clearBulkUpdateTransactionSt
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import type SCREENS from '@src/SCREENS';
import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';

import React, {useEffect, useEffectEvent, useRef} from 'react';

Expand All @@ -49,15 +48,7 @@ function WorkspaceCompanyCardsPage({route}: WorkspaceCompanyCardsPageProps) {
const workspaceAccountID = policy?.policyAccountID ?? CONST.DEFAULT_NUMBER_ID;

const companyCards = useCompanyCards({policyID});
const {
allCardFeeds,
feedName,
selectedFeed,
bankName,
isFeedPending,
isFeedAdded,
onyxMetadata: {cardListMetadata},
} = companyCards;
const {allCardFeeds, feedName, selectedFeed, bankName, isFeedPending} = companyCards;

const domainOrWorkspaceAccountID = getDomainOrWorkspaceAccountID(workspaceAccountID, selectedFeed);
const [companyCardsLoadingState] = useOnyx(`${ONYXKEYS.COLLECTION.RAM_ONLY_COMPANY_CARDS_LOADING_STATE}${domainOrWorkspaceAccountID}`);
Expand Down Expand Up @@ -103,7 +94,7 @@ function WorkspaceCompanyCardsPage({route}: WorkspaceCompanyCardsPageProps) {
// Offline that response can never arrive, so we consider the policy loaded to avoid showing a spinner that would never resolve.
const isPolicyLoaded = !!policy && (policy.policyAccountID !== undefined || isOffline);

const isLoading = !isOffline && (!allCardFeeds || (isFeedAdded && isLoadingOnyxValue(cardListMetadata)));
const isLoading = !isOffline && !allCardFeeds;

const hasFeedsLoaded = !!allCardFeeds && Object.keys(allCardFeeds).length > 0;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import CollapsibleHeaderOnKeyboard from '@components/CollapsibleHeaderOnKeyboard
import FormProvider from '@components/Form/FormProvider';
import InputWrapper from '@components/Form/InputWrapper';
import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
import HeaderWithBackButton from '@components/HeaderWithBackButton';
import ScreenWrapper from '@components/ScreenWrapper';
import Text from '@components/Text';
Expand Down Expand Up @@ -31,7 +30,6 @@ import ROUTES from '@src/ROUTES';
import type SCREENS from '@src/SCREENS';
import type {WorkspaceCompanyCardFeedName} from '@src/types/form/WorkspaceCompanyCardFeedName';
import INPUT_IDS from '@src/types/form/WorkspaceTaxCustomName';
import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';

import React from 'react';
import {View} from 'react-native';
Expand All @@ -48,8 +46,8 @@ function WorkspaceCompanyCardsSettingsFeedNamePage({
const {inputCallbackRef} = useAutoFocusInput();
const policy = usePolicy(policyID);
const workspaceAccountID = policy?.policyAccountID ?? CONST.DEFAULT_NUMBER_ID;
const [lastSelectedFeed, lastSelectedFeedResult] = useOnyx(`${ONYXKEYS.COLLECTION.LAST_SELECTED_FEED}${policyID}`);
const [cardFeeds, cardFeedsResult] = useCardFeeds(policyID);
const [lastSelectedFeed] = useOnyx(`${ONYXKEYS.COLLECTION.LAST_SELECTED_FEED}${policyID}`);
const [cardFeeds] = useCardFeeds(policyID);
const selectedFeed = getSelectedFeed(lastSelectedFeed, cardFeeds);
const feed = selectedFeed ? getCompanyCardFeed(selectedFeed) : undefined;
const companyFeeds = getCompanyFeeds(cardFeeds);
Expand All @@ -76,10 +74,6 @@ function WorkspaceCompanyCardsSettingsFeedNamePage({
Navigation.goBack(ROUTES.WORKSPACE_COMPANY_CARDS_SETTINGS.getRoute(policyID));
};

if (isLoadingOnyxValue(cardFeedsResult) || isLoadingOnyxValue(lastSelectedFeedResult)) {
return <FullScreenLoadingIndicator />;
}

return (
<AccessOrNotFoundWrapper
accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
Expand Down
Loading
Loading