feature/9583-EnableSSOAppWide

VAMobile/e2e/tests/Appeals.e2e.ts

@@ -102,8 +102,6 @@ describe('Appeals', () => {
     await device.disableSynchronization()
     await element(by.id(CommonE2eIdConstants.GO_TO_VA_GOV_LINK_ID)).tap()
     await setTimeout(2000)
-    await element(by.text(CommonE2eIdConstants.LEAVING_APP_LEAVE_TEXT)).tap()
-    await setTimeout(5000)
     await device.takeScreenshot('AppealsNeedHelpGoToVAScreen')
     await device.enableSynchronization()
   })

VAMobile/env/constant.env

@@ -3,8 +3,6 @@ WEBVIEW_URL_CHANGE_LEGAL_NAME=https://www.va.gov/resources/how-to-change-your-le
 WEBVIEW_URL_CORONA_FAQ=https://www.va.gov/coronavirus-veteran-frequently-asked-questions
 WEBVIEW_URL_FACILITY_LOCATOR=https://www.va.gov/find-locations/
 WEBVIEW_URL_WHAT_TO_BRING_TO_APPOINTMENTS=https://www.va.gov/resources/what-should-i-bring-to-my-health-care-appointments/
-LINK_URL_VA_NOTIFICATIONS=https://www.va.gov/profile/notifications/
-LINK_URL_VA_SCHEDULING=https://www.va.gov/health-care/schedule-view-va-appointments/
 LINK_URL_IN_APP_RECRUITMENT=https://docs.google.com/forms/d/e/1FAIpQLSfRb0OtW34qKm8tGoQwwwDFs8IqwOMCLTde3DeM-ukKOEZBnA/viewform
 LINK_URL_VETERAN_USABILITY_PROJECT=https://veteranusability.us/
 LINK_URL_VETERANS_CRISIS_LINE=https://www.veteranscrisisline.net/
@@ -14,14 +12,12 @@ LINK_URL_DECISION_REVIEWS=https://www.va.gov/decision-reviews/
 LINK_URL_ABOUT_DISABILITY_RATINGS=https://www.va.gov/disability/about-disability-ratings/
 LINK_URL_COMPENSATION_CLAIM_EXAM=https://benefits.va.gov/compensation/claimexam.asp
 LINK_URL_YOUR_CLAIMS=https://www.va.gov/your-claims
-LINK_URL_CLAIM_APPEAL_STATUS=https://www.va.gov/claim-or-appeal-status/
 LINK_URL_UPGRADE_MY_HEALTHEVET_PREMIUM_ACCOUNT=https://www.myhealth.va.gov/web/myhealthevet/upgrading-your-my-healthevet-account-through-in-person-or-online-authentication
 LINK_URL_GO_TO_MY_HEALTHEVET=https://www.myhealth.va.gov/mhv-portal-web/user-login?redirect=/mhv-portal-web/web/myhealthevet/secure-messaging
 LINK_URL_GO_TO_PATIENT_PORTAL=https://patientportal.myhealth.va.gov/
 LINK_URL_GO_TO_VA_GOV=https://www.va.gov
 LINK_URL_ASK_VA_GOV=https://ask.va.gov/
 LINK_URL_ABOUT_PACT_ACT=https://www.va.gov/resources/the-pact-act-and-your-va-benefits/
-LINK_URL_APPLY_FOR_HEALTH_CARE=https://www.va.gov/health-care/apply/application/introduction
 APPLE_STORE_LINK=https://apps.apple.com/us/app/va-health-and-benefits/id1559609596
 GOOGLE_PLAY_LINK=https://play.google.com/store/apps/details?id=gov.va.mobileapp
 CARRIER_TRACKING_URL_USPS=https://tools.usps.com/go/TrackConfirmAction_input?strOrigTrackNum=

VAMobile/env/env.sh

@@ -52,7 +52,10 @@ fi
 echo "DEMO_PASSWORD=${DEMO_PASSWORD}" >> .env
 
 # set website URLs
+echo "LINK_URL_APPLY_FOR_HEALTH_CARE=https://${WEBSITE_PREFIX}va.gov/health-care/apply/application/introduction" >> .env
+echo "LINK_URL_CLAIM_APPEAL_STATUS=https://${WEBSITE_PREFIX}va.gov/claim-or-appeal-status" >> .env
 echo "LINK_URL_SCHEDULE_APPOINTMENTS=https://${WEBSITE_PREFIX}va.gov/health-care/schedule-view-va-appointments" >> .env
