Skip to content
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.

Sign up for GitHub

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

[CRITICAL] Implement <WorkspaceWorkflowsApprovalsExpensesFromPage /> for Member Selection #46484

Merged
merged 14 commits into from
Jul 31, 2024
+208 −12
Merged

[CRITICAL] Implement <WorkspaceWorkflowsApprovalsExpensesFromPage /> for Member Selection #46484

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2133d72
Update ApprovalWorkflow types
blazejkustra Jul 30, 2024
b8d64d7
Add functionality to WorkspaceWorkflowsPage
blazejkustra Jul 30, 2024
a0e00fa
Add translation
blazejkustra Jul 30, 2024
725c887
Add empty approval workflow EMPTY_APPROVAL_WORKFLOW
blazejkustra Jul 30, 2024
5c43fbd
Implement selection list on expenses form page
blazejkustra Jul 30, 2024
0e3601c
Fix lint
blazejkustra Jul 30, 2024
877bad1
Add accountId to the icon so that email is displayed
blazejkustra Jul 30, 2024
82a8725
Add fallback avatar
blazejkustra Jul 30, 2024
c05863a
Add noResultsFound message
blazejkustra Jul 30, 2024
a991ef7
Fix console errors
blazejkustra Jul 30, 2024
0f42bf8
Merge branch 'main' into approval-workflows/expenses-from
blazejkustra Jul 30, 2024
f9c1a6e
Remove unused import
blazejkustra Jul 30, 2024
17dbd84
Style Add approval workflow button
blazejkustra Jul 30, 2024
9da70e4
Add admin badge for selected users
blazejkustra Jul 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add fallback avatar
  • Loading branch information
@blazejkustra
blazejkustra committed Jul 30, 2024

Verified

This commit was signed with the committer’s verified signature.
kidroca Peter Velkov
GPG key ID: 45D71A61A92B0DEC
Verified
Learn about vigilant mode
commit 82a8725ab17aaf272fc773106dd876ed3c3af42a
5 changes: 3 additions & 2 deletions src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsExpensesFromPage.tsx
View file
Original file line number Diff line number Diff line change
@@ -6,6 +6,7 @@ import Badge from '@components/Badge';
import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton';
import HeaderWithBackButton from '@components/HeaderWithBackButton';
import {FallbackAvatar} from '@components/Icon/Expensicons';
import ScreenWrapper from '@components/ScreenWrapper';
import SelectionList from '@components/SelectionList';
import InviteMemberListItem from '@components/SelectionList/InviteMemberListItem';
@@ -73,7 +74,7 @@ function WorkspaceWorkflowsApprovalsExpensesFromPage({policy, isLoadingReportDat
keyForList: member.email,
isSelected: true,
login: member.email,
icons: member.avatar ? [{source: member.avatar, type: CONST.ICON_TYPE_AVATAR, name: member.displayName, id: accountID}] : [],
icons: [{source: member.avatar ?? FallbackAvatar, type: CONST.ICON_TYPE_AVATAR, name: member.displayName, id: accountID}],
};
}),
);
@@ -94,7 +95,7 @@ function WorkspaceWorkflowsApprovalsExpensesFromPage({policy, isLoadingReportDat
keyForList: member.email,
isSelected: false,
login: member.email,
icons: member.avatar ? [{source: member.avatar, type: CONST.ICON_TYPE_AVATAR, name: member.displayName, id: accountID}] : [],
icons: [{source: member.avatar ?? FallbackAvatar, type: CONST.ICON_TYPE_AVATAR, name: member.displayName, id: accountID}],
rightElement: isAdmin ? <Badge text={translate('common.admin')} /> : undefined,
};
})