From a82e1e83b73bff6714841e69b4be3db56c42b6e3 Mon Sep 17 00:00:00 2001
From: John Marchi <johnmarchi@John-M-MBP-M1M-2021.local>
Date: Wed, 26 Feb 2025 15:12:47 -0800
Subject: [PATCH 1/3] Adding non urgent message alert to secure messaging form

---
 .../StartNewMessage/StartNewMessage.test.tsx     | 12 ++++++++++++
 .../StartNewMessage/StartNewMessage.tsx          | 16 ++++++++++++++++
 VAMobile/src/translations/en/common.json         |  4 ++++
 3 files changed, 32 insertions(+)

diff --git a/VAMobile/src/screens/HealthScreen/SecureMessaging/StartNewMessage/StartNewMessage.test.tsx b/VAMobile/src/screens/HealthScreen/SecureMessaging/StartNewMessage/StartNewMessage.test.tsx
index 7003865b274..9c0889c890e 100644
--- a/VAMobile/src/screens/HealthScreen/SecureMessaging/StartNewMessage/StartNewMessage.test.tsx
+++ b/VAMobile/src/screens/HealthScreen/SecureMessaging/StartNewMessage/StartNewMessage.test.tsx
@@ -232,4 +232,16 @@ context('StartNewMessage', () => {
       await waitFor(() => expect(mockNavigationSpy).toHaveBeenCalled())
     })
   })
+
+  describe('when displaying the form', () => {
+    it('should display an alert about urgent messages', async () => {
+      when(api.get as jest.Mock)
+        .calledWith('/v0/messaging/health/recipients')
+        .mockResolvedValue(recipients)
+        .calledWith('/v0/messaging/health/messages/signature')
+        .mockResolvedValue(signature)
+      initializeTestInstance()
+      await waitFor(() => expect(screen.getAllByText('Only use messages for non-urgent needs')).toBeTruthy())
+    })
+  })
 })
diff --git a/VAMobile/src/screens/HealthScreen/SecureMessaging/StartNewMessage/StartNewMessage.tsx b/VAMobile/src/screens/HealthScreen/SecureMessaging/StartNewMessage/StartNewMessage.tsx
index bc5b464dfa7..05dd2d373b1 100644
--- a/VAMobile/src/screens/HealthScreen/SecureMessaging/StartNewMessage/StartNewMessage.tsx
+++ b/VAMobile/src/screens/HealthScreen/SecureMessaging/StartNewMessage/StartNewMessage.tsx
@@ -36,6 +36,7 @@ import {
   MessageAlert,
   PickerItem,
   TextArea,
+  TextView,
 } from 'components'
 import { SnackbarMessages } from 'components/SnackBar'
 import { Events } from 'constants/analytics'
