Merge branch 'develop' into feature/Binny-10233-CreatePIIFilter

.github/ISSUE_TEMPLATE/release_ticket.md

@@ -3,7 +3,7 @@ name: Release Review Template
 about: Template for requesting a production release for VA mobile app
 title: "{{ env.releaseDate }} Release Sign-Off: {{ env.versionNumber }}"
 labels: release
-assignees: timwright12, chrisj-usds, dumathane, rachelhanster, SarahHuber-AdHoc, DonMcCaugheyUSDS, TKDickson
+assignees: timwright12, chrisj-usds, dumathane, SarahHuber-AdHoc, DonMcCaugheyUSDS, TKDickson
 
 ---
 

VAMobile/e2e/tests/SignIn.e2e.ts

@@ -6,12 +6,10 @@ import { CommonE2eIdConstants } from './utils'
 export const SignE2eIdConstants = {
   LOGIN_PAGE_ID: 'Login-page',
   LOA_P1_TEXT:
-    'Before we give you access to your VA claim and health care information, we need to make sure you’re you. This helps us protect you from fraud and identity theft.',
-  LOA_P2_TEXT: 'If you haven’t yet verified your identity, we’ll help you complete the process when you sign in.',
-  LOA_GATE_EXPAND_MSG_ID: 'loaGateExpandMsgID',
-  LOA_GATE_READ_MORE_P1:
-    'We’ll verify your identity through a secure process from ID.me or Login.gov. This trusted partner provides the strongest identity verification system available.',
-  LOA_GATE_READ_MORE_P2: 'To complete the process on your smartphone, you’ll need these items:',
+    'You’ll need to sign in with an identity-verified account through one of our account providers. Identity verification helps us protect all Veterans’ information and prevent scammers from stealing your benefits.',
+  LOA_P2_TEXT:
+    'Don’t yet have a verified account? Continue to the sign-in page. Follow the instructions to create a Login.gov or ID.me account. Then come back here and sign in. We’ll help you verify your identity for your account.',
+  LOA_P3_TEXT: 'Not sure if your account is verified? Sign in now. We’ll tell you if you need to verify.',
   CONTINUE_SIGN_IN_BTN_ID: 'Continue to sign in',
 }
 
@@ -34,7 +32,7 @@ describe('Sign In', () => {
     await expect(element(by.id(CommonE2eIdConstants.VETERAN_CRISIS_LINE_BTN_ID))).toExist()
     await expect(element(by.text(SignE2eIdConstants.LOA_P1_TEXT))).toExist()
     await expect(element(by.text(SignE2eIdConstants.LOA_P2_TEXT))).toExist()
-    await expect(element(by.id(SignE2eIdConstants.LOA_GATE_EXPAND_MSG_ID))).toExist()
+    await expect(element(by.text(SignE2eIdConstants.LOA_P3_TEXT))).toExist()
     await expect(element(by.id(SignE2eIdConstants.CONTINUE_SIGN_IN_BTN_ID))).toExist()
   })
 
@@ -43,12 +41,6 @@ describe('Sign In', () => {
     await element(by.id(CommonE2eIdConstants.SIGN_IN_BTN_ID)).tap()
     await element(by.id(CommonE2eIdConstants.VETERAN_CRISIS_LINE_BTN_ID)).tap()
     await element(by.id(CommonE2eIdConstants.VETERAN_CRISIS_LINE_BACK_ID)).tap()
-    await element(by.id(SignE2eIdConstants.LOA_GATE_EXPAND_MSG_ID)).tap()
-    await expect(element(by.text(SignE2eIdConstants.LOA_GATE_READ_MORE_P1))).toExist()
-    await expect(element(by.text(SignE2eIdConstants.LOA_GATE_READ_MORE_P2))).toExist()
-    await element(by.id(SignE2eIdConstants.LOA_GATE_EXPAND_MSG_ID)).tap()
-    await expect(element(by.text(SignE2eIdConstants.LOA_GATE_READ_MORE_P1))).not.toExist()
-    await expect(element(by.text(SignE2eIdConstants.LOA_GATE_READ_MORE_P2))).not.toExist()
     await element(by.id(SignE2eIdConstants.CONTINUE_SIGN_IN_BTN_ID)).tap()
     await setTimeout(7000)
     await device.takeScreenshot('VALoginWebview')

VAMobile/src/screens/auth/LoaGate/LoaGate.test.tsx

@@ -12,18 +12,20 @@ context('LoaGate', () => {
   })
 
   it('initializes correctly', () => {
-    expect(screen.getByRole('header', { name: 'Sign in' })).toBeTruthy()
+    expect(screen.getByRole('header', { name: 'Sign in with a verified account' })).toBeTruthy()
     expect(
       screen.getByText(
-        'Before we give you access to your VA claim and health care information, we need to make sure you’re you. This helps us protect you from fraud and identity theft.',
+        'You’ll need to sign in with an identity-verified account through one of our account providers. Identity verification helps us protect all Veterans’ information and prevent scammers from stealing your benefits.',
       ),
     ).toBeTruthy()
     expect(
       screen.getByText(
-        'If you haven’t yet verified your identity, we’ll help you complete the process when you sign in.',
+        'Don’t yet have a verified account? Continue to the sign-in page. Follow the instructions to create a Login.gov or ID.me account. Then come back here and sign in. We’ll help you verify your identity for your account.',
       ),
     ).toBeTruthy()
-    expect(screen.getByRole('tab', { name: "Read more if you haven't yet verified" })).toBeTruthy()
+    expect(
+      screen.getByText('Not sure if your account is verified? Sign in now. We’ll tell you if you need to verify.'),
+    ).toBeTruthy()
     expect(screen.getByRole('button', { name: 'Continue to sign in' })).toBeTruthy()
   })
 })

