Skip to content

Commit 8ba52ad

Browse files
s77rts77rt
committed
remove dev lock of statement close date page
1 parent 56fd68c commit 8ba52ad

4 files changed

Lines changed: 18 additions & 52 deletions

File tree

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

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import ScrollView from '@components/ScrollView';
1111
import Text from '@components/Text';
1212
import useCardFeeds from '@hooks/useCardFeeds';
1313
import useCardsList from '@hooks/useCardsList';
14-
import useEnvironment from '@hooks/useEnvironment';
1514
import useLocalize from '@hooks/useLocalize';
1615
import useOnyx from '@hooks/useOnyx';
1716
import usePolicy from '@hooks/usePolicy';
@@ -36,7 +35,6 @@ function WorkspaceCompanyCardsSettingsPage({
3635
params: {policyID},
3736
},
3837
}: WorkspaceCompanyCardsSettingsPageProps) {
39-
const {isDevelopment} = useEnvironment();
4038
const styles = useThemeStyles();
4139
const {translate} = useLocalize();
4240
const policy = usePolicy(policyID);
@@ -67,9 +65,6 @@ function WorkspaceCompanyCardsSettingsPage({
6765
return translate(`workspace.companyCards.statementCloseDate.${selectedFeedData.statementPeriodEndDay}`);
6866
}, [translate, selectedFeedData?.statementPeriodEndDay]);
6967

70-
// s77rt remove DEV lock
71-
const shouldShowStatementCloseDate = isDevelopment;
72-
7368
const navigateToChangeFeedName = () => {
7469
Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARDS_SETTINGS_FEED_NAME.getRoute(policyID));
7570
};
@@ -129,19 +124,17 @@ function WorkspaceCompanyCardsSettingsPage({
129124
titleStyle={styles.flex1}
130125
onPress={navigateToChangeFeedName}
131126
/>
132-
{shouldShowStatementCloseDate && (
133-
<OfflineWithFeedback pendingAction={selectedFeedData?.pendingFields?.statementPeriodEndDay}>
134-
<MenuItemWithTopDescription
135-
shouldShowRightIcon
136-
title={statementCloseDate?.toString()}
137-
description={translate('workspace.moreFeatures.companyCards.statementCloseDateTitle')}
138-
style={[styles.moneyRequestMenuItem]}
139-
titleStyle={styles.flex1}
140-
onPress={navigateToChangeStatementCloseDate}
141-
brickRoadIndicator={selectedFeedData?.errorFields?.statementPeriodEndDay ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
142-
/>
143-
</OfflineWithFeedback>
144-
)}
127+
<OfflineWithFeedback pendingAction={selectedFeedData?.pendingFields?.statementPeriodEndDay}>
128+
<MenuItemWithTopDescription
129+
shouldShowRightIcon
130+
title={statementCloseDate?.toString()}
131+
description={translate('workspace.moreFeatures.companyCards.statementCloseDateTitle')}
132+
style={[styles.moneyRequestMenuItem]}
133+
titleStyle={styles.flex1}
134+
onPress={navigateToChangeStatementCloseDate}
135+
brickRoadIndicator={selectedFeedData?.errorFields?.statementPeriodEndDay ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
136+
/>
137+
</OfflineWithFeedback>
145138
<View style={[styles.mv3, styles.mh5]}>
146139
<ToggleSettingOptionRow
147140
title={translate('workspace.moreFeatures.companyCards.personal')}

‎src/pages/workspace/companyCards/addNew/AddNewCardPage.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ function AddNewCardPage({policy}: WithPolicyAndFullscreenLoadingProps) {
7979
case CONST.COMPANY_CARDS.STEP.CARD_NAME:
8080
return <CardNameStep />;
8181
case CONST.COMPANY_CARDS.STEP.CARD_DETAILS:
82-
return <DetailsStep policyID={policyID} />;
82+
return <DetailsStep />;
8383
case CONST.COMPANY_CARDS.STEP.AMEX_CUSTOM_FEED:
8484
return <AmexCustomFeed />;
8585
case CONST.COMPANY_CARDS.STEP.PLAID_CONNECTION:

‎src/pages/workspace/companyCards/addNew/DetailsStep.tsx‎

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -11,46 +11,30 @@ import Text from '@components/Text';
1111
import TextInput from '@components/TextInput';
1212
import TextLink from '@components/TextLink';
1313
import useAutoFocusInput from '@hooks/useAutoFocusInput';
14-
import useCardFeeds from '@hooks/useCardFeeds';
15-
import useEnvironment from '@hooks/useEnvironment';
1614
import useLocalize from '@hooks/useLocalize';
1715
import useOnyx from '@hooks/useOnyx';
1816
import useTheme from '@hooks/useTheme';
1917
import useThemeStyles from '@hooks/useThemeStyles';
2018
import {getFieldRequiredErrors} from '@libs/ValidationUtils';
21-
import Navigation from '@navigation/Navigation';
2219
import variables from '@styles/variables';
23-
import {addNewCompanyCardsFeed, setAddNewCompanyCardStepAndData} from '@userActions/CompanyCards';
20+
import {setAddNewCompanyCardStepAndData} from '@userActions/CompanyCards';
2421
import CONST from '@src/CONST';
2522
import ONYXKEYS from '@src/ONYXKEYS';
26-
import ROUTES from '@src/ROUTES';
2723
import INPUT_IDS from '@src/types/form/AddNewCardFeedForm';
2824

29-
type DetailsStepProps = {
30-
/** ID of the current policy */
31-
policyID: string | undefined;
32-
};
33-
34-
function DetailsStep({policyID}: DetailsStepProps) {
25+
function DetailsStep() {
3526
const {translate} = useLocalize();
3627
const theme = useTheme();
3728
const styles = useThemeStyles();
3829
const {inputCallbackRef} = useAutoFocusInput();
39-
const {isDevelopment} = useEnvironment();
4030

4131
const [addNewCard] = useOnyx(ONYXKEYS.ADD_NEW_COMPANY_CARD, {canBeMissing: false});
42-
const [lastSelectedFeed] = useOnyx(`${ONYXKEYS.COLLECTION.LAST_SELECTED_FEED}${policyID}`, {canBeMissing: true});
43-
44-
const [cardFeeds] = useCardFeeds(policyID);
4532

4633
const feedProvider = addNewCard?.data?.feedType;
4734
const isStripeFeedProvider = feedProvider === CONST.COMPANY_CARD.FEED_BANK_NAME.STRIPE;
4835
const bank = addNewCard?.data?.selectedBank;
4936
const isOtherBankSelected = bank === CONST.COMPANY_CARDS.BANKS.OTHER;
5037

51-
// s77rt remove DEV lock
52-
const shouldSelectStatementCloseDate = isDevelopment;
53-
5438
const submit = useCallback(
5539
(values: FormOnyxValues<typeof ONYXKEYS.FORMS.ADD_NEW_CARD_FEED_FORM>) => {
5640
if (!addNewCard?.data) {
@@ -62,15 +46,9 @@ function DetailsStep({policyID}: DetailsStepProps) {
6246
bankName: addNewCard.data.bankName ?? 'Amex',
6347
};
6448

65-
if (shouldSelectStatementCloseDate) {
66-
setAddNewCompanyCardStepAndData({step: CONST.COMPANY_CARDS.STEP.SELECT_STATEMENT_CLOSE_DATE, data: {feedDetails}});
67-
return;
68-
}
69-
70-
addNewCompanyCardsFeed(policyID, addNewCard.data.feedType, feedDetails, cardFeeds, undefined, undefined, lastSelectedFeed);
71-
Navigation.goBack(ROUTES.WORKSPACE_COMPANY_CARDS.getRoute(policyID));
49+
setAddNewCompanyCardStepAndData({step: CONST.COMPANY_CARDS.STEP.SELECT_STATEMENT_CLOSE_DATE, data: {feedDetails}});
7250
},
73-
[addNewCard?.data, policyID, cardFeeds, lastSelectedFeed, shouldSelectStatementCloseDate],
51+
[addNewCard?.data],
7452
);
7553

7654
const handleBackButtonPress = () => {
@@ -214,7 +192,7 @@ function DetailsStep({policyID}: DetailsStepProps) {
214192
/>
215193
<FormProvider
216194
formID={ONYXKEYS.FORMS.ADD_NEW_CARD_FEED_FORM}
217-
submitButtonText={shouldSelectStatementCloseDate ? translate('common.next') : translate('common.submit')}
195+
submitButtonText={translate('common.next')}
218196
onSubmit={submit}
219197
validate={validate}
220198
style={[styles.mh5, styles.flexGrow1]}

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import HeaderWithBackButton from '@components/HeaderWithBackButton';
77
import PlaidLink from '@components/PlaidLink';
88
import ScreenWrapper from '@components/ScreenWrapper';
99
import Text from '@components/Text';
10-
import useEnvironment from '@hooks/useEnvironment';
1110
import useLocalize from '@hooks/useLocalize';
1211
import useNetwork from '@hooks/useNetwork';
1312
import useOnyx from '@hooks/useOnyx';
@@ -27,7 +26,6 @@ import type {CompanyCardFeed} from '@src/types/onyx';
2726
import {isEmptyObject} from '@src/types/utils/EmptyObject';
2827

2928
function PlaidConnectionStep({feed, policyID}: {feed?: CompanyCardFeed; policyID?: string}) {
30-
const {isDevelopment} = useEnvironment();
3129
const {translate} = useLocalize();
3230
const styles = useThemeStyles();
3331
const theme = useTheme();
@@ -44,9 +42,6 @@ function PlaidConnectionStep({feed, policyID}: {feed?: CompanyCardFeed; policyID
4442
const {isOffline} = useNetwork();
4543
const domain = getDomainNameForPolicy(policyID);
4644

47-
// s77rt remove DEV lock
48-
const shouldSelectStatementCloseDate = isDevelopment;
49-
5045
const isAuthenticatedWithPlaid = useCallback(() => !!plaidData?.bankAccounts?.length || !isEmptyObject(plaidData?.errors), [plaidData]);
5146

5247
/**
@@ -163,7 +158,7 @@ function PlaidConnectionStep({feed, policyID}: {feed?: CompanyCardFeed; policyID
163158
}
164159

165160
setAddNewCompanyCardStepAndData({
166-
step: shouldSelectStatementCloseDate ? CONST.COMPANY_CARDS.STEP.SELECT_STATEMENT_CLOSE_DATE : CONST.COMPANY_CARDS.STEP.BANK_CONNECTION,
161+
step: CONST.COMPANY_CARDS.STEP.SELECT_STATEMENT_CLOSE_DATE,
167162
data: {
168163
publicToken,
169164
plaidConnectedFeed,

0 commit comments

Comments
 (0)