@@ -380,6 +381,21 @@ function StartNewMessage({ navigation, route }: StartNewMessageProps) {
 
     return (
       <Box>
+        <Box mb={theme.dimensions.standardMarginBetween}>
+          <AlertWithHaptics
+            variant="info"
+            header={t('secureMessaging.startNewMessage.nonurgent.title')}
+            headerA11yLabel={a11yLabelVA(t('appointments.appointmentsStatusSomeUnavailable'))}
+            scrollViewRef={scrollViewRef}>
+            <TextView variant="MobileBody">
+              {t('secureMessaging.startNewMessage.nonurgent.careTeam')}
+              <TextView variant="MobileBodyBold">
+                {t('secureMessaging.startNewMessage.nonurgent.threeDays')}
+              </TextView>{' '}
+              {t('secureMessaging.startNewMessage.nonurgent.reply')}
+            </TextView>
+          </AlertWithHaptics>
+        </Box>
         <MessageAlert
           hasValidationError={formContainsError}
           saveDraftAttempted={onSaveDraftClicked}
diff --git a/VAMobile/src/translations/en/common.json b/VAMobile/src/translations/en/common.json
index 138bf1e99f7..a6a00aab1d4 100644
--- a/VAMobile/src/translations/en/common.json
+++ b/VAMobile/src/translations/en/common.json
@@ -1329,6 +1329,10 @@
   "secureMessaging.sendError.ifTheAppStill.a11y": "If the app still doesn't work, call the My Healthy Vet Help Desk. We're here Monday-Friday, 8:00 a.m.-8:00 p.m. Eastern Time.",
   "secureMessaging.sendError.title": "Message failed to send",
   "secureMessaging.startNewMessage": "Start new message",
+  "secureMessaging.startNewMessage.nonurgent.title": "Only use messages for non-urgent needs",
+  "secureMessaging.startNewMessage.nonurgent.careTeam": "Your care team may take up to ",
+  "secureMessaging.startNewMessage.nonurgent.threeDays": "3 business days",
+  "secureMessaging.startNewMessage.nonurgent.reply": "to reply",
   "secureMessaging.startNewMessage.attach": "Attach",
   "secureMessaging.startNewMessage.attachments.title": "Attach file",
   "secureMessaging.startNewMessage.bothYouAndProviderMustBeEnrolled": "We're sorry. To send a Secure Message, both you and your VA primary care provider must be enrolled in the Secure Messaging program. Please contact your primary care provider to see if they are enrolled and can enroll you in the program.",

From 609ffad1bb8a761e671b6e00dcb304b9bedc7157 Mon Sep 17 00:00:00 2001
From: John Marchi <johnmarchi@John-M-MBP-M1M-2021.local>
Date: Thu, 27 Feb 2025 09:28:46 -0800
Subject: [PATCH 2/3] fixing accessibility label issue, updating formatting

---
 .../StartNewMessage/StartNewMessage.test.tsx    | 17 +++--------------
 .../StartNewMessage/StartNewMessage.tsx         | 13 +------------
 VAMobile/src/translations/en/common.json        |  2 +-
 3 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/VAMobile/src/screens/HealthScreen/SecureMessaging/StartNewMessage/StartNewMessage.test.tsx b/VAMobile/src/screens/HealthScreen/SecureMessaging/StartNewMessage/StartNewMessage.test.tsx
index 9c0889c890e..3b79b812682 100644
--- a/VAMobile/src/screens/HealthScreen/SecureMessaging/StartNewMessage/StartNewMessage.test.tsx
+++ b/VAMobile/src/screens/HealthScreen/SecureMessaging/StartNewMessage/StartNewMessage.test.tsx
@@ -127,19 +127,6 @@ context('StartNewMessage', () => {
     })
   })
 
-  describe('on click of the collapsible view', () => {
-    it('should show the Reply Help panel', async () => {
-      when(api.get as jest.Mock)
-        .calledWith('/v0/messaging/health/recipients')
-        .mockResolvedValue(recipients)
-        .calledWith('/v0/messaging/health/messages/signature')
-        .mockResolvedValue(signature)
-      initializeTestInstance()
-      await waitFor(() => fireEvent.press(screen.getByLabelText('Only use messages for non-urgent needs')))
-      await waitFor(() => expect(mockNavigationSpy).toHaveBeenCalled())
-    })
-  })
-
   describe('when the subject is general', () => {
     it('should add the text (*Required) for the subject line field', async () => {
       when(api.get as jest.Mock)
@@ -241,7 +228,9 @@ context('StartNewMessage', () => {
         .calledWith('/v0/messaging/health/messages/signature')
         .mockResolvedValue(signature)
       initializeTestInstance()
-      await waitFor(() => expect(screen.getAllByText('Only use messages for non-urgent needs')).toBeTruthy())
+      await waitFor(() =>
+        expect(screen.getAllByText('Your care team may take up to 3 business days to reply.')).toBeTruthy(),
+      )
     })
   })
 })
