Merge pull request Expensify#65597 from s77rt/statement-close-date-new-direct-feed

Company Cards: Add statement close date to new direct card feeds (using plaid)

Author: luacmartins

src/pages/workspace/companyCards/WorkspaceCompanyCardStatementCloseDateSelectionList/index.tsx

@@ -25,13 +25,20 @@ type WorkspaceCompanyCardStatementCloseDateSelectionListProps = {
     onSubmit: (statementCloseDate: CompanyCardStatementCloseDate, statementCustomCloseDate: number | undefined) => void;
     onBackButtonPress: () => void;
     enabledWhenOffline: boolean;
+    defaultDate?: CompanyCardStatementCloseDate;
 };
 
-function WorkspaceCompanyCardStatementCloseDateSelectionList({confirmText, onSubmit, onBackButtonPress, enabledWhenOffline}: WorkspaceCompanyCardStatementCloseDateSelectionListProps) {
+function WorkspaceCompanyCardStatementCloseDateSelectionList({
+    confirmText,
+    onSubmit,
+    onBackButtonPress,
+    enabledWhenOffline,
+    defaultDate,
+}: WorkspaceCompanyCardStatementCloseDateSelectionListProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
 
-    const [selectedDate, setSelectedDate] = useState<CompanyCardStatementCloseDate | undefined>(undefined);
+    const [selectedDate, setSelectedDate] = useState<CompanyCardStatementCloseDate | undefined>(defaultDate);
     const [selectedCustomDate, setSelectedCustomDate] = useState<number | undefined>(undefined);
     const [error, setError] = useState<string | undefined>(undefined);
 

src/pages/workspace/companyCards/addNew/PlaidConnectionStep.tsx

@@ -7,6 +7,7 @@ import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import PlaidLink from '@components/PlaidLink';
 import ScreenWrapper from '@components/ScreenWrapper';
 import Text from '@components/Text';
+import useEnvironment from '@hooks/useEnvironment';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
@@ -25,6 +26,7 @@ import type {CompanyCardFeed} from '@src/types/onyx';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
 function PlaidConnectionStep({feed}: {feed?: CompanyCardFeed}) {
+    const {isDevelopment} = useEnvironment();
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const theme = useTheme();
@@ -40,6 +42,9 @@ function PlaidConnectionStep({feed}: {feed?: CompanyCardFeed}) {
     const plaidDataErrorMessage = !isEmptyObject(plaidErrors) ? (Object.values(plaidErrors).at(0) as string) : '';
     const {isOffline} = useNetwork();
 
+    // s77rt remove DEV lock
+    const shouldSelectStatementCloseDate = isDevelopment;
+
     const isAuthenticatedWithPlaid = useCallback(() => !!plaidData?.bankAccounts?.length || !isEmptyObject(plaidData?.errors), [plaidData]);
 
     /**
@@ -130,8 +135,9 @@ function PlaidConnectionStep({feed}: {feed?: CompanyCardFeed}) {
                             });
                             return;
                         }
+
                         setAddNewCompanyCardStepAndData({
-                            step: CONST.COMPANY_CARDS.STEP.BANK_CONNECTION,
+                            step: shouldSelectStatementCloseDate ? CONST.COMPANY_CARDS.STEP.SELECT_STATEMENT_CLOSE_DATE : CONST.COMPANY_CARDS.STEP.BANK_CONNECTION,
                             data: {
                                 publicToken,
                                 plaidConnectedFeed,

src/pages/workspace/companyCards/addNew/StatementCloseDateStep.tsx

@@ -2,6 +2,7 @@ import React, {useCallback} from 'react';
 import useOnyx from 'react-native-onyx/dist/useOnyx';
 import useCardFeeds from '@hooks/useCardFeeds';
 import useLocalize from '@hooks/useLocalize';
+import usePermissions from '@hooks/usePermissions';
 import {addNewCompanyCardsFeed, setAddNewCompanyCardStepAndData} from '@libs/actions/CompanyCards';
 import Navigation from '@libs/Navigation/Navigation';
 import WorkspaceCompanyCardStatementCloseDateSelectionList from '@pages/workspace/companyCards/WorkspaceCompanyCardStatementCloseDateSelectionList';
@@ -17,36 +18,43 @@ type StatementCloseDateStepProps = {
 
 function StatementCloseDateStep({policyID}: StatementCloseDateStepProps) {
     const {translate} = useLocalize();
-
+    const {isBetaEnabled} = usePermissions();
     const [addNewCard] = useOnyx(ONYXKEYS.ADD_NEW_COMPANY_CARD, {canBeMissing: false});
     const [lastSelectedFeed] = useOnyx(`${ONYXKEYS.COLLECTION.LAST_SELECTED_FEED}${policyID}`, {canBeMissing: true});
-
     const [cardFeeds] = useCardFeeds(policyID);
 
+    const isPlaid = isBetaEnabled(CONST.BETAS.PLAID_COMPANY_CARDS) && !!addNewCard?.data?.publicToken;
+
     const submit = useCallback(
         // s77rt make use of statementCloseDate / statementCustomCloseDate and remove disable lint rule
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         (statementCloseDate: CompanyCardStatementCloseDate, statementCustomCloseDate: number | undefined) => {
-            if (!addNewCard?.data.feedDetails) {
+            if (isPlaid) {
+                setAddNewCompanyCardStepAndData({
+                    step: CONST.COMPANY_CARDS.STEP.BANK_CONNECTION,
+                });
                 return;
             }
 
-            addNewCompanyCardsFeed(policyID, addNewCard.data.feedType, addNewCard.data.feedDetails, cardFeeds, lastSelectedFeed);
-            Navigation.goBack(ROUTES.WORKSPACE_COMPANY_CARDS.getRoute(policyID));
+            if (addNewCard?.data.feedDetails) {
+                addNewCompanyCardsFeed(policyID, addNewCard.data.feedType, addNewCard.data.feedDetails, cardFeeds, lastSelectedFeed);
+                Navigation.goBack(ROUTES.WORKSPACE_COMPANY_CARDS.getRoute(policyID));
+            }
         },
-        [policyID, addNewCard, cardFeeds, lastSelectedFeed],
+        [policyID, addNewCard, cardFeeds, lastSelectedFeed, isPlaid],
     );
 
     const goBack = useCallback(() => {
-        setAddNewCompanyCardStepAndData({step: CONST.COMPANY_CARDS.STEP.CARD_DETAILS});
-    }, []);
+        setAddNewCompanyCardStepAndData({step: isPlaid ? CONST.COMPANY_CARDS.STEP.PLAID_CONNECTION : CONST.COMPANY_CARDS.STEP.CARD_DETAILS});
+    }, [isPlaid]);
 
     return (
         <WorkspaceCompanyCardStatementCloseDateSelectionList
             confirmText={translate('common.submit')}
             onSubmit={submit}
             onBackButtonPress={goBack}
             enabledWhenOffline={false}
+            defaultDate={CONST.COMPANY_CARDS.STATEMENT_CLOSE_DATE.LAST_DAY_OF_MONTH}
         />
     );
 }