From 19a1534151116dc9fb0b57ada6818fb320c5ba4a Mon Sep 17 00:00:00 2001 From: wjames111 Date: Fri, 22 May 2026 14:19:52 -0400 Subject: [PATCH 1/3] MPDX-9618 Link Ministry Expenses step to MPDX MPGA report Replace the external StaffWeb MPGA URL with the in-app /reports/mpgaIncomeExpenses route so users stay in MPDX when looking up their averages. Co-Authored-By: Claude Opus 4.7 (1M context) --- .../MinistryExpenses/MinistryExpensesStep.tsx | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/components/HrTools/GoalCalculator/MinistryExpenses/MinistryExpensesStep.tsx b/src/components/HrTools/GoalCalculator/MinistryExpenses/MinistryExpensesStep.tsx index 86eb767e38..fe98f42125 100644 --- a/src/components/HrTools/GoalCalculator/MinistryExpenses/MinistryExpensesStep.tsx +++ b/src/components/HrTools/GoalCalculator/MinistryExpenses/MinistryExpensesStep.tsx @@ -1,6 +1,8 @@ +import NextLink from 'next/link'; import React from 'react'; import { Link, Typography, styled } from '@mui/material'; import { Trans, useTranslation } from 'react-i18next'; +import { useAccountListId } from 'src/hooks/useAccountListId'; import { useGoalCalculator } from '../Shared/GoalCalculatorContext'; import { ExpensesStep } from '../SharedComponents/ExpensesStep/ExpensesStep'; @@ -12,6 +14,7 @@ const InstructionsWrapper = styled('div')(({ theme }) => ({ const Instructions: React.FC = () => { const { t } = useTranslation(); + const accountListId = useAccountListId() ?? ''; return ( @@ -19,16 +22,18 @@ const Instructions: React.FC = () => { Enter amounts for the following categories of reimbursable and ministry expenses. The{' '} - - MPGA tool on StaffWeb + + MPGA report {' '} can show you your averages in some of these categories. If you did not take full reimbursements for the entire year, or if your reimbursements were abnormally high (e.g. you had a surgery or bought a new computer), or low (e.g. no summer mission), you will want to adjust the averages from the MPGA to reflect an average year. Click - the link above, go to the Income/Expenses tab, and look under the - Ministry Expenses section. + the link above and look under the Ministry Expenses section. From 160deabbef4cc3209fabc7be94d9f8bbd4272b32 Mon Sep 17 00:00:00 2001 From: wjames111 Date: Fri, 22 May 2026 14:53:31 -0400 Subject: [PATCH 2/3] Update link instructions --- .../GoalCalculator/MinistryExpenses/MinistryExpensesStep.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/HrTools/GoalCalculator/MinistryExpenses/MinistryExpensesStep.tsx b/src/components/HrTools/GoalCalculator/MinistryExpenses/MinistryExpensesStep.tsx index fe98f42125..3852134162 100644 --- a/src/components/HrTools/GoalCalculator/MinistryExpenses/MinistryExpensesStep.tsx +++ b/src/components/HrTools/GoalCalculator/MinistryExpenses/MinistryExpensesStep.tsx @@ -26,14 +26,14 @@ const Instructions: React.FC = () => { component={NextLink} href={`/accountLists/${accountListId}/reports/mpgaIncomeExpenses`} > - MPGA report + MPGA tool {' '} can show you your averages in some of these categories. If you did not take full reimbursements for the entire year, or if your reimbursements were abnormally high (e.g. you had a surgery or bought a new computer), or low (e.g. no summer mission), you will want to adjust the averages from the MPGA to reflect an average year. Click - the link above and look under the Ministry Expenses section. + the link above and look at the Ministry rows in the Expenses table. From f0dc50364894efbd9c5e7c1cdc4cc4b881252d82 Mon Sep 17 00:00:00 2001 From: wjames111 Date: Fri, 22 May 2026 14:55:15 -0400 Subject: [PATCH 3/3] Update text --- .../GoalCalculator/MinistryExpenses/MinistryExpensesStep.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/HrTools/GoalCalculator/MinistryExpenses/MinistryExpensesStep.tsx b/src/components/HrTools/GoalCalculator/MinistryExpenses/MinistryExpensesStep.tsx index 3852134162..5649691aca 100644 --- a/src/components/HrTools/GoalCalculator/MinistryExpenses/MinistryExpensesStep.tsx +++ b/src/components/HrTools/GoalCalculator/MinistryExpenses/MinistryExpensesStep.tsx @@ -26,7 +26,7 @@ const Instructions: React.FC = () => { component={NextLink} href={`/accountLists/${accountListId}/reports/mpgaIncomeExpenses`} > - MPGA tool + Ministry Partner Giving Analysis tool {' '} can show you your averages in some of these categories. If you did not take full reimbursements for the entire year, or if your