Skip to content

Workflows-"Not here" page displayed after editing the approver, then the "Expenses from" #67134

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
Valforte merged 4 commits into from
Jul 29, 2025
Merged

Workflows-"Not here" page displayed after editing the approver, then the "Expenses from" #67134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
83f3177
fix: note here page issue
thelullabyy Jul 25, 2025
6a94163
fix: type
thelullabyy Jul 25, 2025
bbcd619
fix: type
thelullabyy Jul 25, 2025
7cf1a6d
fix: type
thelullabyy Jul 25, 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
1 change: 1 addition & 0 deletions src/libs/WorkflowUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ const INITIAL_APPROVAL_WORKFLOW: ApprovalWorkflowOnyx = {
usedApproverEmails: [],
isDefault: false,
action: CONST.APPROVAL_WORKFLOW.ACTION.CREATE,
originalApprovers: [],
};

type GetApproversParams = {
Expand Down
5 changes: 3 additions & 2 deletions src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsEditPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ type WorkspaceWorkflowsApprovalsEditPageProps = WithPolicyAndFullscreenLoadingPr
function WorkspaceWorkflowsApprovalsEditPage({policy, isLoadingReportData = true, route}: WorkspaceWorkflowsApprovalsEditPageProps) {
const styles = useThemeStyles();
const {translate} = useLocalize();
const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
const [approvalWorkflow] = useOnyx(ONYXKEYS.APPROVAL_WORKFLOW);
const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {canBeMissing: true});
const [approvalWorkflow] = useOnyx(ONYXKEYS.APPROVAL_WORKFLOW, {canBeMissing: true});
const [initialApprovalWorkflow, setInitialApprovalWorkflow] = useState<ApprovalWorkflow | undefined>();
const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false);
const formRef = useRef<ScrollView>(null);
Expand Down Expand Up @@ -111,6 +111,7 @@ function WorkspaceWorkflowsApprovalsEditPage({policy, isLoadingReportData = true
usedApproverEmails,
action: CONST.APPROVAL_WORKFLOW.ACTION.EDIT,
errors: null,
originalApprovers: currentApprovalWorkflow.approvers,
});
setInitialApprovalWorkflow(currentApprovalWorkflow);
}, [currentApprovalWorkflow, defaultWorkflowMembers, initialApprovalWorkflow, usedApproverEmails]);
Expand Down
2 changes: 1 addition & 1 deletion src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsExpensesFromPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ function WorkspaceWorkflowsApprovalsExpensesFromPage({policy, isLoadingReportDat
const shouldShowNotFoundView = (isEmptyObject(policy) && !isLoadingReportData) || !isPolicyAdmin(policy) || isPendingDeletePolicy(policy);
const isInitialCreationFlow = approvalWorkflow?.action === CONST.APPROVAL_WORKFLOW.ACTION.CREATE && !route.params.backTo;
const shouldShowListEmptyContent = !isLoadingApprovalWorkflow && approvalWorkflow && approvalWorkflow.availableMembers.length === 0;
const firstApprover = approvalWorkflow?.approvers?.[0]?.email ?? '';
const firstApprover = approvalWorkflow?.originalApprovers?.[0]?.email ?? '';

const personalDetailLogins = useDeepCompareRef(Object.fromEntries(Object.entries(personalDetails ?? {}).map(([id, details]) => [id, details?.login])));

Expand Down
5 changes: 5 additions & 0 deletions src/types/onyx/ApprovalWorkflow.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,11 @@ type ApprovalWorkflowOnyx = Omit<ApprovalWorkflow, 'approvers'> & {
* Errors for the workflow
*/
errors?: Record<string, TranslationPaths>;

/**
* List of original approvers in the workflow
*/
originalApprovers: Approver[];
};

export default ApprovalWorkflow;
Expand Down