From 360f90faac86ae3cc20140d4c6f9bbfde97eebd1 Mon Sep 17 00:00:00 2001
From: wjames111 <william.james@cru.org>
Date: Tue, 26 May 2026 16:22:15 -0400
Subject: [PATCH 1/3] Runs prettier

---
 .../Table/StatusSelect/StatusSelect.tsx              | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/components/HrTools/MinistryPartnerReminders/Table/StatusSelect/StatusSelect.tsx b/src/components/HrTools/MinistryPartnerReminders/Table/StatusSelect/StatusSelect.tsx
index 975e9a8c50..b9fe9a6a03 100644
--- a/src/components/HrTools/MinistryPartnerReminders/Table/StatusSelect/StatusSelect.tsx
+++ b/src/components/HrTools/MinistryPartnerReminders/Table/StatusSelect/StatusSelect.tsx
@@ -7,6 +7,16 @@ type StatusSelectProps = Omit<SelectProps, 'value'> & {
   value: MinistryPartnerReminderFrequencyEnum;
 };
 
+const orderedStatuses: MinistryPartnerReminderFrequencyEnum[] = [
+  MinistryPartnerReminderFrequencyEnum.Monthly,
+  MinistryPartnerReminderFrequencyEnum.Bimonthly,
+  MinistryPartnerReminderFrequencyEnum.Quarterly,
+  MinistryPartnerReminderFrequencyEnum.SemiAnnually,
+  MinistryPartnerReminderFrequencyEnum.Annually,
+  MinistryPartnerReminderFrequencyEnum.DoNotRemind,
+  MinistryPartnerReminderFrequencyEnum.NotReminded,
+];
+
 export const StatusSelect: React.FC<StatusSelectProps> = ({
   value,
   ...props
@@ -15,7 +25,7 @@ export const StatusSelect: React.FC<StatusSelectProps> = ({
   return (
     <FormControl size={'small'} sx={{ width: 150 }}>
       <Select {...props} value={value} sx={{ backgroundColor: 'common.white' }}>
-        {Object.values(MinistryPartnerReminderFrequencyEnum).map((status) => (
+        {orderedStatuses.map((status) => (
           <MenuItem key={status} value={status}>
             {getLocalizedReminderStatus(t, status)}
           </MenuItem>

From b8dc1b764f06dc220ff1546c9a00ff62e32712fb Mon Sep 17 00:00:00 2001
From: wjames111 <william.james@cru.org>
Date: Tue, 26 May 2026 16:28:52 -0400
Subject: [PATCH 2/3] Update confusing labels

---
 public/locales/en/translation.json                        | 4 ++--
 .../PartnerRemindersReport.test.tsx                       | 2 +-
 .../Table/RemindersTable.test.tsx                         | 4 ++--
 src/lib/functions/getLocalizedReminderStatus.test.ts      | 8 ++++----
 src/lib/functions/getLocalizedReminderStatus.ts           | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json
index d16f0d06db..b81dc3a6a6 100644
--- a/public/locales/en/translation.json
+++ b/public/locales/en/translation.json
@@ -985,7 +985,6 @@
     "Do Not Import": "Do Not Import",
     "DO NOT MERGE MINISTRY ACCOUNTS THROUGH {{appName}}": "DO NOT MERGE MINISTRY ACCOUNTS THROUGH {{appName}}",
     "Do not move a contact into this column called \"Received\". Due to an outdated feature, contacts must first be moved to \"Committed\". If the gift has been recorded, you can then move the contact into the column called \"Given\".": "Do not move a contact into this column called \"Received\". Due to an outdated feature, contacts must first be moved to \"Committed\". If the gift has been recorded, you can then move the contact into the column called \"Given\".",
-    "Do Not Remind": "Do Not Remind",
     "Do you live within 50 miles of one of these major cities?": "Do you live within 50 miles of one of these major cities?",
     "Do you receive donations in any other country or from any other organizations?": "Do you receive donations in any other country or from any other organizations?",
     "Do you want to cancel your {{formTitle}}?": "Do you want to cancel your {{formTitle}}?",
@@ -1959,8 +1958,8 @@
     "Not applicable": "Not applicable",
     "Not equals": "Not equals",
     "Not Interested": "Not Interested",
-    "Not Reminded": "Not Reminded",
     "Not taxed now": "Not taxed now",
+    "Not Yet Enrolled": "Not Yet Enrolled",
     "Note": "Note",
     "Note (Optional)": "Note (Optional)",
     "Note: Italy staff must complete a paper MHI form.": "Note: Italy staff must complete a paper MHI form.",
@@ -2283,6 +2282,7 @@
     "Request processed on": "Request processed on",
     "Request processed on:": "Request processed on:",
     "Request Summary": "Request Summary",
+    "Requested No Reminder": "Requested No Reminder",
     "Requested on": "Requested on",
     "Requested on:": "Requested on:",
     "Requested salary": "Requested salary",
diff --git a/src/components/HrTools/MinistryPartnerReminders/PartnerRemindersReport.test.tsx b/src/components/HrTools/MinistryPartnerReminders/PartnerRemindersReport.test.tsx
index 904b8e134d..2798cd0974 100644
--- a/src/components/HrTools/MinistryPartnerReminders/PartnerRemindersReport.test.tsx
+++ b/src/components/HrTools/MinistryPartnerReminders/PartnerRemindersReport.test.tsx
@@ -151,7 +151,7 @@ describe('PartnerRemindersReport', () => {
     expect(names).toHaveLength(2);
     expect(getAllByText('Jan 15, 2023')).toHaveLength(2);
     expect(getAllByText('Feb 15, 2023')).toHaveLength(2);
-    expect(getByText('Not Reminded')).toBeInTheDocument();
+    expect(getByText('Not Yet Enrolled')).toBeInTheDocument();
   });
 
   it('should call update mutation when changing reminder status and clicking save', async () => {
diff --git a/src/components/HrTools/MinistryPartnerReminders/Table/RemindersTable.test.tsx b/src/components/HrTools/MinistryPartnerReminders/Table/RemindersTable.test.tsx
index 9e5877fb95..88e530cd11 100644
--- a/src/components/HrTools/MinistryPartnerReminders/Table/RemindersTable.test.tsx
+++ b/src/components/HrTools/MinistryPartnerReminders/Table/RemindersTable.test.tsx
@@ -62,14 +62,14 @@ describe('RemindersTable', () => {
     expect(date).toBeTruthy();
 
     const select = getAllByRole('combobox', { name: /reminder status/i });
-    expect(select[0]).toHaveTextContent('Not Reminded');
+    expect(select[0]).toHaveTextContent('Not Yet Enrolled');
   });
 
   it('should change the select value', async () => {
     const { getAllByRole, getByRole } = render(<TestComponent />);
 
     const select = getAllByRole('combobox', { name: /reminder status/i });
-    expect(select[0]).toHaveTextContent('Not Reminded');
+    expect(select[0]).toHaveTextContent('Not Yet Enrolled');
 
     await userEvent.click(select[0]);
     const option = getByRole('option', { name: 'Monthly' });
diff --git a/src/lib/functions/getLocalizedReminderStatus.test.ts b/src/lib/functions/getLocalizedReminderStatus.test.ts
index cba3168e5c..79b66bd023 100644
--- a/src/lib/functions/getLocalizedReminderStatus.test.ts
+++ b/src/lib/functions/getLocalizedReminderStatus.test.ts
@@ -10,13 +10,13 @@ describe('getLocalizedReminderStatus', () => {
     [MinistryPartnerReminderFrequencyEnum.Quarterly, 'Quarterly'],
     [MinistryPartnerReminderFrequencyEnum.SemiAnnually, 'Semi-Annually'],
     [MinistryPartnerReminderFrequencyEnum.Annually, 'Annually'],
-    [MinistryPartnerReminderFrequencyEnum.DoNotRemind, 'Do Not Remind'],
-    [MinistryPartnerReminderFrequencyEnum.NotReminded, 'Not Reminded'],
+    [MinistryPartnerReminderFrequencyEnum.DoNotRemind, 'Requested No Reminder'],
+    [MinistryPartnerReminderFrequencyEnum.NotReminded, 'Not Yet Enrolled'],
   ])('maps %s to "%s"', (status, expected) => {
     expect(getLocalizedReminderStatus(t, status)).toBe(expected);
   });
 
-  it('falls back to "Not Reminded" for undefined', () => {
-    expect(getLocalizedReminderStatus(t, undefined)).toBe('Not Reminded');
+  it('falls back to "Not Yet Enrolled" for undefined', () => {
+    expect(getLocalizedReminderStatus(t, undefined)).toBe('Not Yet Enrolled');
   });
 });
diff --git a/src/lib/functions/getLocalizedReminderStatus.ts b/src/lib/functions/getLocalizedReminderStatus.ts
index 1d555c53d4..2222d2df88 100644
--- a/src/lib/functions/getLocalizedReminderStatus.ts
+++ b/src/lib/functions/getLocalizedReminderStatus.ts
@@ -17,9 +17,9 @@ export const getLocalizedReminderStatus = (
     case MinistryPartnerReminderFrequencyEnum.Annually:
       return t('Annually');
     case MinistryPartnerReminderFrequencyEnum.DoNotRemind:
-      return t('Do Not Remind');
+      return t('Requested No Reminder');
     case MinistryPartnerReminderFrequencyEnum.NotReminded:
     default:
-      return t('Not Reminded');
+      return t('Not Yet Enrolled');
   }
 };

From d75296fbdf4ade7d83016a00ec6f5e38a3947c6a Mon Sep 17 00:00:00 2001
From: wjames111 <william.james@cru.org>
Date: Tue, 26 May 2026 16:43:48 -0400
Subject: [PATCH 3/3] Runs prettier

---
 .../Table/StatusSelect/StatusSelect.tsx       | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/components/HrTools/MinistryPartnerReminders/Table/StatusSelect/StatusSelect.tsx b/src/components/HrTools/MinistryPartnerReminders/Table/StatusSelect/StatusSelect.tsx
index b9fe9a6a03..c395286471 100644
--- a/src/components/HrTools/MinistryPartnerReminders/Table/StatusSelect/StatusSelect.tsx
+++ b/src/components/HrTools/MinistryPartnerReminders/Table/StatusSelect/StatusSelect.tsx
@@ -7,15 +7,19 @@ type StatusSelectProps = Omit<SelectProps, 'value'> & {
   value: MinistryPartnerReminderFrequencyEnum;
 };
 
-const orderedStatuses: MinistryPartnerReminderFrequencyEnum[] = [
-  MinistryPartnerReminderFrequencyEnum.Monthly,
-  MinistryPartnerReminderFrequencyEnum.Bimonthly,
-  MinistryPartnerReminderFrequencyEnum.Quarterly,
-  MinistryPartnerReminderFrequencyEnum.SemiAnnually,
-  MinistryPartnerReminderFrequencyEnum.Annually,
-  MinistryPartnerReminderFrequencyEnum.DoNotRemind,
-  MinistryPartnerReminderFrequencyEnum.NotReminded,
-];
+const statusOrder: Record<MinistryPartnerReminderFrequencyEnum, number> = {
+  [MinistryPartnerReminderFrequencyEnum.Monthly]: 0,
+  [MinistryPartnerReminderFrequencyEnum.Bimonthly]: 1,
+  [MinistryPartnerReminderFrequencyEnum.Quarterly]: 2,
+  [MinistryPartnerReminderFrequencyEnum.SemiAnnually]: 3,
+  [MinistryPartnerReminderFrequencyEnum.Annually]: 4,
+  [MinistryPartnerReminderFrequencyEnum.DoNotRemind]: 5,
+  [MinistryPartnerReminderFrequencyEnum.NotReminded]: 6,
+};
+
+const orderedStatuses = Object.values(
+  MinistryPartnerReminderFrequencyEnum,
+).sort((a, b) => statusOrder[a] - statusOrder[b]);
 
 export const StatusSelect: React.FC<StatusSelectProps> = ({
   value,
@@ -23,7 +27,7 @@ export const StatusSelect: React.FC<StatusSelectProps> = ({
 }) => {
   const { t } = useTranslation();
   return (
-    <FormControl size={'small'} sx={{ width: 150 }}>
+    <FormControl size={'small'} sx={{ width: '100%', minWidth: 200 }}>
       <Select {...props} value={value} sx={{ backgroundColor: 'common.white' }}>
         {orderedStatuses.map((status) => (
           <MenuItem key={status} value={status}>