Skip to content

Commit ba52193

Browse files
committed
Revert "fix: creating second scan expense unexpected error is shown"
This reverts commit fbe9617.
1 parent fbe9617 commit ba52193

3 files changed

Lines changed: 3 additions & 10 deletions

File tree

src/pages/iou/request/step/IOURequestStepAmount.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import type {OnyxEntry} from 'react-native-onyx';
44
import type {BaseTextInputRef} from '@components/TextInput/BaseTextInput/types';
55
import withCurrentUserPersonalDetails from '@components/withCurrentUserPersonalDetails';
66
import type {WithCurrentUserPersonalDetailsProps} from '@components/withCurrentUserPersonalDetails';
7-
import useCanEditStep from '@hooks/useCanEditStep';
87
import useLocalize from '@hooks/useLocalize';
98
import useOnyx from '@hooks/useOnyx';
109
import {createDraftTransaction, removeDraftTransaction} from '@libs/actions/TransactionEdit';
@@ -92,7 +91,6 @@ function IOURequestStepAmount({
9291
const {amount: transactionAmount} = getTransactionDetails(currentTransaction) ?? {amount: 0};
9392
const {currency: originalCurrency} = getTransactionDetails(isEditing && !isEmptyObject(draftTransaction) ? draftTransaction : transaction) ?? {currency: CONST.CURRENCY.USD};
9493
const currency = isValidCurrencyCode(selectedCurrency) ? selectedCurrency : originalCurrency;
95-
const [canEditAmount] = useCanEditStep(action, iouType, report, CONST.EDIT_REQUEST_FIELD.AMOUNT);
9694

9795
// For quick button actions, we'll skip the confirmation page unless the report is archived or this is a workspace request, as
9896
// the user will have to add a merchant.
@@ -314,7 +312,6 @@ function IOURequestStepAmount({
314312
testID={IOURequestStepAmount.displayName}
315313
shouldShowWrapper={!!backTo || isEditing}
316314
includeSafeAreaPaddingBottom
317-
shouldShowNotFoundPage={!canEditAmount}
318315
>
319316
<MoneyRequestAmountForm
320317
isEditing={!!backTo || isEditing}

src/pages/iou/request/step/IOURequestStepDistanceRate.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import CONST from '@src/CONST';
1818
import ONYXKEYS from '@src/ONYXKEYS';
1919
import type SCREENS from '@src/SCREENS';
2020
import type * as OnyxTypes from '@src/types/onyx';
21-
import useCanEditStep from '@hooks/useCanEditStep';
2221
import StepScreenWrapper from './StepScreenWrapper';
2322
import withFullTransactionOrNotFound from './withFullTransactionOrNotFound';
2423
import type {WithWritableReportOrNotFoundProps} from './withWritableReportOrNotFound';
@@ -33,7 +32,7 @@ function IOURequestStepDistanceRate({
3332
report,
3433
reportDraft,
3534
route: {
36-
params: {action, reportID, backTo, transactionID, iouType},
35+
params: {action, reportID, backTo, transactionID},
3736
},
3837
transaction,
3938
}: IOURequestStepDistanceRateProps) {
@@ -57,7 +56,7 @@ function IOURequestStepDistanceRate({
5756
const transactionCurrency = getCurrency(transaction);
5857

5958
const rates = DistanceRequestUtils.getMileageRates(policy, false, currentRateID);
60-
const [canEditDistanceRate] = useCanEditStep(action, iouType, report, CONST.EDIT_REQUEST_FIELD.DISTANCE_RATE);
59+
6160
const navigateBack = () => {
6261
Navigation.goBack(backTo);
6362
};
@@ -111,7 +110,6 @@ function IOURequestStepDistanceRate({
111110
onBackButtonPress={navigateBack}
112111
shouldShowWrapper
113112
testID={IOURequestStepDistanceRate.displayName}
114-
shouldShowNotFoundPage={!canEditDistanceRate}
115113
>
116114
<Text style={[styles.mh5, styles.mv4]}>{translate('iou.chooseARate')}</Text>
117115

src/pages/iou/request/step/IOURequestStepMerchant.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import ONYXKEYS from '@src/ONYXKEYS';
1818
import type SCREENS from '@src/SCREENS';
1919
import INPUT_IDS from '@src/types/form/MoneyRequestMerchantForm';
2020
import {isEmptyObject} from '@src/types/utils/EmptyObject';
21-
import useCanEditStep from '@hooks/useCanEditStep';
2221
import DiscardChangesConfirmation from './DiscardChangesConfirmation';
2322
import StepScreenWrapper from './StepScreenWrapper';
2423
import type {WithFullTransactionOrNotFoundProps} from './withFullTransactionOrNotFound';
@@ -44,7 +43,7 @@ function IOURequestStepMerchant({
4443
const {translate} = useLocalize();
4544
const {inputCallbackRef} = useAutoFocusInput();
4645
const isEditing = action === CONST.IOU.ACTION.EDIT;
47-
const [canEditMerchant] = useCanEditStep(action, iouType, report, CONST.EDIT_REQUEST_FIELD.MERCHANT);
46+
4847
// In the split flow, when editing we use SPLIT_TRANSACTION_DRAFT to save draft value
4948
const isEditingSplitBill = iouType === CONST.IOU.TYPE.SPLIT && isEditing;
5049
const merchant = getTransactionDetails(isEditingSplitBill && !isEmptyObject(splitDraftTransaction) ? splitDraftTransaction : transaction)?.merchant;
@@ -115,7 +114,6 @@ function IOURequestStepMerchant({
115114
onBackButtonPress={navigateBack}
116115
shouldShowWrapper
117116
testID={IOURequestStepMerchant.displayName}
118-
shouldShowNotFoundPage={!canEditMerchant}
119117
>
120118
<FormProvider
121119
style={[styles.flexGrow1, styles.ph5]}

0 commit comments

Comments
 (0)