fix: apply requested changes

Expensify · Jul 2, 2024 · e3e26c0 · e3e26c0
1 parent b000be0
commit e3e26c0
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 38 deletions.
diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
@@ -660,7 +660,7 @@ type OnyxCollectionValuesMapping = {
     [ONYXKEYS.COLLECTION.SNAPSHOT]: OnyxTypes.SearchResults;
     [ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END]: OnyxTypes.BillingGraceEndPeriod;
     [ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_EXPENSIFY_CARD_SETTINGS]: OnyxTypes.ExpensifyCardSettings;
-    [ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST]: OnyxTypes.ExpensifyCardsList;
+    [ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST]: OnyxTypes.WorkspaceCardsList;
 };
 
 type OnyxValuesMapping = {

diff --git a/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx b/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx
@@ -89,9 +89,9 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
     const policyID = policy?.id ?? '';
     // @ts-expect-error a new props will be added during feed api implementation
     const workspaceAccountID = policy?.workspaceAccountID ?? '';
-    const [cardsList] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID}_Expensify Card`);
+    const [cardsList] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID}_${CONST.EXPENSIFY_CARD.BANK}`);
     // Uncomment this line for testing disabled toggle feature - for c+
-    // const [cardsList = mockedCardsList] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID}_Expensify Card`);
+    // const [cardsList = mockedCardsList] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID}_${CONST.EXPENSIFY_CARD.BANK}`);
 
     const [isOrganizeWarningModalOpen, setIsOrganizeWarningModalOpen] = useState(false);
     const [isIntegrateWarningModalOpen, setIsIntegrateWarningModalOpen] = useState(false);

diff --git a/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardPage.tsx b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardPage.tsx
@@ -23,14 +23,14 @@ import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type SCREENS from '@src/SCREENS';
-import type {Card, ExpensifyCardsList} from '@src/types/onyx';
+import type {Card, WorkspaceCardsList} from '@src/types/onyx';
 import WorkspaceCardListHeader from './WorkspaceCardListHeader';
 import WorkspaceCardListRow from './WorkspaceCardListRow';
 
 type WorkspaceExpensifyCardPageProps = StackScreenProps<FullScreenNavigatorParamList, typeof SCREENS.WORKSPACE.EXPENSIFY_CARD>;
 
 // TODO: remove when Onyx data is available
-const mockedCards: OnyxEntry<ExpensifyCardsList> = {
+const mockedCards: OnyxEntry<WorkspaceCardsList> = {
     test1: {
         // @ts-expect-error TODO: change cardholder to accountID
         cardholder: {accountID: 1, lastName: 'Smith', firstName: 'Bob', displayName: 'Bob Smith'},
@@ -71,7 +71,7 @@ function WorkspaceExpensifyCardPage({route}: WorkspaceExpensifyCardPageProps) {
     const policyCurrency = useMemo(() => policy?.outputCurrency ?? CONST.CURRENCY.USD, [policy]);
 
     // TODO: uncomment the code line below to use cardsList data from Onyx when it's supported
-    // const [cardsList] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${policyID}_Expensify Card`);
+    // const [cardsList] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${policyID}_${CONST.EXPENSIFY_CARD.BANK}`);
     const cardsList = mockedCards;
 
     const fetchExpensifyCards = useCallback(() => {
@@ -176,6 +176,6 @@ function WorkspaceExpensifyCardPage({route}: WorkspaceExpensifyCardPageProps) {
     );
 }
 
-WorkspaceExpensifyCardPage.displayName = 'WorkspacesListPage';
+WorkspaceExpensifyCardPage.displayName = 'WorkspaceExpensifyCardPage';
 
 export default WorkspaceExpensifyCardPage;
diff --git a/src/types/onyx/Card.ts b/src/types/onyx/Card.ts
@@ -96,7 +96,7 @@ type IssueNewCard = {
 };
 
 /** List of Expensify cards */
-type ExpensifyCardsList = Record<string, Card>;
+type WorkspaceCardsList = Record<string, Card>;
 
 export default Card;
-export type {ExpensifyCardDetails, CardList, IssueNewCard, IssueNewCardStep, ExpensifyCardsList};
+export type {ExpensifyCardDetails, CardList, IssueNewCard, IssueNewCardStep, WorkspaceCardsList};
diff --git a/src/types/onyx/ExpensifyCard.ts b/src/types/onyx/ExpensifyCard.ts
diff --git a/src/types/onyx/index.ts b/src/types/onyx/index.ts
@@ -7,7 +7,7 @@ import type BillingGraceEndPeriod from './BillingGraceEndPeriod';
 import type BillingStatus from './BillingStatus';
 import type BlockedFromConcierge from './BlockedFromConcierge';
 import type Card from './Card';
-import type {CardList, ExpensifyCardsList, IssueNewCard} from './Card';
+import type {CardList, IssueNewCard, WorkspaceCardsList} from './Card';
 import type {CapturedLogs, Log} from './Console';
 import type Credentials from './Credentials';
 import type Currency from './Currency';
@@ -109,7 +109,7 @@ export type {
     CustomStatusDraft,
     DismissedReferralBanners,
     Download,
-    ExpensifyCardsList,
+    WorkspaceCardsList,
     ExpensifyCardSettings,
     FrequentlyUsedEmoji,
     Fund,