-
Notifications
You must be signed in to change notification settings - Fork 3.9k
Add report action for deleting expenses #54175
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
Merged
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
b65a85c
Add report action for deleting expenses
nkdengineer 269c197
Merge branch 'main' into fix/53479
nkdengineer f047de6
fix deleted transaction message
nkdengineer 8f4eb98
fix lint
nkdengineer c2b3d3f
fix lint
nkdengineer f91f5f5
Merge branch 'main' into fix/53479
nkdengineer 180b307
fix amount in get message
nkdengineer 5fd04b2
resolve conflict
nkdengineer a63b6b5
remmove useless code
nkdengineer 1afc457
fix lint
nkdengineer e78accf
resolve conflict
nkdengineer 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -64,7 +64,7 @@ import {autoSwitchToFocusMode} from './actions/PriorityMode'; | |
| import {hasCreditBankAccount} from './actions/ReimbursementAccount/store'; | ||
| import {handleReportChanged} from './actions/Report'; | ||
| import {isAnonymousUser as isAnonymousUserSession} from './actions/Session'; | ||
| import {convertToDisplayString} from './CurrencyUtils'; | ||
| import {convertToDisplayString, getCurrencySymbol} from './CurrencyUtils'; | ||
| import DateUtils from './DateUtils'; | ||
| import {hasValidDraftComment} from './DraftCommentUtils'; | ||
| import {getMicroSecondOnyxErrorWithTranslationKey} from './ErrorUtils'; | ||
|
|
@@ -5137,6 +5137,17 @@ function getWorkspaceNameUpdatedMessage(action: ReportAction) { | |
| return Str.htmlEncode(message); | ||
| } | ||
|
|
||
| function getDeletedTransactionMessage(action: ReportAction) { | ||
| const deletedTransactionOriginalMessage = getOriginalMessage(action as ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.DELETED_TRANSACTION>) ?? {}; | ||
| const amount = Math.abs(deletedTransactionOriginalMessage.amount ?? 0) / 100; | ||
| const currency = getCurrencySymbol(deletedTransactionOriginalMessage.currency ?? ''); | ||
| const message = translateLocal('iou.deletedTransaction', { | ||
| amount: `${currency}${amount}`, | ||
|
Contributor
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. You have used wrong format for displaying amount, which caused #55837 |
||
| merchant: deletedTransactionOriginalMessage.merchant ?? '', | ||
| }); | ||
| return message; | ||
| } | ||
|
|
||
| /** | ||
| * @param iouReportID - the report ID of the IOU report the action belongs to | ||
| * @param type - IOUReportAction type. Can be oneOf(create, decline, cancel, pay, split) | ||
|
|
@@ -8969,6 +8980,7 @@ export { | |
| getIOUForwardedMessage, | ||
| getRejectedReportMessage, | ||
| getWorkspaceNameUpdatedMessage, | ||
| getDeletedTransactionMessage, | ||
| getUpgradeWorkspaceMessage, | ||
| getDowngradeWorkspaceMessage, | ||
| getReportAutomaticallySubmittedMessage, | ||
|
|
||
This file contains hidden or 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 hidden or 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 hidden or 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
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.
Uh oh!
There was an error while loading. Please reload this page.