diff --git a/config/oxlint/oxlint.seatbelt.tsv b/config/oxlint/oxlint.seatbelt.tsv index df870847c94f..a27611d607ac 100644 --- a/config/oxlint/oxlint.seatbelt.tsv +++ b/config/oxlint/oxlint.seatbelt.tsv @@ -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 @@ -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 @@ -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 diff --git a/src/pages/workspace/companyCards/DynamicWorkspaceCompanyCardDetailsPage.tsx b/src/pages/workspace/companyCards/DynamicWorkspaceCompanyCardDetailsPage.tsx index f55585a03dfd..dcc346d411ae 100644 --- a/src/pages/workspace/companyCards/DynamicWorkspaceCompanyCardDetailsPage.tsx +++ b/src/pages/workspace/companyCards/DynamicWorkspaceCompanyCardDetailsPage.tsx @@ -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'; @@ -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); @@ -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 ; } diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardEditCardNamePage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardEditCardNamePage.tsx index 848f4a2f3160..d44fae1fc0e7 100644 --- a/src/pages/workspace/companyCards/WorkspaceCompanyCardEditCardNamePage.tsx +++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardEditCardNamePage.tsx @@ -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'; @@ -40,18 +39,18 @@ type WorkspaceCompanyCardEditCardNamePageProps = PlatformStackScreenProps 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); @@ -72,10 +71,6 @@ function WorkspaceCompanyCardEditCardNamePage({route, navigation}: WorkspaceComp return errors; }; - if (isLoadingOnyxValue(customCardNamesMetadata, sharedCardCustomNamesMetadata, cardFeedsMetadata)) { - return null; - } - return ( ; - } - return ( !allBankCards?.[cardID]); const selectedDates = cardIDs.map((cardID) => allBankCards?.[cardID]?.scrapeMinDate ?? ''); const uniqueDates = new Set(selectedDates); @@ -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 ? ( - - ) : ( - - )} + ); } diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx index eb9fe4aa16f1..032db1ccd18c 100644 --- a/src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx +++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx @@ -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'; @@ -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}`); @@ -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; diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsFeedNamePage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsFeedNamePage.tsx index 7b9802896631..d82fbc45ff0b 100644 --- a/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsFeedNamePage.tsx +++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsFeedNamePage.tsx @@ -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'; @@ -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'; @@ -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); @@ -76,10 +74,6 @@ function WorkspaceCompanyCardsSettingsFeedNamePage({ Navigation.goBack(ROUTES.WORKSPACE_COMPANY_CARDS_SETTINGS.getRoute(policyID)); }; - if (isLoadingOnyxValue(cardFeedsResult) || isLoadingOnyxValue(lastSelectedFeedResult)) { - return ; - } - return ( role.value), ); - }, [spreadsheet?.data, savedColumnMappings, columnRoles, workspaceCardFeedsMetadata, addNewCardMetadata]); + }, [spreadsheet?.data, savedColumnMappings, columnRoles]); const requiredColumns = columnRoles.filter((role) => role.isRequired); const {containsHeader = true} = spreadsheet ?? {}; @@ -224,10 +219,6 @@ function CompanyCardsImportedPage({route}: CompanyCardsImportedPageProps) { closeImportPageAndModal(); }; - if (!spreadsheet && isLoadingOnyxValue(spreadsheetMetadata)) { - return null; - } - const spreadsheetColumns = spreadsheet?.data; if (!spreadsheetColumns) { return ; diff --git a/src/pages/workspace/companyCards/addNew/DynamicAddNewCardPage.tsx b/src/pages/workspace/companyCards/addNew/DynamicAddNewCardPage.tsx index 14b8cff9af63..64404c9f4b5a 100644 --- a/src/pages/workspace/companyCards/addNew/DynamicAddNewCardPage.tsx +++ b/src/pages/workspace/companyCards/addNew/DynamicAddNewCardPage.tsx @@ -26,7 +26,6 @@ import {clearAddNewCardFlow, openPolicyAddCardFeedPage} from '@userActions/Compa import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; -import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue'; import {guidedSetupAndTourStatusSelector} from '@selectors/Onboarding'; import React, {useEffect} from 'react'; @@ -46,7 +45,7 @@ import SelectFeedType from './SelectFeedType'; function DynamicAddNewCardPage({policy}: WithPolicyAndFullscreenLoadingProps) { const policyID = policy?.id; const styles = useThemeStyles(); - const [addNewCardFeed, addNewCardFeedMetadata] = useOnyx(ONYXKEYS.ADD_NEW_COMPANY_CARD); + const [addNewCardFeed] = useOnyx(ONYXKEYS.ADD_NEW_COMPANY_CARD); const {currentStep} = addNewCardFeed ?? {}; const {isBlockedToAddNewFeeds, isAllFeedsResultLoading, cardFeeds, workspaceAccountID} = useIsBlockedToAddFeed(policyID); const {showConfirmModal} = useConfirmModal(); @@ -61,8 +60,6 @@ function DynamicAddNewCardPage({policy}: WithPolicyAndFullscreenLoadingProps) { const {isDelegateAccessRestricted} = useDelegateNoAccessState(); - const isAddCardFeedLoading = isLoadingOnyxValue(addNewCardFeedMetadata); - useEffect(() => { if (!policyID || !isBlockedToAddNewFeeds) { return; @@ -85,7 +82,7 @@ function DynamicAddNewCardPage({policy}: WithPolicyAndFullscreenLoadingProps) { openPolicyAddCardFeedPage(policyID); }, [policyID]); - if (isAddCardFeedLoading || isAllFeedsResultLoading || isBlockedToAddNewFeeds) { + if (isAllFeedsResultLoading || isBlockedToAddNewFeeds) { return ; } diff --git a/src/pages/workspace/companyCards/assignCard/TransactionStartDateStep.tsx b/src/pages/workspace/companyCards/assignCard/TransactionStartDateStep.tsx index 432d73c1a1a9..de5abbda89b7 100644 --- a/src/pages/workspace/companyCards/assignCard/TransactionStartDateStep.tsx +++ b/src/pages/workspace/companyCards/assignCard/TransactionStartDateStep.tsx @@ -1,4 +1,3 @@ -import ActivityIndicator from '@components/ActivityIndicator'; import Button from '@components/Button'; import DatePicker from '@components/DatePicker'; import InteractiveStepWrapper from '@components/InteractiveStepWrapper'; @@ -23,7 +22,6 @@ import {setAssignCardStepAndData} from '@userActions/CompanyCards'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import type SCREENS from '@src/SCREENS'; -import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue'; import {format} from 'date-fns'; import React, {useState} from 'react'; @@ -36,7 +34,7 @@ function TransactionStartDateStep({route}: TransactionStartDateStepProps) { const {translate} = useLocalize(); const styles = useThemeStyles(); - const [assignCard, assignCardMeta] = useOnyx(ONYXKEYS.ASSIGN_CARD); + const [assignCard] = useOnyx(ONYXKEYS.ASSIGN_CARD); const isEditing = assignCard?.isEditing; const cardToAssign = assignCard?.cardToAssign; @@ -96,8 +94,6 @@ function TransactionStartDateStep({route}: TransactionStartDateStepProps) { }, ]; - const isLoading = isLoadingOnyxValue(assignCardMeta); - return ( - {isLoading ? ( - {translate('workspace.companyCards.startDateDescription')} + + handleSelectDateOption(value)} + data={dateOptions} + shouldSingleExecuteRowSelect + initiallyFocusedItemKey={dateOptionSelected} + shouldUpdateFocusedIndex + addBottomSafeAreaPadding + footerContent={ + + } + listFooterContent={ + dateOptionSelected === CONST.COMPANY_CARD.TRANSACTION_START_DATE_OPTIONS.CUSTOM ? ( + + { + if (!isRequiredFulfilled(value)) { + setErrorText(translate('common.error.fieldRequired')); + } else { + setErrorText(''); + } + setLocalStartDate(value); + }} + minDate={CONST.CALENDAR_PICKER.MIN_DATE} + errorText={errorText} + /> + + ) : null + } /> - ) : ( - <> - {translate('workspace.companyCards.startDateDescription')} - - handleSelectDateOption(value)} - data={dateOptions} - shouldSingleExecuteRowSelect - initiallyFocusedItemKey={dateOptionSelected} - shouldUpdateFocusedIndex - addBottomSafeAreaPadding - footerContent={ - - } - listFooterContent={ - dateOptionSelected === CONST.COMPANY_CARD.TRANSACTION_START_DATE_OPTIONS.CUSTOM ? ( - - { - if (!isRequiredFulfilled(value)) { - setErrorText(translate('common.error.fieldRequired')); - } else { - setErrorText(''); - } - setLocalStartDate(value); - }} - minDate={CONST.CALENDAR_PICKER.MIN_DATE} - errorText={errorText} - /> - - ) : null - } - /> - - - )} + ); diff --git a/src/pages/workspace/expensifyCard/issueNew/spendRules/SpendRuleSelectionPage.tsx b/src/pages/workspace/expensifyCard/issueNew/spendRules/SpendRuleSelectionPage.tsx index 3a3f39b66157..88118b192138 100644 --- a/src/pages/workspace/expensifyCard/issueNew/spendRules/SpendRuleSelectionPage.tsx +++ b/src/pages/workspace/expensifyCard/issueNew/spendRules/SpendRuleSelectionPage.tsx @@ -33,7 +33,6 @@ import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES'; import type SCREENS from '@src/SCREENS'; -import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue'; import React, {useEffect, useState} from 'react'; import {View} from 'react-native'; @@ -48,22 +47,21 @@ function SpendRuleSelectionPage({route}: SpendRuleSelectionPageProps) { const {translate} = useLocalize(); const illustrations = useMemoizedLazyIllustrations(['EmptyShelves']); const {cardRules, isLoadingCardRules} = useExpensifyCardRules(policyID); - const [issueCardForm, issueCardFormMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.RAM_ONLY_ISSUE_NEW_EXPENSIFY_CARD}${policyID}`); + const [issueCardForm] = useOnyx(`${ONYXKEYS.COLLECTION.RAM_ONLY_ISSUE_NEW_EXPENSIFY_CARD}${policyID}`); const [shouldShowError, setShouldShowError] = useState(false); const [cardRuleID, setCardRuleID] = useState(issueCardForm?.data?.spendRuleID); const {isLoading, startWithLoading} = usePressLoading(); - const isLoadingIssueCardForm = isLoadingOnyxValue(issueCardFormMetadata); const backPath = useDynamicBackPath(DYNAMIC_ROUTES.WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW_SPEND_RULE_SELECTION.path); useEffect(() => { - if (issueCardForm?.data || isLoadingIssueCardForm) { + if (issueCardForm?.data) { return; } Navigation.goBack(createDynamicRoute(DYNAMIC_ROUTES.WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW.path, ROUTES.WORKSPACE_EXPENSIFY_CARD.getRoute(policyID))); - }, [isLoadingIssueCardForm, issueCardForm?.data, policyID]); + }, [issueCardForm?.data, policyID]); // We only allow cards that share the same currency to be on a spend rule const availableCardRules = cardRules.filter( diff --git a/tests/ui/WorkspaceCompanyCardsPageSelectionModeTest.tsx b/tests/ui/WorkspaceCompanyCardsPageSelectionModeTest.tsx index 5eae0236a904..6170586912ff 100644 --- a/tests/ui/WorkspaceCompanyCardsPageSelectionModeTest.tsx +++ b/tests/ui/WorkspaceCompanyCardsPageSelectionModeTest.tsx @@ -66,8 +66,6 @@ jest.mock('@hooks/useCompanyCards', () => ({ selectedFeed: undefined, bankName: undefined, isFeedPending: false, - isFeedAdded: false, - onyxMetadata: {cardListMetadata: {status: 'loaded'}}, }), })); @@ -167,11 +165,6 @@ jest.mock('@userActions/CompanyCards', () => ({ openPolicyCompanyCardsPage: jest.fn(), })); -jest.mock('@src/types/utils/isLoadingOnyxValue', () => ({ - __esModule: true, - default: () => false, -})); - type WorkspaceCompanyCardsPageScreenProps = PlatformStackScreenProps; const route: WorkspaceCompanyCardsPageScreenProps['route'] = {