+echo "LINK_URL_VA_NOTIFICATIONS=https://${WEBSITE_PREFIX}va.gov/profile/notifications" >> .env
 
 # Get all vars that are the same across environments
 while read p; do

VAMobile/env/test.env.ts

@@ -12,7 +12,6 @@ export const WEBVIEW_URL_CHANGE_LEGAL_NAME =
 export const WEBVIEW_URL_CORONA_FAQ = 'https://www.va.gov/coronavirus-veteran-frequently-asked-questions'
 export const WEBVIEW_URL_FACILITY_LOCATOR = 'https://www.va.gov/find-locations/'
 export const LINK_URL_VA_NOTIFICATIONS = 'https://www.va.gov/profile/notifications/'
-export const LINK_URL_VA_SCHEDULING = 'https://www.va.gov/health-care/schedule-view-va-appointments/'
 export const LINK_URL_IN_APP_RECRUITMENT =
   'https://docs.google.com/forms/d/e/1FAIpQLSfRb0OtW34qKm8tGoQwwwDFs8IqwOMCLTde3DeM-ukKOEZBnA/viewform'
 export const LINK_URL_VETERAN_USABILITY_PROJECT = 'https://veteranusability.us/'

VAMobile/src/components/AnnouncementBanner.test.tsx

@@ -7,12 +7,14 @@ import { context, render } from 'testUtils'
 import AnnouncementBanner from './AnnouncementBanner'
 
 const mockExternalLinkSpy = jest.fn()
+const mockNavigationSpy = jest.fn()
 
 jest.mock('utils/hooks', () => {
   const original = jest.requireActual('utils/hooks')
   return {
     ...original,
     useExternalLink: () => mockExternalLinkSpy,
+    useRouteNavigation: () => mockNavigationSpy,
   }
 })
 
@@ -29,4 +31,24 @@ context('AnnouncementBanner', () => {
     fireEvent.press(screen.getByRole('link', { name: 'Learn about PACT Act on VA.gov' }))
     expect(mockExternalLinkSpy).toBeCalledWith('https://www.va.gov')
   })
+
+  it("opens WebView when 'useWebView' is true", () => {
+    const loadingMessage = 'Loading webview opened via announcement banner'
+
+    render(
+      <AnnouncementBanner
+        title={'Learn about PACT Act on VA.gov'}
+        link={'https://www.va.gov'}
+        useWebView={true}
+        webViewLoadingMessage={loadingMessage}
+      />,
+    )
+    fireEvent.press(screen.getByRole('link', { name: 'Learn about PACT Act on VA.gov' }))
+    expect(mockNavigationSpy).toHaveBeenCalledWith('Webview', {
+      url: 'https://www.va.gov',
+      displayTitle: 'va.gov',
+      loadingMessage,
+      useSSO: true,
+    })
+  })
 })

VAMobile/src/components/AnnouncementBanner.tsx

@@ -1,10 +1,12 @@
 import React, { FC } from 'react'
+import { useTranslation } from 'react-i18next'
 import { Platform, Pressable, PressableStateCallbackType, ViewStyle } from 'react-native'
 
 import { Icon } from '@department-of-veterans-affairs/mobile-component-library/src/components/Icon/Icon'
 
 import { Box, TextView } from 'components'
-import { useExternalLink, useTheme } from 'utils/hooks'
+import { NAMESPACE } from 'constants/namespaces'
+import { useExternalLink, useRouteNavigation, useTheme } from 'utils/hooks'
 
 import colors from '../styles/themes/VAColors'
 
@@ -15,11 +17,23 @@ interface AnnouncementBannerProps {
   link: string
   /** Optional accessibilityLabel */
   a11yLabel?: string
+  /** Determines whether to use the WebView for opening link. Defaults to launching link externally. */
+  useWebView?: boolean
+  /** Message to display when loading WebView. `useWebView` must be enabled to take effect. */
+  webViewLoadingMessage?: string
 }
 
