Repository navigation
Implement report approvals #24639
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
Implement report approvals #24639
Changes from all commits
Commits
Show all changes
53 commits
Select commit
Hold shift + click to select a range
e1c0319
Add approveMoneyRequest action
b1e77ab
Add logic for showing the approve/settlement button
386d9f9
Merge branch 'main' into youssef_approve_money_request
fa1bb92
Add helper methods
691ceba
Allow APPROVED action to be displayed
e0da0f3
Fix optimistic data for approved action
f7b422e
Add missing imports and code tidying up
9a8bef8
Display APPROVED action text in subtle color
2d50862
Display approved reports as approved and not paid
e8543c8
Fix lastMessageText showing duplicate actor name
00fb139
Merge branch 'main' into youssef_approve_money_request
1140036
Code improvement
266cd4c
Create new IOU report if the current report is approved
5de9792
Display translated IOU/Report previews
75e9ed4
Fix bug showing approve button when report is settled
508021d
Display green dot properly
ecd428a
Cleanup
18c5198
Clean up
4e2a5c1
Merge branch 'main' into youssef_approve_money_request
da32226
Use getIOUReportActionMessage to format APPROVED action message
d75e3f8
Add spanish translations
3930802
Code tidying up
c7d51cf
Fix IOU report being created instead of Expense report
d160aed
Code tidying up
07682c5
Fix bug
74b8caf
Merge branch 'main' into youssef_approve_money_request
3b570e2
Bug fix
273966c
Fix code action
100f03d
Fix code actions
03cc982
Merge branch 'main' into youssef_approve_money_request
909cd45
Linting
3462084
Style and translation
fca135f
Add back code removed by mistake
f7382f3
Fix test
2d3bf23
Style fix
c134640
Remove no longer needed helper func
216618b
Merge branch 'main' into youssef_approve_money_request
21d5783
Show Pay button in report preview for admins when report is approved
10a287a
Merge branch 'main' into youssef_approve_money_request
03e9513
Clean up
ceff45b
Apply suggestions from code review
2e373a8
Address PR comments
95dc9e2
Address comments
15ab698
Only display "Pay" button for the admin in the report preview
e7c4804
Optimise how policy is passed to money request componenets
c89f0a6
Merge branch 'main' into youssef_approve_money_request
66b6724
Bug fix
4833ce4
Another bug fix
7dc3738
Merge branch 'main' into youssef_approve_money_request
1b176a9
Merge branch 'main' into youssef_approve_money_request
575524c
Apply suggestions from code review
b341aa1
Address PR comments
577d9ad
Fix lint and approve button style
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
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
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.
Will we ever show Settlement and Approve button at the same time?
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.
No I think the conditionals implemented will prevent this, this specifically
const isPayer = policyType === CONST.POLICY.TYPE.CORPORATE ? isPolicyAdmin && isApproved