VAMobile/src/screens/auth/LoaGate/LoaGate.tsx

@@ -5,7 +5,7 @@ import { useNavigation } from '@react-navigation/native'
 
 import { Button } from '@department-of-veterans-affairs/mobile-component-library'
 
-import { Box, CollapsibleView, FullScreenSubtask, TextView, TextViewProps, VABulletList } from 'components'
+import { Box, FullScreenSubtask, TextView, TextViewProps } from 'components'
 import { NAMESPACE } from 'constants/namespaces'
 import { useTheme } from 'utils/hooks'
 import { useStartAuth } from 'utils/hooks/auth'
@@ -18,11 +18,6 @@ function LoaGate({}: LoaGateProps) {
   const startAuth = useStartAuth()
   const navigation = useNavigation()
 
-  const bulletOne = {
-    text: t('loaGate.readMore.bulletOne'),
-    boldedText: ' ' + t('loaGate.readMore.or'),
-  }
-
   const bodyTextProps: TextViewProps = {
     variant: 'MobileBody',
   }
@@ -34,7 +29,7 @@ function LoaGate({}: LoaGateProps) {
   return (
     <FullScreenSubtask
       leftButtonText={t('close')}
-      title={t('signin')}
+      title={t('loaGate.signInWithVerifiedAccount')}
       onLeftButtonPress={navigation.goBack}
       showCrisisLineButton={true}>
       <Box
@@ -45,29 +40,13 @@ function LoaGate({}: LoaGateProps) {
           {t('loaGate.p1')}
         </TextView>
         <TextView mb={theme.dimensions.standardMarginBetween} {...bodyTextProps}>
+          <TextView {...titleTextProps}>{t('loaGate.p2.noVerifiedAccount')}</TextView>
           {t('loaGate.p2')}
         </TextView>
-        <CollapsibleView text={t('loaGate.expandMsg')} showInTextArea={false} testID="loaGateExpandMsgID">
-          <TextView my={theme.dimensions.standardMarginBetween} {...bodyTextProps}>
-            {t('loaGate.readMore.p1')}
-          </TextView>
-          <TextView {...titleTextProps}>{t('loaGate.readMore.p2')}</TextView>
-          <Box mt={theme.dimensions.standardMarginBetween}>
-            <TextView {...bodyTextProps}>
-              {t('loaGate.readMore.itemOne')}
-              <TextView {...titleTextProps}>{t('and')}</TextView>
-            </TextView>
-          </Box>
-          <Box mt={theme.dimensions.standardMarginBetween}>
-            <TextView {...bodyTextProps}>{t('loaGate.readMore.itemTwo.proofOfID')}</TextView>
-          </Box>
-          <Box mt={theme.dimensions.standardMarginBetween}>
-            <TextView {...bodyTextProps}>{t('loaGate.readMore.itemTwo.OfferProof')}</TextView>
-          </Box>
-          <Box mt={theme.dimensions.standardMarginBetween}>
-            <VABulletList listOfText={[bulletOne, { text: t('loaGate.readMore.bulletTwo') }]} />
-          </Box>
-        </CollapsibleView>
+        <TextView {...bodyTextProps}>
+          <TextView {...titleTextProps}>{t('loaGate.p3.notSureOfAccount')}</TextView>
+          {t('loaGate.p3')}
+        </TextView>
         <Box mt={theme.dimensions.textAndButtonLargeMargin}>
           <Button onPress={startAuth} label={t('continueToSignin')} testID={t('continueToSignin')} />
         </Box>

VAMobile/src/translations/en/common.json

@@ -914,18 +914,12 @@
   "loading": "Loading",
   "loading.vaWebsite": "Loading VA.gov webpage...",
   "loadingActivity": "Loading activity",
-  "loaGate.expandMsg": "Read more if you haven't yet verified",
-  "loaGate.p1": "Before we give you access to your VA claim and health care information, we need to make sure you’re you. This helps us protect you from fraud and identity theft.",
-  "loaGate.p2": "If you haven’t yet verified your identity, we’ll help you complete the process when you sign in.",
-  "loaGate.readMore.bulletOne": "Upload a picture of your driver’s license or passport,",
-  "loaGate.readMore.bulletOne.a11y": "Upload a picture of your driver’s license or passport, or",
-  "loaGate.readMore.bulletTwo": "Answer questions based on private and public data (like your credit report)",
-  "loaGate.readMore.itemOne": "1. Your Social Security number, ",
-  "loaGate.readMore.itemTwo.OfferProof": "You can offer proof in 1 of 2 ways:",
-  "loaGate.readMore.itemTwo.proofOfID": "2. Proof of your identity",
-  "loaGate.readMore.or": "or",
-  "loaGate.readMore.p1": "We’ll verify your identity through a secure process from ID.me or Login.gov. This trusted partner provides the strongest identity verification system available.",
-  "loaGate.readMore.p2": "To complete the process on your smartphone, you’ll need these items:",
+  "loaGate.signInWithVerifiedAccount": "Sign in with a verified account",
+  "loaGate.p1": "You’ll need to sign in with an identity-verified account through one of our account providers. Identity verification helps us protect all Veterans’ information and prevent scammers from stealing your benefits.",
+  "loaGate.p2.noVerifiedAccount": "Don’t yet have a verified account? ",
+  "loaGate.p2": "Continue to the sign-in page. Follow the instructions to create a Login.gov or ID.me account. Then come back here and sign in. We’ll help you verify your identity for your account.",
+  "loaGate.p3.notSureOfAccount": "Not sure if your account is verified? ",
+  "loaGate.p3": "Sign in now. We’ll tell you if you need to verify.",
   "login": "Login",
   "logout.confirm.text": "Sign out?",
   "logout.title": "Sign out",