-const AnnouncementBanner: FC<AnnouncementBannerProps> = ({ title, link, a11yLabel }: AnnouncementBannerProps) => {
+const AnnouncementBanner: FC<AnnouncementBannerProps> = ({
+  title,
+  link,
+  a11yLabel,
+  useWebView,
+  webViewLoadingMessage,
+}: AnnouncementBannerProps) => {
   const theme = useTheme()
   const launchExternalLink = useExternalLink()
+  const navigateTo = useRouteNavigation()
+  const { t } = useTranslation(NAMESPACE.COMMON)
 
   const pressableStyle = ({ pressed }: PressableStateCallbackType): ViewStyle => ({
     flexDirection: 'row',
@@ -42,7 +56,16 @@ const AnnouncementBanner: FC<AnnouncementBannerProps> = ({ title, link, a11yLabe
   return (
     <Pressable
       style={pressableStyle}
-      onPress={() => launchExternalLink(link)}
+      onPress={() =>
+        useWebView
+          ? navigateTo('Webview', {
+              url: link,
+              displayTitle: t('webview.vagov'),
+              loadingMessage: webViewLoadingMessage || t('webview.default.loading'),
+              useSSO: true,
+            })
+          : launchExternalLink(link)
+      }
       accessible={true}
       accessibilityRole={'link'}
       accessibilityLabel={a11yLabel}

VAMobile/src/screens/BenefitsScreen/ClaimsScreen/NeedHelpData/NeedHelpData.test.tsx

@@ -1,12 +1,26 @@
 import React from 'react'
-import { Alert, Linking } from 'react-native'
+import { Linking } from 'react-native'
 
 import { fireEvent, screen } from '@testing-library/react-native'
+import { t } from 'i18next'
 
 import { context, render } from 'testUtils'
+import getEnv from 'utils/env'
 
 import NeedHelpData from './NeedHelpData'
 
+const { LINK_URL_CLAIM_APPEAL_STATUS } = getEnv()
+
+const mockNavigationSpy = jest.fn()
+
+jest.mock('utils/hooks', () => {
+  const original = jest.requireActual('utils/hooks')
+  return {
+    ...original,
+    useRouteNavigation: () => mockNavigationSpy,
+  }
+})
+
 context('NeedHelpData', () => {
   const initializeTestInstance = (isAppeal?: boolean) => {
     render(<NeedHelpData isAppeal={isAppeal} />)
@@ -38,7 +52,12 @@ context('NeedHelpData', () => {
     it('should launch external link on click of the url', () => {
       initializeTestInstance(true)
       fireEvent.press(screen.getByRole('link', { name: 'Go to VA.gov' }))
-      expect(Alert.alert).toHaveBeenCalled()
+      expect(mockNavigationSpy).toHaveBeenCalledWith('Webview', {
+        url: LINK_URL_CLAIM_APPEAL_STATUS,
+        displayTitle: 'va.gov',
+        loadingMessage: t('webview.claims.loading'),
+        useSSO: true,
+      })
     })
   })
 })

VAMobile/src/screens/BenefitsScreen/ClaimsScreen/NeedHelpData/NeedHelpData.tsx

@@ -6,7 +6,7 @@ import { NAMESPACE } from 'constants/namespaces'
 import { a11yLabelVA } from 'utils/a11yLabel'
 import getEnv from 'utils/env'
 import { displayedTextPhoneNumber } from 'utils/formattingUtils'
-import { useTheme } from 'utils/hooks'
+import { useRouteNavigation, useTheme } from 'utils/hooks'
 
 const { LINK_URL_CLAIM_APPEAL_STATUS } = getEnv()
 
@@ -17,9 +17,10 @@ type NeedHelpDataProps = {
 function NeedHelpData({ isAppeal }: NeedHelpDataProps) {
   const theme = useTheme()
   const { t } = useTranslation(NAMESPACE.COMMON)
+  const navigateTo = useRouteNavigation()
 
   function renderAppealData() {
-    if (!isAppeal) {
+    if (isAppeal) {
       return <></>
     }
 
@@ -30,8 +31,15 @@ function NeedHelpData({ isAppeal }: NeedHelpDataProps) {
         </TextView>
         <Box mt={theme.dimensions.standardMarginBetween}>
           <LinkWithAnalytics
-            type="url"
-            url={LINK_URL_CLAIM_APPEAL_STATUS}
+            type="custom"
+            onPress={() => {
+              navigateTo('Webview', {
+                url: LINK_URL_CLAIM_APPEAL_STATUS,
+                displayTitle: t('webview.vagov'),
+                loadingMessage: t('webview.claims.loading'),
+                useSSO: true,
+              })
+            }}
             text={t('goToVAGov')}
             a11yLabel={a11yLabelVA(t('goToVAGov'))}
             a11yHint={t('appealDetails.goToVAGovA11yHint')}

VAMobile/src/screens/HealthScreen/Appointments/AppointmentTypeComponents/SharedComponents/AppointmentCancelReschedule.tsx

@@ -1,6 +1,8 @@
 import React from 'react'
 import { useTranslation } from 'react-i18next'
 
+import { ParamListBase } from '@react-navigation/native'
+
 import { Button, ButtonVariants } from '@department-of-veterans-affairs/mobile-component-library'
 import { UseMutateFunction } from '@tanstack/react-query'
 import { TFunction } from 'i18next'
@@ -23,9 +25,16 @@ import {
 } from 'utils/appointments'
 import { showSnackBar } from 'utils/common'
 import getEnv from 'utils/env'
-import { useAppDispatch, useDestructiveActionSheet, useDestructiveActionSheetProps, useTheme } from 'utils/hooks'
+import {
+  RouteNavigationFunction,
+  useAppDispatch,
+  useDestructiveActionSheet,
+  useDestructiveActionSheetProps,
+  useRouteNavigation,
+  useTheme,
+} from 'utils/hooks'
 
-const { LINK_URL_VA_SCHEDULING, WEBVIEW_URL_FACILITY_LOCATOR } = getEnv()
+const { LINK_URL_SCHEDULE_APPOINTMENTS, WEBVIEW_URL_FACILITY_LOCATOR } = getEnv()
 
 type AppointmentCancelRescheduleProps = {
   appointmentID: string
@@ -160,6 +169,7 @@ const phoneFacilitySchedulingLink = (
   location: AppointmentLocation | undefined,
   t: TFunction,
   theme: VATheme,
+  navigateTo: RouteNavigationFunction<ParamListBase>,
 ) => {
   return (
     <Box>
@@ -181,8 +191,15 @@ const phoneFacilitySchedulingLink = (
       ) : undefined}
       {!useFacilityLocatorFallback && (
         <LinkWithAnalytics
-          type="url"
-          url={LINK_URL_VA_SCHEDULING}
+          type="custom"
+          onPress={() => {
+            navigateTo('Webview', {
+              url: LINK_URL_SCHEDULE_APPOINTMENTS,
+              displayTitle: t('webview.vagov'),
+              loadingMessage: t('webview.appointments.loading'),
+              useSSO: true,
+            })
+          }}
           text={t('appointments.vaSchedule')}
           a11yLabel={a11yLabelVA(t('appointments.vaSchedule'))}
           testID="vaLinkApptsCancelTestID"
@@ -300,6 +317,7 @@ function AppointmentCancelReschedule({
   const { t } = useTranslation(NAMESPACE.COMMON)
   const dispatch = useAppDispatch()
   const confirmAlert = useDestructiveActionSheet()
+  const navigateTo = useRouteNavigation()
   const { location, cancelId } = attributes || ({} as AppointmentAttributes)
 
   const header = getHeader(subType, t)
@@ -347,11 +365,18 @@ function AppointmentCancelReschedule({
         {body}
       </TextView>
       {!isClaimExam ? (
-        phoneFacilitySchedulingLink(useFacilityFallback, isAtlastGFEHomeVideoAppt, location, t, theme)
+        phoneFacilitySchedulingLink(useFacilityFallback, isAtlastGFEHomeVideoAppt, location, t, theme, navigateTo)
       ) : subType === AppointmentDetailsSubTypeConstants.CanceledAndPending ? (
         <LinkWithAnalytics
-          type="url"
-          url={LINK_URL_VA_SCHEDULING}
+          type="custom"
+          onPress={() => {
+            navigateTo('Webview', {
+              url: LINK_URL_SCHEDULE_APPOINTMENTS,
+              displayTitle: t('webview.vagov'),
+              loadingMessage: t('webview.appointments.loading'),
+              useSSO: true,
+            })
+          }}
           text={t('appointments.vaSchedule')}
           a11yLabel={a11yLabelVA(t('appointments.vaSchedule'))}
         />

VAMobile/src/screens/HealthScreen/HealthScreen.tsx

@@ -110,7 +110,7 @@
   const showAlert = featureInDowntime || activityError
   const alertMessage = featureInDowntime ? t('health.activity.downtime') : t('health.activity.error')
 
   const enrolledInVAHealthCare =
     userAuthorizedServices?.appointments ||
     userAuthorizedServices?.secureMessaging ||
     userAuthorizedServices?.prescriptions ||
@@ -172,12 +172,14 @@
           </Pressable>
         </Box>
       )}
-      {!enrolledInVAHealthCare && (
+      {true && (
         <Box mb={theme.dimensions.contentMarginBottom}>
           <AnnouncementBanner
             title={t('applyForHealthCare')}
             link={LINK_URL_APPLY_FOR_HEALTH_CARE}
             a11yLabel={a11yLabelVA(t('applyForHealthCare'))}
+            useWebView={true}
+            webViewLoadingMessage={t('webview.healthCareApplication.loading')}
           />
         </Box>
       )}

VAMobile/src/screens/HomeScreen/ProfileScreen/SettingsScreen/NotificationsSettingsScreen/NotificationsSettingsScreen.tsx

@@ -42,7 +42,7 @@ import { AuthState, setNotificationsPreferenceScreen, setRequestNotifications }
 import { a11yLabelVA } from 'utils/a11yLabel'
 import { logAnalyticsEvent } from 'utils/analytics'
 import getEnv from 'utils/env'
-import { useAppDispatch, useOnResumeForeground, useTheme } from 'utils/hooks'
+import { useAppDispatch, useOnResumeForeground, useRouteNavigation, useTheme } from 'utils/hooks'
 import { screenContentAllowed } from 'utils/waygateConfig'
 
 const NOTIFICATION_COMPLETED_KEY = '@store_notification_preference_complete'
@@ -55,6 +55,7 @@ type NotificationsSettingsScreenProps = StackScreenProps<HomeStackParamList, 'No
 function NotificationsSettingsScreen({ navigation }: NotificationsSettingsScreenProps) {
   const { t } = useTranslation(NAMESPACE.COMMON)
   const theme = useTheme()
+  const navigateTo = useRouteNavigation()
   const dispatch = useAppDispatch()
   const queryClient = useQueryClient()
   const { gutter, contentMarginBottom, condensedMarginBetween } = theme.dimensions
@@ -231,8 +232,15 @@ function NotificationsSettingsScreen({ navigation }: NotificationsSettingsScreen
           </TextView>
           <Box mx={gutter}>
             <LinkWithAnalytics
-              type="url"
-              url={LINK_URL_VA_NOTIFICATIONS}
+              type="custom"
+              onPress={() => {
+                navigateTo('Webview', {
+                  url: LINK_URL_VA_NOTIFICATIONS,
+                  displayTitle: t('webview.vagov'),
+                  loadingMessage: t('webview.notifications.loading'),
+                  useSSO: true,
+                })
+              }}
               text={t('notifications.settings.link.text')}
               a11yLabel={a11yLabelVA(t('notifications.settings.link.text'))}
               testID="noficationSettingsLinkID"

VAMobile/src/translations/en/common.json

@@ -1470,7 +1470,14 @@
   "veteranStatus.uniformedServices.A11yLabel": "You can use this Veteran status to prove you served in the United States Uniformed Services. This status doesn't entitle you to any V-A benefits.",
   "veteranStatus.uploadPhoto": "Upload photo",
   "video": "Video",
+  "waygateEditScreen.title": "Waygate Edit Screen",
+  "waygateManagement.title": "Waygate Management",
   "webview.appointments.loading": "Loading appointments page...",
+  "webview.claims.loading": "Loading claims and appeal page...",
+  "webview.default.loading": "Loading page...",
+  "webview.healthCareApplication.loading": "Loading health care application...",
+  "webview.notifications.loading": "Loading email and text notification settings...",
+  "webview.changeLegalName.loading": "Loading how to change your legal name...",
   "webview.vagov": "va.gov",
   "webview.valocation.loading": "Loading VA location finder...",
   "whatsNew.dismissMessage": "Dismiss this message",