feature/9168-RemoveClaimPhaseExpansionFlag (#9613)

Co-authored-by: Rachael Bontrager <[email protected]>
department-of-veterans-affairs · Sep 27, 2024 · dcf5a0a · dcf5a0a
1 parent 9fce707
commit dcf5a0a
Show file tree

Hide file tree

Showing 18 changed files with 62 additions and 759 deletions.
diff --git a/VAMobile/e2e/tests/utils.ts b/VAMobile/e2e/tests/utils.ts
@@ -55,7 +55,6 @@ export const CommonE2eIdConstants = {
   START_NEW_MESSAGE_BUTTON_ID: 'startNewMessageButtonTestID',
   PRESCRIPTION_REFILL_BUTTON_TEXT: 'Start refill request',
   HOME_ACTIVITY_HEADER_TEXT: 'Activity',
-  CLAIM_PHASE_TOGGLE_TEXT: 'claimPhaseExpansion',
   IN_APP_REVIEW_TOGGLE_TEXT: 'inAppReview',
   CALL_VA_PHONE_NUMBER_ID: 'CallVATestID',
   CALL_VA_TTY_PHONE_NUMBER_ID: 'CallTTYTestID',

diff --git a/...screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimDetails/ClaimDetails.test.tsx b/...screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimDetails/ClaimDetails.test.tsx
diff --git a/.../src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimDetails/ClaimDetails.tsx b/.../src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimDetails/ClaimDetails.tsx
diff --git a/...le/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimDetailsScreen.test.tsx b/...le/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimDetailsScreen.test.tsx
@@ -30,7 +30,6 @@ context('ClaimDetailsScreen', () => {
     featureFlag: boolean = false,
     claim?: Partial<ClaimData>,
   ): void => {
-    when(featureEnabled).calledWith('claimPhaseExpansion').mockReturnValue(featureFlag)
     when(featureEnabled).calledWith('submitEvidenceExpansion').mockReturnValue(featureFlag)
     let queriesData: QueriesData | undefined
     if (claim) {
@@ -93,19 +92,7 @@ context('ClaimDetailsScreen', () => {
       renderWithData(ClaimTypeConstants.ACTIVE, false, {
         ...claimData,
       })
-      await waitFor(() =>
-        expect(screen.getByTestId('Step 1 of 5. completed. Claim received June 6, 2019')).toBeTruthy(),
-      )
-    })
-
-    it('should display the ClaimDetails component', async () => {
-      renderWithData(ClaimTypeConstants.ACTIVE, false, {
-        ...claimData,
-      })
-      await waitFor(() => fireEvent.press(screen.getByText('Details')))
-      await waitFor(() => fireEvent.press(screen.getByText('Details')))
-
-      await waitFor(() => expect(screen.getByText('Claim type')).toBeTruthy())
+      await waitFor(() => expect(screen.getByTestId('Step 1 of 8. Claim received. Complete.')).toBeTruthy())
     })
 
     it('should display the Files component', async () => {

diff --git a/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimDetailsScreen.tsx b/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimDetailsScreen.tsx
@@ -42,7 +42,6 @@ import { featureEnabled } from 'utils/remoteConfig'
 import { screenContentAllowed } from 'utils/waygateConfig'
 
 import NeedHelpData from '../NeedHelpData/NeedHelpData'
-import ClaimDetails from './ClaimDetails/ClaimDetails'
 import ClaimFiles from './ClaimFiles/ClaimFiles'
 import ClaimStatus from './ClaimStatus/ClaimStatus'
 
@@ -57,10 +56,7 @@ function ClaimDetailsScreen({ navigation, route }: ClaimDetailsScreenProps) {
   const { t } = useTranslation(NAMESPACE.COMMON)
   const scrollViewRef = useRef<ScrollView>(null)
   const navigateTo = useRouteNavigation()
-  const controlLabels = [
-    t('claimDetails.status'),
-    featureEnabled('claimPhaseExpansion') ? t('files') : t('claimDetails.details'),
-  ]
+  const controlLabels = [t('claimDetails.status'), t('files')]
   const [selectedTab, setSelectedTab] = useState(0)
 
   const { claimID, claimType } = route.params
@@ -90,7 +86,6 @@ function ClaimDetailsScreen({ navigation, route }: ClaimDetailsScreenProps) {
     }, [attributes]),
   ) //force a rerender due to react query updating data
 
-  const claimPhaseExpansionFlag = featureEnabled('claimPhaseExpansion')
   const submitEvidenceExpansionFlag = featureEnabled('submitEvidenceExpansion')
 
   useBeforeNavBackListener(navigation, () => {
@@ -123,15 +118,13 @@ function ClaimDetailsScreen({ navigation, route }: ClaimDetailsScreenProps) {
 
   useEffect(() => {
     if (claimType === ClaimTypeConstants.ACTIVE && claim) {
-      if (claimPhaseExpansionFlag) {
-        if (count > 0 && !claim.attributes.waiverSubmitted) {
-          logAnalyticsEvent(Events.vama_claim_file_request(claimID))
-        } else if (submitEvidenceExpansionFlag && claim.attributes.open && count >= 0) {
-          logAnalyticsEvent(Events.vama_claim_submit_ev(claimID))
-        }
+      if (count > 0 && !claim.attributes.waiverSubmitted) {
+        logAnalyticsEvent(Events.vama_claim_file_request(claimID))
+      } else if (submitEvidenceExpansionFlag && claim.attributes.open && count >= 0) {
+        logAnalyticsEvent(Events.vama_claim_submit_ev(claimID))
       }
     }
-  }, [claimType, claimPhaseExpansionFlag, submitEvidenceExpansionFlag, count, claim, claimID])
+  }, [claimType, submitEvidenceExpansionFlag, count, claim, claimID])
 
   // Track how long user maintains focus on this screen
   useFocusEffect(
@@ -229,37 +222,35 @@ function ClaimDetailsScreen({ navigation, route }: ClaimDetailsScreenProps) {
         </Box>
       )
     }
-    if (claimPhaseExpansionFlag) {
-      if (count > 0 && !claim?.attributes?.waiverSubmitted) {
-        const buttonProps: ButtonProps = {
-          buttonType: ButtonVariants.Primary,
-          label: t('claimPhase.fileRequests.button.label'),
-          a11yHint: t('claimPhase.fileRequests.button.a11yHint'),
-          onPress: fileRequestsPress,
-        }
-        const alertProps: AlertProps = {
-          variant: 'warning',
-          header: t('claimPhase.youHaveFileRequest', { count }),
-          primaryButton: buttonProps,
-          expandable: false,
-        }
-        return (
-          <Box mt={theme.dimensions.standardMarginBetween}>
-            <AlertWithHaptics {...alertProps} />
-          </Box>
-        )
-      } else if (submitEvidenceExpansionFlag && attributes?.open) {
-        const buttonProps: ButtonProps = {
-          buttonType: ButtonVariants.Primary,
-          label: t('claimDetails.submitEvidence'),
-          onPress: submitEvidencePress,
-        }
-        return (
-          <Box mt={theme.dimensions.standardMarginBetween} mx={theme.dimensions.gutter}>
-            <Button {...buttonProps} />
-          </Box>
-        )
+    if (count > 0 && !claim?.attributes?.waiverSubmitted) {
+      const buttonProps: ButtonProps = {
+        buttonType: ButtonVariants.Primary,
+        label: t('claimPhase.fileRequests.button.label'),
+        a11yHint: t('claimPhase.fileRequests.button.a11yHint'),
+        onPress: fileRequestsPress,
+      }
+      const alertProps: AlertProps = {
+        variant: 'warning',
+        header: t('claimPhase.youHaveFileRequest', { count }),
+        primaryButton: buttonProps,
+        expandable: false,
       }
+      return (
+        <Box mt={theme.dimensions.standardMarginBetween}>
+          <AlertWithHaptics {...alertProps} />
+        </Box>
+      )
+    } else if (submitEvidenceExpansionFlag && attributes?.open) {
+      const buttonProps: ButtonProps = {
+        buttonType: ButtonVariants.Primary,
+        label: t('claimDetails.submitEvidence'),
+        onPress: submitEvidencePress,
+      }
+      return (
+        <Box mt={theme.dimensions.standardMarginBetween} mx={theme.dimensions.gutter}>
+          <Button {...buttonProps} />
+        </Box>
+      )
     }
     return <></>
   }
@@ -347,8 +338,7 @@ function ClaimDetailsScreen({ navigation, route }: ClaimDetailsScreenProps) {
                 scrollViewRef={scrollViewRef}
               />
             )}
-            {claim && selectedTab === 1 && !featureEnabled('claimPhaseExpansion') && <ClaimDetails claim={claim} />}
-            {claim && selectedTab === 1 && featureEnabled('claimPhaseExpansion') && <ClaimFiles claim={claim} />}
+            {claim && selectedTab === 1 && <ClaimFiles claim={claim} />}
           </Box>
           {renderActiveClosedClaimStatusHelpLink()}
           <Box mt={theme.dimensions.condensedMarginBetween}>

diff --git a/...c/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimStatus.test.tsx b/...c/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimStatus.test.tsx
@@ -4,8 +4,7 @@ import { ScrollView } from 'react-native'
 import { screen } from '@testing-library/react-native'
 
 import { ClaimType } from 'constants/claims'
-import { context, mockNavProps, render, when } from 'testUtils'
-import { featureEnabled } from 'utils/remoteConfig'
+import { context, mockNavProps, render } from 'testUtils'
 
 import { claim } from '../../claimData'
 import ClaimStatus from './ClaimStatus'
@@ -19,9 +18,6 @@ jest.mock('utils/hooks', () => {
   }
 })
 
-jest.mock('utils/remoteConfig')
-when(featureEnabled).calledWith('claimPhaseExpansion').mockReturnValue(true)
-
 context('ClaimStatus', () => {
   const defaultMaxEstDate = '2019-12-11'
   const initializeTestInstance = (maxEstDate: string, claimType: ClaimType): void => {