diff --git a/VAMobile/src/screens/HealthScreen/SecureMessaging/StartNewMessage/StartNewMessage.tsx b/VAMobile/src/screens/HealthScreen/SecureMessaging/StartNewMessage/StartNewMessage.tsx
index 05dd2d373b1..f8d3147d58d 100644
--- a/VAMobile/src/screens/HealthScreen/SecureMessaging/StartNewMessage/StartNewMessage.tsx
+++ b/VAMobile/src/screens/HealthScreen/SecureMessaging/StartNewMessage/StartNewMessage.tsx
@@ -385,13 +385,10 @@ function StartNewMessage({ navigation, route }: StartNewMessageProps) {
           <AlertWithHaptics
             variant="info"
             header={t('secureMessaging.startNewMessage.nonurgent.title')}
-            headerA11yLabel={a11yLabelVA(t('appointments.appointmentsStatusSomeUnavailable'))}
             scrollViewRef={scrollViewRef}>
             <TextView variant="MobileBody">
               {t('secureMessaging.startNewMessage.nonurgent.careTeam')}
-              <TextView variant="MobileBodyBold">
-                {t('secureMessaging.startNewMessage.nonurgent.threeDays')}
-              </TextView>{' '}
+              <TextView variant="MobileBodyBold">{t('secureMessaging.startNewMessage.nonurgent.threeDays')}</TextView>
               {t('secureMessaging.startNewMessage.nonurgent.reply')}
             </TextView>
           </AlertWithHaptics>
@@ -415,14 +412,6 @@ function StartNewMessage({ navigation, route }: StartNewMessageProps) {
             setResetErrors={setResetErrors}
             setErrorList={setErrorList}
           />
-          <Box mt={theme.dimensions.standardMarginBetween}>
-            <LinkWithAnalytics
-              type="custom"
-              text={t('secureMessaging.replyHelp.onlyUseMessages')}
-              onPress={navigateToReplyHelp}
-              testID="startNewMessageOnlyUseMessagesTestID"
-            />
-          </Box>
           <Box mt={theme.dimensions.standardMarginBetween}>
             <Button
               label={t('secureMessaging.formMessage.send')}
diff --git a/VAMobile/src/translations/en/common.json b/VAMobile/src/translations/en/common.json
index a6a00aab1d4..0ca5122e547 100644
--- a/VAMobile/src/translations/en/common.json
+++ b/VAMobile/src/translations/en/common.json
@@ -1332,7 +1332,7 @@
   "secureMessaging.startNewMessage.nonurgent.title": "Only use messages for non-urgent needs",
   "secureMessaging.startNewMessage.nonurgent.careTeam": "Your care team may take up to ",
   "secureMessaging.startNewMessage.nonurgent.threeDays": "3 business days",
-  "secureMessaging.startNewMessage.nonurgent.reply": "to reply",
+  "secureMessaging.startNewMessage.nonurgent.reply": " to reply.",
   "secureMessaging.startNewMessage.attach": "Attach",
   "secureMessaging.startNewMessage.attachments.title": "Attach file",
   "secureMessaging.startNewMessage.bothYouAndProviderMustBeEnrolled": "We're sorry. To send a Secure Message, both you and your VA primary care provider must be enrolled in the Secure Messaging program. Please contact your primary care provider to see if they are enrolled and can enroll you in the program.",

From c2ffbe7826b42c6acd94de2b922bef007a9ef470 Mon Sep 17 00:00:00 2001
From: John Marchi <johnmarchi@John-M-MBP-M1M-2021.local>
Date: Thu, 27 Feb 2025 09:45:48 -0800
Subject: [PATCH 3/3] fixing lint

---
 .../SecureMessaging/StartNewMessage/StartNewMessage.tsx      | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/VAMobile/src/screens/HealthScreen/SecureMessaging/StartNewMessage/StartNewMessage.tsx b/VAMobile/src/screens/HealthScreen/SecureMessaging/StartNewMessage/StartNewMessage.tsx
index f8d3147d58d..d564461c234 100644
--- a/VAMobile/src/screens/HealthScreen/SecureMessaging/StartNewMessage/StartNewMessage.tsx
+++ b/VAMobile/src/screens/HealthScreen/SecureMessaging/StartNewMessage/StartNewMessage.tsx
@@ -374,11 +374,6 @@ function StartNewMessage({ navigation, route }: StartNewMessageProps) {
       )
     }
 
-    const navigateToReplyHelp = () => {
-      logAnalyticsEvent(Events.vama_sm_nonurgent())
-      navigateTo('ReplyHelp')
-    }
-
     return (
       <Box>
         <Box mb={theme.dimensions.standardMarginBetween}>