Skip to content

Commit a816e1b

Browse files
authored
Merge pull request Expensify#91741 from paulnjs/paulnjs-fix/88315-part-2
Fix: Error shows up when submitting unreported card expense to user
2 parents 718d98e + 64db922 commit a816e1b

3 files changed

Lines changed: 12 additions & 12 deletions

File tree

src/pages/iou/request/MoneyRequestParticipantsSelector.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ type MoneyRequestParticipantsSelectorProps = {
3232
/** Whether this is a time expense request */
3333
isTimeRequest?: boolean;
3434

35-
/** Whether this is a corporate card transaction */
36-
isCorporateCardTransaction?: boolean;
35+
/** Whether this is a transaction from a credit card import */
36+
isTransactionFromCreditCardImport?: boolean;
3737

3838
/** Report ID of a pre-selected participant whose selection state can't be derived from the participants array (e.g. self DM with accountID 0) */
3939
initiallySelectedReportID?: string;
@@ -62,7 +62,7 @@ function MoneyRequestParticipantsSelector({
6262
isPerDiemRequest = false,
6363
isTimeRequest = false,
6464
isWorkspacesOnly = false,
65-
isCorporateCardTransaction = false,
65+
isTransactionFromCreditCardImport = false,
6666
initiallySelectedReportID,
6767
shouldMoveSelectedToTop = false,
6868
onRestrictedParticipantSelected,
@@ -91,7 +91,7 @@ function MoneyRequestParticipantsSelector({
9191
isPerDiemRequest={isPerDiemRequest}
9292
isTimeRequest={isTimeRequest}
9393
isNative={isNative}
94-
isCorporateCardTransaction={isCorporateCardTransaction}
94+
isTransactionFromCreditCardImport={isTransactionFromCreditCardImport}
9595
selectionListRef={selectionListRef}
9696
textInputAutoFocus={textInputAutoFocus}
9797
setTextInputAutoFocus={setTextInputAutoFocus}

src/pages/iou/request/ParticipantSearchResults.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ type ParticipantSearchResultsProps = {
7474
/** Whether the platform is native (iOS/Android) */
7575
isNative: boolean;
7676

77-
/** Whether this is a corporate card transaction */
78-
isCorporateCardTransaction: boolean;
77+
/** Whether this is a transaction from a credit card import */
78+
isTransactionFromCreditCardImport: boolean;
7979

8080
/** Forwarded ref for the SelectionList — used by the parent's useImperativeHandle */
8181
selectionListRef: Ref<SelectionListWithSectionsHandle | null>;
@@ -110,7 +110,7 @@ function ParticipantSearchResults({
110110
isPerDiemRequest,
111111
isTimeRequest,
112112
isNative,
113-
isCorporateCardTransaction,
113+
isTransactionFromCreditCardImport,
114114
selectionListRef,
115115
textInputAutoFocus,
116116
setTextInputAutoFocus,
@@ -165,7 +165,7 @@ function ParticipantSearchResults({
165165
excludeLogins: CONST.EXPENSIFY_EMAILS_OBJECT,
166166
includeOwnedWorkspaceChats: iouType === CONST.IOU.TYPE.SUBMIT || iouType === CONST.IOU.TYPE.CREATE || iouType === CONST.IOU.TYPE.SPLIT || iouType === CONST.IOU.TYPE.TRACK,
167167
excludeNonAdminWorkspaces: action === CONST.IOU.ACTION.SHARE,
168-
includeP2P: !isCategorizeOrShareAction && !isPerDiemRequest && !isTimeRequest && !isCorporateCardTransaction,
168+
includeP2P: !isCategorizeOrShareAction && !isPerDiemRequest && !isTimeRequest && !isTransactionFromCreditCardImport,
169169
includeInvoiceRooms: iouType === CONST.IOU.TYPE.INVOICE,
170170
action,
171171
shouldSeparateSelfDMChat: iouType !== CONST.IOU.TYPE.INVOICE,
@@ -216,7 +216,7 @@ function ParticipantSearchResults({
216216
const {searchTerm, debouncedSearchTerm, setSearchTerm, availableOptions, selectedOptions, toggleSelection, areOptionsInitialized, onListEndReached, contactState} = useSearchSelector({
217217
selectionMode: isIOUSplit ? CONST.SEARCH_SELECTOR.SELECTION_MODE_MULTI : CONST.SEARCH_SELECTOR.SELECTION_MODE_SINGLE,
218218
searchContext: CONST.SEARCH_SELECTOR.SEARCH_CONTEXT_GENERAL,
219-
includeUserToInvite: !isCategorizeOrShareAction && !isPerDiemRequest && !isTimeRequest && !isCorporateCardTransaction,
219+
includeUserToInvite: !isCategorizeOrShareAction && !isPerDiemRequest && !isTimeRequest && !isTransactionFromCreditCardImport,
220220
excludeLogins: CONST.EXPENSIFY_EMAILS_OBJECT,
221221
includeRecentReports: true,
222222
maxRecentReportsToShow: CONST.IOU.MAX_RECENT_REPORTS_TO_SHOW,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
99
import {getIsWorkspacesOnlyForTransaction, isMovingTransactionFromTrackExpense as isMovingTransactionFromTrackExpenseIOUUtils, navigateToStartMoneyRequestStep} from '@libs/IOUUtils';
1010
import Navigation from '@libs/Navigation/Navigation';
1111
import {endSpan} from '@libs/telemetry/activeSpans';
12-
import {getRequestType, isCorporateCardTransaction, isPerDiemRequest, isTimeRequest as isTimeRequestUtil} from '@libs/TransactionUtils';
12+
import {getRequestType, isFromCreditCardImport, isPerDiemRequest, isTimeRequest as isTimeRequestUtil} from '@libs/TransactionUtils';
1313
import MoneyRequestParticipantsSelector from '@pages/iou/request/MoneyRequestParticipantsSelector';
1414
import {navigateToStartStepIfScanFileCannotBeRead} from '@userActions/IOU/Receipt';
1515
import CONST from '@src/CONST';
@@ -41,7 +41,7 @@ function IOURequestStepParticipants({
4141
const isMovingTransactionFromTrackExpense = isMovingTransactionFromTrackExpenseIOUUtils(action);
4242
const isPerDiem = isPerDiemRequest(initialTransaction);
4343
const isTime = isTimeRequestUtil(initialTransaction);
44-
const isCorporateCard = isCorporateCardTransaction(initialTransaction);
44+
const isTransactionFromCreditCardImport = isFromCreditCardImport(initialTransaction);
4545
const {isBetaEnabled} = usePermissions();
4646
const isNewManualExpenseFlowEnabled = isBetaEnabled(CONST.BETAS.NEW_MANUAL_EXPENSE_FLOW);
4747

@@ -148,7 +148,7 @@ function IOURequestStepParticipants({
148148
isPerDiemRequest={isPerDiem}
149149
isTimeRequest={isTime}
150150
isWorkspacesOnly={isWorkspacesOnly}
151-
isCorporateCardTransaction={isCorporateCard}
151+
isTransactionFromCreditCardImport={isTransactionFromCreditCardImport}
152152
initiallySelectedReportID={selectedParticipant?.reportID}
153153
shouldMoveSelectedToTop
154154
/>

0 commit comments

Comments
 (0)