-
Notifications
You must be signed in to change notification settings - Fork 2.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[CP Staging] Make sure that split bills follow the correct routes for editing category/tag #32541
Merged
+50
−3
Merged
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,10 +12,13 @@ | |
import CONST from '@src/CONST'; | ||
import ONYXKEYS from '@src/ONYXKEYS'; | ||
import ROUTES from '@src/ROUTES'; | ||
import reportPropTypes from '@pages/reportPropTypes'; | ||
import EditRequestAmountPage from './EditRequestAmountPage'; | ||
import EditRequestCreatedPage from './EditRequestCreatedPage'; | ||
import EditRequestDescriptionPage from './EditRequestDescriptionPage'; | ||
import EditRequestMerchantPage from './EditRequestMerchantPage'; | ||
import EditRequestCategoryPage from './EditRequestCategoryPage'; | ||
import EditRequestTagPage from './EditRequestTagPage'; | ||
|
||
const propTypes = { | ||
/** Route from navigation */ | ||
|
@@ -38,13 +41,16 @@ | |
|
||
/** The draft transaction that holds data to be persisted on the current transaction */ | ||
draftTransaction: transactionPropTypes, | ||
|
||
/** The report currently being used */ | ||
report: reportPropTypes.isRequired, | ||
}; | ||
|
||
const defaultProps = { | ||
draftTransaction: undefined, | ||
}; | ||
|
||
function EditSplitBillPage({route, transaction, draftTransaction}) { | ||
function EditSplitBillPage({route, transaction, draftTransaction, report}) { | ||
const fieldToEdit = lodashGet(route, ['params', 'field'], ''); | ||
const reportID = lodashGet(route, ['params', 'reportID'], ''); | ||
const reportActionID = lodashGet(route, ['params', 'reportActionID'], ''); | ||
|
@@ -55,6 +61,8 @@ | |
comment: transactionDescription, | ||
merchant: transactionMerchant, | ||
created: transactionCreated, | ||
category: transactionCategory, | ||
tag: transactionTag, | ||
} = draftTransaction ? ReportUtils.getTransactionDetails(draftTransaction) : ReportUtils.getTransactionDetails(transaction); | ||
|
||
const defaultCurrency = lodashGet(route, 'params.currency', '') || transactionCurrency; | ||
|
@@ -130,6 +138,30 @@ | |
); | ||
} | ||
|
||
if (fieldToEdit === CONST.EDIT_REQUEST_FIELD.CATEGORY) { | ||
return ( | ||
<EditRequestCategoryPage | ||
defaultCategory={transactionCategory} | ||
policyID={lodashGet(report, 'policyID', '')} | ||
onSubmit={(transactionChanges) => { | ||
setDraftSplitTransaction({category: transactionChanges.category.trim()}); | ||
}} | ||
/> | ||
); | ||
} | ||
|
||
if (fieldToEdit === CONST.EDIT_REQUEST_FIELD.TAG) { | ||
return ( | ||
<EditRequestTagPage | ||
defaultTag={transactionTag} | ||
policyID={lodashGet(report, 'policyID', '')} | ||
onSubmit={(transactionChanges) => { | ||
setDraftSplitTransaction({tag: transactionChanges.tag.trim()}); | ||
}} | ||
/> | ||
); | ||
} | ||
|
||
return <FullPageNotFoundView shouldShow />; | ||
} | ||
|
||
|
@@ -142,6 +174,9 @@ | |
key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${route.params.reportID}`, | ||
canEvict: false, | ||
}, | ||
report: { | ||
key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${route.params.reportID}`, | ||
} | ||
}), | ||
// eslint-disable-next-line rulesdir/no-multiple-onyx-in-file | ||
withOnyx({ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why do we have two calls to |
||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Coming from #37146, this has caused a bug where you can't un-select a category when editing split bill