Skip to content

Commit 722e180

Browse files
VickyStashVickyStash
committed
Update getDomainOrWorkspaceAccountID params
1 parent 74e8817 commit 722e180

12 files changed

+27
-21
lines changed

‎src/hooks/useCardsList.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const useCardsList = (policyID: string | undefined, selectedFeed: CompanyCardFee
1010
const workspaceAccountID = useWorkspaceAccountID(policyID);
1111
const [cardFeeds] = useCardFeeds(policyID);
1212
const companyCards = getCompanyFeeds(cardFeeds);
13-
const domainOrWorkspaceAccountID = getDomainOrWorkspaceAccountID(workspaceAccountID, companyCards, selectedFeed);
13+
const domainOrWorkspaceAccountID = getDomainOrWorkspaceAccountID(workspaceAccountID, selectedFeed ? companyCards[selectedFeed] : undefined);
1414
const [cardsList, cardsListMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${domainOrWorkspaceAccountID}_${selectedFeed}`, {
1515
selector: filterInactiveCards,
1616
canBeMissing: true,

‎src/libs/CardUtils.ts

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import type {OnyxValues} from '@src/ONYXKEYS';
1212
import ONYXKEYS from '@src/ONYXKEYS';
1313
import type {BankAccountList, Card, CardFeeds, CardList, CompanyCardFeed, ExpensifyCardSettings, PersonalDetailsList, Policy, WorkspaceCardsList} from '@src/types/onyx';
1414
import type {FilteredCardList} from '@src/types/onyx/Card';
15-
import type {CompanyCardFeedWithNumber, CompanyCardNicknames, CompanyFeeds, DirectCardFeedData} from '@src/types/onyx/CardFeeds';
15+
import type {CardFeedData, CompanyCardFeedWithNumber, CompanyCardNicknames, CompanyFeeds, DirectCardFeedData} from '@src/types/onyx/CardFeeds';
1616
import {isEmptyObject} from '@src/types/utils/EmptyObject';
1717
import type IconAsset from '@src/types/utils/IconAsset';
1818
import localeCompare from './LocaleCompare';
@@ -405,14 +405,8 @@ function getCustomOrFormattedFeedName(feed?: CompanyCardFeed, companyCardNicknam
405405
return customFeedName ?? formattedFeedName;
406406
}
407407

408-
function getDomainOrWorkspaceAccountID(workspaceAccountID: number, companyFeeds: CompanyFeeds, selectedFeed: CompanyCardFeed | undefined): number {
409-
const feedData = selectedFeed ? companyFeeds[selectedFeed] : undefined;
410-
411-
if (feedData?.domainID) {
412-
return feedData.domainID;
413-
}
414-
415-
return workspaceAccountID;
408+
function getDomainOrWorkspaceAccountID(workspaceAccountID: number, cardFeedData: CardFeedData | undefined): number {
409+
return cardFeedData?.domainID ?? workspaceAccountID;
416410
}
417411

418412
// We will simplify the logic below once we have #50450 #50451 implemented

‎src/pages/workspace/companyCards/WorkspaceCompanyCardAccountSelectCardPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ function WorkspaceCompanyCardAccountSelectCardPage({route}: WorkspaceCompanyCard
4848

4949
const [cardFeeds] = useCardFeeds(policyID);
5050
const companyFeeds = getCompanyFeeds(cardFeeds);
51-
const domainOrWorkspaceAccountID = getDomainOrWorkspaceAccountID(workspaceAccountID, companyFeeds, bank as CompanyCardFeed);
51+
const domainOrWorkspaceAccountID = getDomainOrWorkspaceAccountID(workspaceAccountID, companyFeeds[bank as CompanyCardFeed]);
5252

5353
const searchedListOptions = useMemo(() => {
5454
return exportMenuItem?.data.filter((option) => option.value.toLowerCase().includes(searchText));

‎src/pages/workspace/companyCards/WorkspaceCompanyCardDetailsPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ function WorkspaceCompanyCardDetailsPage({route}: WorkspaceCompanyCardDetailsPag
7171

7272
const [cardFeeds] = useCardFeeds(policyID);
7373
const companyFeeds = getCompanyFeeds(cardFeeds);
74-
const domainOrWorkspaceAccountID = getDomainOrWorkspaceAccountID(workspaceAccountID, companyFeeds, bank as CompanyCardFeed);
74+
const domainOrWorkspaceAccountID = getDomainOrWorkspaceAccountID(workspaceAccountID, companyFeeds[bank as CompanyCardFeed]);
7575

7676
const unassignCard = () => {
7777
setIsUnassignModalVisible(false);

‎src/pages/workspace/companyCards/WorkspaceCompanyCardEditCardNamePage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ function WorkspaceCompanyCardEditCardNamePage({route}: WorkspaceCompanyCardEditC
4242

4343
const [cardFeeds] = useCardFeeds(policyID);
4444
const companyFeeds = getCompanyFeeds(cardFeeds);
45-
const domainOrWorkspaceAccountID = getDomainOrWorkspaceAccountID(workspaceAccountID, companyFeeds, bank as CompanyCardFeed);
45+
const domainOrWorkspaceAccountID = getDomainOrWorkspaceAccountID(workspaceAccountID, companyFeeds[bank as CompanyCardFeed]);
4646

4747
const submit = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.EDIT_WORKSPACE_COMPANY_CARD_NAME_FORM>) => {
4848
updateCompanyCardName(domainOrWorkspaceAccountID, cardID, values[INPUT_IDS.NAME], bank, defaultValue);

‎src/pages/workspace/companyCards/WorkspaceCompanyCardFeedSelectorPage.tsx

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,15 @@ import useLocalize from '@hooks/useLocalize';
1313
import usePolicy from '@hooks/usePolicy';
1414
import useThemeIllustrations from '@hooks/useThemeIllustrations';
1515
import useThemeStyles from '@hooks/useThemeStyles';
16-
import {checkIfFeedConnectionIsBroken, filterInactiveCards, getCardFeedIcon, getCompanyFeeds, getCustomOrFormattedFeedName, getSelectedFeed} from '@libs/CardUtils';
16+
import {
17+
checkIfFeedConnectionIsBroken,
18+
filterInactiveCards,
19+
getCardFeedIcon,
20+
getCompanyFeeds,
21+
getCustomOrFormattedFeedName,
22+
getDomainOrWorkspaceAccountID,
23+
getSelectedFeed,
24+
} from '@libs/CardUtils';
1725
import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
1826
import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
1927
import {isCollectPolicy} from '@libs/PolicyUtils';
@@ -52,7 +60,9 @@ function WorkspaceCompanyCardFeedSelectorPage({route}: WorkspaceCompanyCardFeedS
5260

5361
const feeds: CardFeedListItem[] = Object.entries(companyFeeds).map(([key, feedSettings]) => {
5462
const feed = key as CompanyCardFeed;
55-
const filteredFeedCards = filterInactiveCards(allFeedsCards?.[`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${feedSettings.domainID ?? workspaceAccountID}_${feed}`]);
63+
const filteredFeedCards = filterInactiveCards(
64+
allFeedsCards?.[`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${getDomainOrWorkspaceAccountID(workspaceAccountID, feedSettings)}_${feed}`],
65+
);
5666
const isFeedConnectionBroken = checkIfFeedConnectionIsBroken(filteredFeedCards);
5767
return {
5868
value: feed,

‎src/pages/workspace/companyCards/WorkspaceCompanyCardsListHeaderButtons.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ function WorkspaceCompanyCardsListHeaderButtons({policyID, selectedFeed, shouldS
6161
const companyFeeds = getCompanyFeeds(cardFeeds);
6262
const currentFeedData = companyFeeds?.[selectedFeed];
6363
const bankName = getBankName(selectedFeed);
64-
const domainOrWorkspaceAccountID = getDomainOrWorkspaceAccountID(workspaceAccountID, companyFeeds, selectedFeed);
64+
const domainOrWorkspaceAccountID = getDomainOrWorkspaceAccountID(workspaceAccountID, currentFeedData);
6565
const filteredFeedCards = filterInactiveCards(allFeedsCards?.[`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${domainOrWorkspaceAccountID}_${selectedFeed}`]);
6666
const isSelectedFeedConnectionBroken = checkIfFeedConnectionIsBroken(filteredFeedCards);
6767

‎src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ function WorkspaceCompanyCardsPage({route}: WorkspaceCompanyCardsPageProps) {
6969
const isFeedConnectionBroken = checkIfFeedConnectionIsBroken(cards);
7070
const [shouldShowOfflineModal, setShouldShowOfflineModal] = useState(false);
7171
const {shouldUseNarrowLayout} = useResponsiveLayout();
72-
const domainOrWorkspaceAccountID = getDomainOrWorkspaceAccountID(workspaceAccountID, companyCards, selectedFeed);
72+
const domainOrWorkspaceAccountID = getDomainOrWorkspaceAccountID(workspaceAccountID, selectedFeedData);
7373
const fetchCompanyCards = useCallback(() => {
7474
openPolicyCompanyCardsPage(policyID, domainOrWorkspaceAccountID);
7575
}, [policyID, domainOrWorkspaceAccountID]);

‎src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsFeedNamePage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ function WorkspaceCompanyCardsSettingsFeedNamePage({
4646
const selectedFeed = getSelectedFeed(lastSelectedFeed, cardFeeds);
4747
const companyFeeds = getCompanyFeeds(cardFeeds);
4848
const feedName = getCustomOrFormattedFeedName(selectedFeed, cardFeeds?.settings?.companyCardNicknames);
49-
const domainOrWorkspaceAccountID = getDomainOrWorkspaceAccountID(workspaceAccountID, companyFeeds, selectedFeed);
49+
const domainOrWorkspaceAccountID = getDomainOrWorkspaceAccountID(workspaceAccountID, selectedFeed ? companyFeeds[selectedFeed] : undefined);
5050

5151
const validate = useCallback(
5252
(values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_COMPANY_CARD_FEED_NAME>) => {

‎src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,10 @@ function WorkspaceCompanyCardsSettingsPage({
4848
const [cardsList] = useCardsList(policyID, selectedFeed);
4949
const feedName = getCustomOrFormattedFeedName(selectedFeed, cardFeeds?.settings?.companyCardNicknames);
5050
const companyFeeds = getCompanyFeeds(cardFeeds);
51-
const liabilityType = selectedFeed && companyFeeds[selectedFeed]?.liabilityType;
51+
const selectedFeedData = selectedFeed ? companyFeeds[selectedFeed] : undefined;
52+
const liabilityType = selectedFeedData?.liabilityType;
5253
const isPersonal = liabilityType === CONST.COMPANY_CARDS.DELETE_TRANSACTIONS.ALLOW;
53-
const domainOrWorkspaceAccountID = getDomainOrWorkspaceAccountID(workspaceAccountID, companyFeeds, selectedFeed);
54+
const domainOrWorkspaceAccountID = getDomainOrWorkspaceAccountID(workspaceAccountID, selectedFeedData);
5455

5556
const navigateToChangeFeedName = () => {
5657
Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARDS_SETTINGS_FEED_NAME.getRoute(policyID));

‎src/pages/workspace/members/WorkspaceMemberNewCardPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ function WorkspaceMemberNewCardPage({route, personalDetails}: WorkspaceMemberNew
6767
const memberName = personalDetails?.[accountID]?.firstName ? personalDetails?.[accountID]?.firstName : personalDetails?.[accountID]?.login;
6868
const companyFeeds = getCompanyFeeds(cardFeeds, false, true);
6969
const isFeedExpired = isSelectedFeedExpired((selectedFeed as CompanyCardFeed) ? cardFeeds?.settings?.oAuthAccountDetails?.[selectedFeed as CompanyCardFeed] : undefined);
70-
const domainOrWorkspaceAccountID = getDomainOrWorkspaceAccountID(workspaceAccountID, companyFeeds, selectedFeed as CompanyCardFeed);
70+
const domainOrWorkspaceAccountID = getDomainOrWorkspaceAccountID(workspaceAccountID, companyFeeds[selectedFeed as CompanyCardFeed]);
7171

7272
const [list] = useCardsList(policyID, selectedFeed as CompanyCardFeed);
7373
const filteredCardList = getFilteredCardList(list, cardFeeds?.settings?.oAuthAccountDetails?.[selectedFeed as CompanyCardFeed]);

‎src/types/onyx/CardFeeds.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ export type {
137137
CompanyCardFeed,
138138
DirectCardFeedData,
139139
CardFeedProvider,
140+
CardFeedData,
140141
CompanyFeeds,
141142
CompanyCardNicknames,
142143
CompanyCardFeedWithNumber,

0 commit comments

Comments
 (0)