Skip to content

Fix existing approver is shown in additional approver briefly #61819

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

Merged
merged 2 commits into from
May 14, 2025
Merged

Fix existing approver is shown in additional approver briefly #61819

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c5679c
fix existing approver is shown in additional approver briefly
bernhardoj May 10, 2025
54a0e8d
lint
bernhardoj May 10, 2025
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
11 changes: 9 additions & 2 deletions src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsApproverPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import ROUTES from '@src/ROUTES';
import type SCREENS from '@src/SCREENS';
import type {Icon} from '@src/types/onyx/OnyxCommon';
import {isEmptyObject} from '@src/types/utils/EmptyObject';
import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';

type WorkspaceWorkflowsApprovalsApproverPageProps = WithPolicyAndFullscreenLoadingProps &
PlatformStackScreenProps<WorkspaceSplitNavigatorParamList, typeof SCREENS.WORKSPACE.WORKFLOWS_APPROVALS_APPROVER>;
Expand All @@ -54,7 +55,8 @@ function WorkspaceWorkflowsApprovalsApproverPage({policy, personalDetails, isLoa
const styles = useThemeStyles();
const {translate} = useLocalize();
const [searchTerm, debouncedSearchTerm, setSearchTerm] = useDebouncedState('');
const [approvalWorkflow] = useOnyx(ONYXKEYS.APPROVAL_WORKFLOW);
const [approvalWorkflow, approvalWorkflowMetadata] = useOnyx(ONYXKEYS.APPROVAL_WORKFLOW, {canBeMissing: true});
const isApprovalWorkflowLoading = isLoadingOnyxValue(approvalWorkflowMetadata);
const [selectedApproverEmail, setSelectedApproverEmail] = useState<string | undefined>(undefined);
const [allApprovers, setAllApprovers] = useState<SelectionListApprover[]>([]);
const shouldShowTextInput = allApprovers?.length >= CONST.STANDARD_LIST_ITEM_LIMIT;
Expand Down Expand Up @@ -83,6 +85,10 @@ function WorkspaceWorkflowsApprovalsApproverPage({policy, personalDetails, isLoa
const sections: ApproverSection[] = useMemo(() => {
const approvers: SelectionListApprover[] = [];

if (isApprovalWorkflowLoading) {
return [];
}

if (employeeList) {
const availableApprovers = Object.values(employeeList)
.map((employee): SelectionListApprover | null => {
Expand Down Expand Up @@ -147,6 +153,7 @@ function WorkspaceWorkflowsApprovalsApproverPage({policy, personalDetails, isLoa
},
];
}, [
isApprovalWorkflowLoading,
approversFromWorkflow,
isDefault,
approverIndex,
Expand All @@ -160,7 +167,7 @@ function WorkspaceWorkflowsApprovalsApproverPage({policy, personalDetails, isLoa
translate,
]);

const shouldShowListEmptyContent = !debouncedSearchTerm && approvalWorkflow && !sections.at(0)?.data.length;
const shouldShowListEmptyContent = !debouncedSearchTerm && !!approvalWorkflow && !sections.at(0)?.data.length && !isApprovalWorkflowLoading;

const goBack = useCallback(() => {
let backTo;
Expand Down