From 93e4e47e1e04aaee5385f49e37f5db40fdfd7966 Mon Sep 17 00:00:00 2001
From: Christian Lippa <christian.lippa@ontario.ca>
Date: Thu, 30 Jan 2025 15:39:24 -0500
Subject: [PATCH 1/5] feat: enter pin for biometrics change ui update, and fix
 for white space

Signed-off-by: Christian Lippa <christian.lippa@ontario.ca>
---
 .../App/components/views/KeyboardView.tsx     |  3 +-
 .../legacy/core/App/localization/en/index.ts  |  4 ++
 packages/legacy/core/App/screens/PINEnter.tsx | 67 +++++++++++++------
 .../legacy/core/App/screens/UseBiometry.tsx   | 19 ++++--
 4 files changed, 67 insertions(+), 26 deletions(-)

diff --git a/packages/legacy/core/App/components/views/KeyboardView.tsx b/packages/legacy/core/App/components/views/KeyboardView.tsx
index 9551f9bece..d19c8a8187 100644
--- a/packages/legacy/core/App/components/views/KeyboardView.tsx
+++ b/packages/legacy/core/App/components/views/KeyboardView.tsx
@@ -1,10 +1,11 @@
 import React from 'react'
 import { KeyboardAvoidingView, Platform, ScrollView } from 'react-native'
 import { SafeAreaView } from 'react-native-safe-area-context'
+import { ColorPallet } from '../../theme'
 
 const KeyboardView: React.FC<{ children: React.ReactNode }> = ({ children }) => {
   return (
-    <SafeAreaView style={{ flex: 1 }} edges={['bottom', 'left', 'right']}>
+    <SafeAreaView style={{ flex: 1, backgroundColor: ColorPallet.brand.primaryBackground }} edges={['bottom', 'left', 'right']}>
       <KeyboardAvoidingView
         style={{ flex: 1 }}
         // below property is the distance to account for between the top of the screen and the top of the view. It is at most 100 with max zoom + font settings
diff --git a/packages/legacy/core/App/localization/en/index.ts b/packages/legacy/core/App/localization/en/index.ts
index 2ca7d63cbc..efa8a73c97 100644
--- a/packages/legacy/core/App/localization/en/index.ts
+++ b/packages/legacy/core/App/localization/en/index.ts
@@ -274,6 +274,10 @@ const translation = {
     "AppSettingChangedEnterPIN": "Please confirm your change by entering your wallet PIN.",
     "AppSettingSave": "Save",
     "AppSettingCancel": "Cancel",
+    "ChangeBiometricsHeader": "Change in biometrics",
+    "ChangeBiometricsSubtext": "Please enter your PIN to confirm a change in biometrics",
+    "ChangeBiometricsInputLabel": "Enter your wallet PIN",
+    "ChangeBiometricsInputLabelParenthesis": "(Required)",
   },
   "AttemptLockout": {
     "Title": "Your wallet is temporarily locked",
diff --git a/packages/legacy/core/App/screens/PINEnter.tsx b/packages/legacy/core/App/screens/PINEnter.tsx
index c714e34edc..a3ca087271 100644
--- a/packages/legacy/core/App/screens/PINEnter.tsx
+++ b/packages/legacy/core/App/screens/PINEnter.tsx
@@ -30,6 +30,7 @@ interface PINEnterProps {
 export enum PINEntryUsage {
   PINCheck,
   WalletUnlock,
+  ChangeBiometrics,
 }
 
 const PINEnter: React.FC<PINEnterProps> = ({ setAuthenticated, usage = PINEntryUsage.WalletUnlock, onCancelAuth }) => {
@@ -54,19 +55,19 @@ const PINEnter: React.FC<PINEnterProps> = ({ setAuthenticated, usage = PINEntryU
   const [inlineMessageField, setInlineMessageField] = useState<InlineMessageProps>()
   const [inlineMessages] = useServices([TOKENS.INLINE_ERRORS])
   const [alertModalMessage, setAlertModalMessage] = useState('')
+  // Temporary until all use cases are built with the new design
+  const isNewDesign = usage === PINEntryUsage.ChangeBiometrics
 
   const style = StyleSheet.create({
     screenContainer: {
       height: '100%',
       backgroundColor: ColorPallet.brand.primaryBackground,
       padding: 20,
-      justifyContent: 'space-between',
+      justifyContent: isNewDesign ? 'flex-start' : 'space-between',
     },
-
     // below used as helpful labels for views, no properties needed atp
     contentContainer: {},
     controlsContainer: {},
-
     buttonContainer: {
       width: '100%',
     },
@@ -78,7 +79,10 @@ const PINEnter: React.FC<PINEnterProps> = ({ setAuthenticated, usage = PINEntryU
       ...TextTheme.normal,
       alignSelf: 'auto',
       textAlign: 'left',
-      marginBottom: 16,
+      marginBottom: isNewDesign ? 40 : 16,
+    },
+    parenthesisText: {
+      ...TextTheme.caption,
     },
     modalText: {
       ...TextTheme.popupModalText,
@@ -92,7 +96,8 @@ const PINEnter: React.FC<PINEnterProps> = ({ setAuthenticated, usage = PINEntryU
     },
     title: {
       ...TextTheme.headingTwo,
-      marginBottom: 20,
+      marginTop: isNewDesign ? 20 : 0,
+      marginBottom: isNewDesign ? 40 : 20,
     },
     subTitle: {
       ...TextTheme.labelSubtitle,
@@ -100,10 +105,22 @@ const PINEnter: React.FC<PINEnterProps> = ({ setAuthenticated, usage = PINEntryU
     },
     subText: {
       ...TextTheme.bold,
-      marginBottom: 4,
+      marginBottom: isNewDesign ? 20 : 4,
     },
   })
 
+  const inputLabelText = {
+    [PINEntryUsage.ChangeBiometrics]: t('PINEnter.ChangeBiometricsInputLabel'),
+    [PINEntryUsage.PINCheck]: t('PINEnter.AppSettingChangedEnterPIN'),
+    [PINEntryUsage.WalletUnlock]: t('PINEnter.EnterPIN'),
+  }
+
+  const primaryButtonText = {
+    [PINEntryUsage.ChangeBiometrics]: t('Global.Continue'),
+    [PINEntryUsage.PINCheck]: t('PINEnter.AppSettingSave'),
+    [PINEntryUsage.WalletUnlock]: t('PINEnter.Unlock'),
+  }
+
   const incrementDeveloperMenuCounter = useCallback(() => {
     if (developerOptionCount.current >= touchCountToEnableBiometrics) {
       developerOptionCount.current = 0
@@ -194,7 +211,7 @@ const PINEnter: React.FC<PINEnterProps> = ({ setAuthenticated, usage = PINEntryU
   )
 
   const loadWalletCredentials = useCallback(async () => {
-    if (usage === PINEntryUsage.PINCheck) {
+    if (usage === PINEntryUsage.PINCheck || PINEntryUsage.ChangeBiometrics) {
       return
     }
 
@@ -360,6 +377,10 @@ const PINEnter: React.FC<PINEnterProps> = ({ setAuthenticated, usage = PINEntryU
         setAlertModalVisible(false)
         setAuthenticated(false)
         break
+      case PINEntryUsage.ChangeBiometrics:
+        setAlertModalVisible(false)
+        setAuthenticated(false)
+        break
 
       default:
         setAlertModalVisible(false)
@@ -414,7 +435,7 @@ const PINEnter: React.FC<PINEnterProps> = ({ setAuthenticated, usage = PINEntryU
 
       setContinueEnabled(false)
 
-      if (usage === PINEntryUsage.PINCheck) {
+      if (usage === PINEntryUsage.PINCheck || PINEntryUsage.ChangeBiometrics) {
         await verifyPIN(PIN)
       }
 
@@ -459,6 +480,15 @@ const PINEnter: React.FC<PINEnterProps> = ({ setAuthenticated, usage = PINEntryU
       return <Text style={style.helpText}>{t('PINEnter.AppSettingChanged')}</Text>
     }
 
+    if (usage === PINEntryUsage.ChangeBiometrics) {
+      return (
+        <>
+          <Text style={style.title}>{t('PINEnter.ChangeBiometricsHeader')}</Text>
+          <Text style={style.helpText}>{t('PINEnter.ChangeBiometricsSubtext')}</Text>
+        </>
+      )
+    }
+
     return (
       <>
         <Text style={style.title}>{t('PINEnter.Title')}</Text>
@@ -488,9 +518,10 @@ const PINEnter: React.FC<PINEnterProps> = ({ setAuthenticated, usage = PINEntryU
           ) : (
             displayHelpText()
           )}
-          <Text style={style.subText}>{`${
-            usage === PINEntryUsage.PINCheck ? t('PINEnter.AppSettingChangedEnterPIN') : t('PINEnter.EnterPIN')
-          }`}</Text>
+          <Text style={style.subText}>
+            {inputLabelText[usage]}
+            {usage === PINEntryUsage.ChangeBiometrics && <Text style={style.parenthesisText}>{` `}{t('PINEnter.ChangeBiometricsInputLabelParenthesis')}</Text>}
+          </Text>
           <PINInput
             onPINChanged={(p: string) => {
               setPIN(p)
@@ -498,10 +529,8 @@ const PINEnter: React.FC<PINEnterProps> = ({ setAuthenticated, usage = PINEntryU
                 Keyboard.dismiss()
               }
             }}
-            testID={testIdWithKey(usage === PINEntryUsage.PINCheck ? 'AppSettingChangedEnterPIN' : 'EnterPIN')}
-            accessibilityLabel={
-              usage === PINEntryUsage.PINCheck ? t('PINEnter.AppSettingChangedEnterPIN') : t('PINEnter.EnterPIN')
-            }
+            testID={testIdWithKey(inputLabelText[usage])}
+            accessibilityLabel={inputLabelText[usage]}
             autoFocus={true}
             inlineMessage={inlineMessageField}
           />
@@ -509,13 +538,11 @@ const PINEnter: React.FC<PINEnterProps> = ({ setAuthenticated, usage = PINEntryU
         <View style={style.controlsContainer}>
           <View style={style.buttonContainer}>
             <Button
-              title={usage === PINEntryUsage.PINCheck ? t('PINEnter.AppSettingSave') : t('PINEnter.Unlock')}
+              title={primaryButtonText[usage]}
               buttonType={ButtonType.Primary}
-              testID={testIdWithKey(usage === PINEntryUsage.PINCheck ? 'AppSettingSave' : 'Enter')}
+              testID={testIdWithKey(primaryButtonText[usage])}
               disabled={isContinueDisabled()}
-              accessibilityLabel={
-                usage === PINEntryUsage.PINCheck ? t('PINEnter.AppSettingSave') : t('PINEnter.Unlock')
-              }
+              accessibilityLabel={primaryButtonText[usage]}
               onPress={() => {
                 Keyboard.dismiss()
                 onPINInputCompleted(PIN)
diff --git a/packages/legacy/core/App/screens/UseBiometry.tsx b/packages/legacy/core/App/screens/UseBiometry.tsx
index d4b2442b4b..1bb5a88d2e 100644
--- a/packages/legacy/core/App/screens/UseBiometry.tsx
+++ b/packages/legacy/core/App/screens/UseBiometry.tsx
@@ -1,10 +1,11 @@
 import { CommonActions, useNavigation } from '@react-navigation/native'
 import { StackNavigationProp } from '@react-navigation/stack'
+import { Header, useHeaderHeight, HeaderBackButton } from '@react-navigation/elements';
 import React, { useState, useEffect, useCallback, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
-import { StyleSheet, Text, View, Modal, ScrollView, Linking, Platform } from 'react-native'
+import { StyleSheet, Text, View, Modal, ScrollView, Linking, Platform, useWindowDimensions } from 'react-native'
 import { PERMISSIONS, RESULTS, request, check, PermissionStatus } from 'react-native-permissions'
-import { SafeAreaView } from 'react-native-safe-area-context'
+import { SafeAreaView, useSafeAreaInsets } from 'react-native-safe-area-context'
 
 import Button, { ButtonType } from '../components/buttons/Button'
 import ToggleButton from '../components/buttons/ToggleButton'
@@ -46,6 +47,8 @@ const UseBiometry: React.FC = () => {
   const screenUsage = useMemo(() => {
     return store.onboarding.didCompleteOnboarding ? UseBiometryUsage.ToggleOnOff : UseBiometryUsage.InitialSetup
   }, [store.onboarding.didCompleteOnboarding])
+  const headerHeight = useHeaderHeight()
+  const insets = useSafeAreaInsets()
 
   const BIOMETRY_PERMISSION = PERMISSIONS.IOS.FACE_ID
 
@@ -314,7 +317,7 @@ const UseBiometry: React.FC = () => {
       <View style={{ marginTop: 'auto', margin: 20 }}>
         {store.onboarding.didCompleteOnboarding || (
           <Button
-            title={'Continue'}
+            title={t('Global.Continue')}
             accessibilityLabel={'Continue'}
             testID={testIdWithKey('Continue')}
             onPress={continueTouched}
@@ -330,10 +333,16 @@ const UseBiometry: React.FC = () => {
         visible={canSeeCheckPIN}
         transparent={false}
         animationType={'slide'}
-        presentationStyle="pageSheet"
+        presentationStyle='fullScreen'
       >
+        <Header 
+          title={t('Screens.EnterPIN')}
+          headerTitleStyle={{ marginTop: insets.top, ...TextTheme.headerTitle }}
+          headerStyle={{ height: headerHeight }}
+          headerLeft={() => <HeaderBackButton onPress={() => setCanSeeCheckPIN(false)} tintColor='white' style={{ marginTop: insets.top }} labelVisible={false} />}
+        />
         <PINEnter
-          usage={PINEntryUsage.PINCheck}
+          usage={PINEntryUsage.ChangeBiometrics}
           setAuthenticated={onAuthenticationComplete}
           onCancelAuth={setCanSeeCheckPIN}
         />

From 93360f069b56003d9f71fe7f08127f60e04c20a3 Mon Sep 17 00:00:00 2001
From: Christian Lippa <christian.lippa@ontario.ca>
Date: Fri, 31 Jan 2025 12:31:02 -0500
Subject: [PATCH 2/5] add translations

Signed-off-by: Christian Lippa <christian.lippa@ontario.ca>
---
 packages/legacy/core/App/localization/fr/index.ts    | 4 ++++
 packages/legacy/core/App/localization/pt-br/index.ts | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/packages/legacy/core/App/localization/fr/index.ts b/packages/legacy/core/App/localization/fr/index.ts
index b6efb8d30c..e5d7e12053 100644
--- a/packages/legacy/core/App/localization/fr/index.ts
+++ b/packages/legacy/core/App/localization/fr/index.ts
@@ -273,6 +273,10 @@ const translation = {
         "AppSettingChangedEnterPIN": "Veuillez confirmer la modification en saisissant votre NIP.",
         "AppSettingSave": "Enregistrer",
         "AppSettingCancel": "Annuler",
+        "ChangeBiometricsHeader": "Change in biometrics (FR)",
+        "ChangeBiometricsSubtext": "Please enter your PIN to confirm a change in biometrics (FR)",
+        "ChangeBiometricsInputLabel": "Enter your wallet PIN (FR)",
+        "ChangeBiometricsInputLabelParenthesis": "(Required) (FR)",
 
     },
     "AttemptLockout": {
diff --git a/packages/legacy/core/App/localization/pt-br/index.ts b/packages/legacy/core/App/localization/pt-br/index.ts
index 8f0bd2e70f..0fe0b9a74a 100644
--- a/packages/legacy/core/App/localization/pt-br/index.ts
+++ b/packages/legacy/core/App/localization/pt-br/index.ts
@@ -260,6 +260,10 @@ const translation = {
     "AppSettingChangedEnterPIN": "Por favor, confirme sua alteração digitando o seu PIN.",
     "AppSettingSave": "Salvar",
     "AppSettingCancel": "Cancelar",
+    "ChangeBiometricsHeader": "Change in biometrics (PT-BR)",
+    "ChangeBiometricsSubtext": "Please enter your PIN to confirm a change in biometrics (PT-BR)",
+    "ChangeBiometricsInputLabel": "Enter your wallet PIN (PT-BR)",
+    "ChangeBiometricsInputLabelParenthesis": "(Required) (PT-BR)",
   },
   "Biometry": {
     "Toggle": "Habilitar Biometria",

From 0adf0b8cdf41d407bdb13bae6ce3018c5f9f8f17 Mon Sep 17 00:00:00 2001
From: Christian Lippa <christian.lippa@ontario.ca>
Date: Mon, 3 Feb 2025 14:46:55 -0500
Subject: [PATCH 3/5] Fixing failing tests

Signed-off-by: Christian Lippa <christian.lippa@ontario.ca>
---
 packages/legacy/core/App/screens/PINEnter.tsx |   8 +-
 .../core/__tests__/screens/PINEnter.test.tsx  |  20 +-
 .../__tests__/screens/UseBiometry.test.tsx    |  18 +-
 .../__snapshots__/PINEnter.test.tsx.snap      | 488 +++++++++++++++++-
 4 files changed, 527 insertions(+), 7 deletions(-)

diff --git a/packages/legacy/core/App/screens/PINEnter.tsx b/packages/legacy/core/App/screens/PINEnter.tsx
index a3ca087271..4a3b411389 100644
--- a/packages/legacy/core/App/screens/PINEnter.tsx
+++ b/packages/legacy/core/App/screens/PINEnter.tsx
@@ -121,6 +121,12 @@ const PINEnter: React.FC<PINEnterProps> = ({ setAuthenticated, usage = PINEntryU
     [PINEntryUsage.WalletUnlock]: t('PINEnter.Unlock'),
   }
 
+  const primaryButtonTestId = {
+    [PINEntryUsage.ChangeBiometrics]: 'Continue',
+    [PINEntryUsage.PINCheck]: 'AppSettingSave',
+    [PINEntryUsage.WalletUnlock]: 'PINEnter.Unlock',
+  }
+
   const incrementDeveloperMenuCounter = useCallback(() => {
     if (developerOptionCount.current >= touchCountToEnableBiometrics) {
       developerOptionCount.current = 0
@@ -540,7 +546,7 @@ const PINEnter: React.FC<PINEnterProps> = ({ setAuthenticated, usage = PINEntryU
             <Button
               title={primaryButtonText[usage]}
               buttonType={ButtonType.Primary}
-              testID={testIdWithKey(primaryButtonText[usage])}
+              testID={testIdWithKey(primaryButtonTestId[usage])}
               disabled={isContinueDisabled()}
               accessibilityLabel={primaryButtonText[usage]}
               onPress={() => {
diff --git a/packages/legacy/core/__tests__/screens/PINEnter.test.tsx b/packages/legacy/core/__tests__/screens/PINEnter.test.tsx
index ed66609424..0a13c0936d 100644
--- a/packages/legacy/core/__tests__/screens/PINEnter.test.tsx
+++ b/packages/legacy/core/__tests__/screens/PINEnter.test.tsx
@@ -6,7 +6,7 @@ import { ContainerProvider } from '../../App/container-api'
 import { MainContainer } from '../../App/container-impl'
 import { AuthContext } from '../../App/contexts/auth'
 import { StoreProvider, defaultState } from '../../App/contexts/store'
-import PINEnter from '../../App/screens/PINEnter'
+import PINEnter, { PINEntryUsage } from '../../App/screens/PINEnter'
 import { testIdWithKey } from '../../App/utils/testable'
 import authContext from '../contexts/auth'
 
@@ -29,6 +29,24 @@ describe('PINEnter Screen', () => {
     expect(tree).toMatchSnapshot()
   })
 
+  test('PIN Enter renders correctly for biometrics change', () => {
+    const main = new MainContainer(container.createChildContainer()).init()
+    const tree = render(
+      <ContainerProvider value={main}>
+        <StoreProvider
+          initialState={{
+            ...defaultState,
+          }}
+        >
+          <AuthContext.Provider value={authContext}>
+            <PINEnter setAuthenticated={jest.fn()} usage={PINEntryUsage.ChangeBiometrics} />
+          </AuthContext.Provider>
+        </StoreProvider>
+      </ContainerProvider>
+    )
+    expect(tree).toMatchSnapshot()
+  })
+
   test('PIN Enter renders correctly when logged out message is present', async () => {
     const main = new MainContainer(container.createChildContainer()).init()
     const tree = render(
diff --git a/packages/legacy/core/__tests__/screens/UseBiometry.test.tsx b/packages/legacy/core/__tests__/screens/UseBiometry.test.tsx
index ed222ce03b..daf6f48d93 100644
--- a/packages/legacy/core/__tests__/screens/UseBiometry.test.tsx
+++ b/packages/legacy/core/__tests__/screens/UseBiometry.test.tsx
@@ -7,7 +7,7 @@ import { testIdWithKey } from '../../App/utils/testable'
 import authContext from '../contexts/auth'
 import timeTravel from '../helpers/timetravel'
 import { BasicAppContext } from '../helpers/app'
-import { Linking } from 'react-native'
+import { Linking, View } from 'react-native'
 import { testDefaultState } from '../contexts/store'
 import { StoreProvider } from '../../App/contexts/store'
 import { RESULTS, check, request } from 'react-native-permissions'
@@ -18,6 +18,22 @@ const mockedRequest = request as jest.MockedFunction<typeof request>
 
 jest.spyOn(Linking, 'openSettings').mockImplementation(() => Promise.resolve())
 
+jest.mock('@react-navigation/elements', () => {
+  return {
+    __esModule: true,
+    Header: jest.fn().mockImplementation(() => null),
+    HeaderBackButton: jest.fn().mockImplementation(() => {
+      return jest.fn(() => null);
+    }),
+    useHeaderHeight: jest.fn().mockReturnValue(150)
+  };
+});
+
+jest.mock('react-native-safe-area-context', () => ({
+  useSafeAreaInsets: jest.fn().mockImplementation(() => ({ top: 25, left: 0, bottom: 25, right: 0 }))
+}))
+
+
 const customStore = {
   ...testDefaultState,
   preferences: {
diff --git a/packages/legacy/core/__tests__/screens/__snapshots__/PINEnter.test.tsx.snap b/packages/legacy/core/__tests__/screens/__snapshots__/PINEnter.test.tsx.snap
index c8559e2349..70a312dc92 100644
--- a/packages/legacy/core/__tests__/screens/__snapshots__/PINEnter.test.tsx.snap
+++ b/packages/legacy/core/__tests__/screens/__snapshots__/PINEnter.test.tsx.snap
@@ -11,6 +11,7 @@ exports[`PINEnter Screen PIN Enter renders correctly 1`] = `
   }
   style={
     Object {
+      "backgroundColor": "#000000",
       "flex": 1,
     }
   }
@@ -57,6 +58,7 @@ exports[`PINEnter Screen PIN Enter renders correctly 1`] = `
                   "fontSize": 32,
                   "fontWeight": "bold",
                   "marginBottom": 20,
+                  "marginTop": 0,
                 }
               }
             >
@@ -296,7 +298,7 @@ exports[`PINEnter Screen PIN Enter renders correctly 1`] = `
                           "top": 0,
                         }
                       }
-                      testID="com.ariesbifold:id/EnterPIN"
+                      testID="com.ariesbifold:id/PINEnter.EnterPIN"
                       textContentType="password"
                       underlineColorAndroid="transparent"
                       value=""
@@ -422,7 +424,7 @@ exports[`PINEnter Screen PIN Enter renders correctly 1`] = `
                     "padding": 16,
                   }
                 }
-                testID="com.ariesbifold:id/Enter"
+                testID="com.ariesbifold:id/PINEnter.Unlock"
               >
                 <View
                   style={
@@ -461,6 +463,483 @@ exports[`PINEnter Screen PIN Enter renders correctly 1`] = `
 </RNCSafeAreaView>
 `;
 
+exports[`PINEnter Screen PIN Enter renders correctly for biometrics change 1`] = `
+<RNCSafeAreaView
+  edges={
+    Array [
+      "bottom",
+      "left",
+      "right",
+    ]
+  }
+  style={
+    Object {
+      "backgroundColor": "#000000",
+      "flex": 1,
+    }
+  }
+>
+  <View
+    onLayout={[Function]}
+    style={
+      Array [
+        Object {
+          "flex": 1,
+        },
+        Object {
+          "paddingBottom": 0,
+        },
+      ]
+    }
+  >
+    <RCTScrollView
+      contentContainerStyle={
+        Object {
+          "flexGrow": 1,
+        }
+      }
+      keyboardShouldPersistTaps="handled"
+    >
+      <View>
+        <View
+          style={
+            Object {
+              "backgroundColor": "#000000",
+              "height": "100%",
+              "justifyContent": "flex-start",
+              "padding": 20,
+            }
+          }
+        >
+          <View
+            style={Object {}}
+          >
+            <Text
+              style={
+                Object {
+                  "color": "#FFFFFF",
+                  "fontSize": 32,
+                  "fontWeight": "bold",
+                  "marginBottom": 40,
+                  "marginTop": 20,
+                }
+              }
+            >
+              PINEnter.ChangeBiometricsHeader
+            </Text>
+            <Text
+              style={
+                Object {
+                  "alignSelf": "auto",
+                  "color": "#FFFFFF",
+                  "fontSize": 18,
+                  "fontWeight": "normal",
+                  "marginBottom": 40,
+                  "textAlign": "left",
+                }
+              }
+            >
+              PINEnter.ChangeBiometricsSubtext
+            </Text>
+            <Text
+              style={
+                Object {
+                  "color": "#FFFFFF",
+                  "fontSize": 18,
+                  "fontWeight": "bold",
+                  "marginBottom": 20,
+                }
+              }
+            >
+              PINEnter.ChangeBiometricsInputLabel
+              <Text
+                style={
+                  Object {
+                    "color": "#FFFFFF",
+                    "fontSize": 14,
+                    "fontWeight": "normal",
+                  }
+                }
+              >
+                 
+                PINEnter.ChangeBiometricsInputLabelParenthesis
+              </Text>
+            </Text>
+            <View
+              style={
+                Object {
+                  "flexDirection": "column",
+                  "marginBottom": 24,
+                }
+              }
+            >
+              <View
+                style={
+                  Object {
+                    "alignItems": "center",
+                    "backgroundColor": "#313132",
+                    "borderColor": "#FFFFFFFF",
+                    "borderRadius": 5,
+                    "borderWidth": 1,
+                    "flexDirection": "row",
+                    "paddingHorizontal": 12,
+                    "paddingVertical": 4,
+                  }
+                }
+              >
+                <View
+                  style={
+                    Object {
+                      "flex": 1,
+                    }
+                  }
+                >
+                  <View
+                    style={
+                      Array [
+                        Object {
+                          "flexDirection": "row",
+                          "justifyContent": "space-between",
+                        },
+                        Object {
+                          "alignItems": "center",
+                          "justifyContent": "flex-start",
+                        },
+                      ]
+                    }
+                  >
+                    <View
+                      onLayout={[Function]}
+                      style={
+                        Object {
+                          "backgroundColor": "#313132",
+                          "height": 48,
+                          "paddingHorizontal": 2,
+                        }
+                      }
+                    >
+                      <Text
+                        maxFontSizeMultiplier={1}
+                        style={
+                          Object {
+                            "color": "#FFFFFF",
+                            "fontSize": 26,
+                            "fontWeight": "bold",
+                            "lineHeight": 48,
+                            "textAlign": "center",
+                          }
+                        }
+                      />
+                    </View>
+                    <View
+                      onLayout={[Function]}
+                      style={
+                        Object {
+                          "backgroundColor": "#313132",
+                          "height": 48,
+                          "paddingHorizontal": 2,
+                        }
+                      }
+                    >
+                      <Text
+                        maxFontSizeMultiplier={1}
+                        style={
+                          Object {
+                            "color": "#FFFFFF",
+                            "fontSize": 26,
+                            "fontWeight": "bold",
+                            "lineHeight": 48,
+                            "textAlign": "center",
+                          }
+                        }
+                      />
+                    </View>
+                    <View
+                      onLayout={[Function]}
+                      style={
+                        Object {
+                          "backgroundColor": "#313132",
+                          "height": 48,
+                          "paddingHorizontal": 2,
+                        }
+                      }
+                    >
+                      <Text
+                        maxFontSizeMultiplier={1}
+                        style={
+                          Object {
+                            "color": "#FFFFFF",
+                            "fontSize": 26,
+                            "fontWeight": "bold",
+                            "lineHeight": 48,
+                            "textAlign": "center",
+                          }
+                        }
+                      />
+                    </View>
+                    <View
+                      onLayout={[Function]}
+                      style={
+                        Object {
+                          "backgroundColor": "#313132",
+                          "height": 48,
+                          "paddingHorizontal": 2,
+                        }
+                      }
+                    >
+                      <Text
+                        maxFontSizeMultiplier={1}
+                        style={
+                          Object {
+                            "color": "#FFFFFF",
+                            "fontSize": 26,
+                            "fontWeight": "bold",
+                            "lineHeight": 48,
+                            "textAlign": "center",
+                          }
+                        }
+                      />
+                    </View>
+                    <View
+                      onLayout={[Function]}
+                      style={
+                        Object {
+                          "backgroundColor": "#313132",
+                          "height": 48,
+                          "paddingHorizontal": 2,
+                        }
+                      }
+                    >
+                      <Text
+                        maxFontSizeMultiplier={1}
+                        style={
+                          Object {
+                            "color": "#FFFFFF",
+                            "fontSize": 26,
+                            "fontWeight": "bold",
+                            "lineHeight": 48,
+                            "textAlign": "center",
+                          }
+                        }
+                      />
+                    </View>
+                    <View
+                      onLayout={[Function]}
+                      style={
+                        Object {
+                          "backgroundColor": "#313132",
+                          "height": 48,
+                          "paddingHorizontal": 2,
+                        }
+                      }
+                    >
+                      <Text
+                        maxFontSizeMultiplier={1}
+                        style={
+                          Object {
+                            "color": "#FFFFFF",
+                            "fontSize": 26,
+                            "fontWeight": "bold",
+                            "lineHeight": 48,
+                            "textAlign": "center",
+                          }
+                        }
+                      />
+                    </View>
+                    <TextInput
+                      accessibilityLabel="PINEnter.ChangeBiometricsInputLabel"
+                      accessible={true}
+                      autoCapitalize="characters"
+                      autoComplete="one-time-code"
+                      autoCorrect={false}
+                      autoFocus={true}
+                      blurOnSubmit={false}
+                      caretHidden={true}
+                      clearButtonMode="never"
+                      disableFullscreenUI={true}
+                      keyboardType="numeric"
+                      maxLength={6}
+                      onBlur={[Function]}
+                      onChangeText={[Function]}
+                      onFocus={[Function]}
+                      onPressOut={[Function]}
+                      spellCheck={false}
+                      style={
+                        Object {
+                          "bottom": 0,
+                          "fontSize": 1,
+                          "left": 0,
+                          "opacity": 0.015,
+                          "position": "absolute",
+                          "right": 0,
+                          "top": 0,
+                        }
+                      }
+                      testID="com.ariesbifold:id/PINEnter.ChangeBiometricsInputLabel"
+                      textContentType="password"
+                      underlineColorAndroid="transparent"
+                      value=""
+                    />
+                  </View>
+                </View>
+                <View
+                  accessibilityLabel="PINCreate.Show"
+                  accessibilityRole="button"
+                  accessibilityState={
+                    Object {
+                      "busy": undefined,
+                      "checked": undefined,
+                      "disabled": undefined,
+                      "expanded": undefined,
+                      "selected": undefined,
+                    }
+                  }
+                  accessibilityValue={
+                    Object {
+                      "max": undefined,
+                      "min": undefined,
+                      "now": undefined,
+                      "text": undefined,
+                    }
+                  }
+                  accessible={true}
+                  collapsable={false}
+                  focusable={true}
+                  hitSlop={
+                    Object {
+                      "bottom": 44,
+                      "left": 44,
+                      "right": 44,
+                      "top": 44,
+                    }
+                  }
+                  onClick={[Function]}
+                  onResponderGrant={[Function]}
+                  onResponderMove={[Function]}
+                  onResponderRelease={[Function]}
+                  onResponderTerminate={[Function]}
+                  onResponderTerminationRequest={[Function]}
+                  onStartShouldSetResponder={[Function]}
+                  style={
+                    Object {
+                      "opacity": 1,
+                      "paddingHorizontal": 10,
+                    }
+                  }
+                  testID="com.ariesbifold:id/Show"
+                >
+                  <Text
+                    allowFontScaling={false}
+                    selectable={false}
+                    style={
+                      Array [
+                        Object {
+                          "color": "#FFFFFF",
+                          "fontSize": 30,
+                        },
+                        undefined,
+                        Object {
+                          "fontFamily": "Material Icons",
+                          "fontStyle": "normal",
+                          "fontWeight": "normal",
+                        },
+                        Object {},
+                      ]
+                    }
+                  >
+                    
+                  </Text>
+                </View>
+              </View>
+            </View>
+          </View>
+          <View
+            style={Object {}}
+          >
+            <View
+              style={
+                Object {
+                  "width": "100%",
+                }
+              }
+            >
+              <View
+                accessibilityLabel="Global.Continue"
+                accessibilityRole="button"
+                accessibilityState={
+                  Object {
+                    "busy": undefined,
+                    "checked": undefined,
+                    "disabled": false,
+                    "expanded": undefined,
+                    "selected": undefined,
+                  }
+                }
+                accessibilityValue={
+                  Object {
+                    "max": undefined,
+                    "min": undefined,
+                    "now": undefined,
+                    "text": undefined,
+                  }
+                }
+                accessible={true}
+                collapsable={false}
+                focusable={true}
+                onClick={[Function]}
+                onResponderGrant={[Function]}
+                onResponderMove={[Function]}
+                onResponderRelease={[Function]}
+                onResponderTerminate={[Function]}
+                onResponderTerminationRequest={[Function]}
+                onStartShouldSetResponder={[Function]}
+                style={
+                  Object {
+                    "backgroundColor": "#42803E",
+                    "borderRadius": 4,
+                    "opacity": 1,
+                    "padding": 16,
+                  }
+                }
+                testID="com.ariesbifold:id/Continue"
+              >
+                <View
+                  style={
+                    Object {
+                      "alignItems": "center",
+                      "flexDirection": "row",
+                      "justifyContent": "center",
+                    }
+                  }
+                >
+                  <Text
+                    style={
+                      Array [
+                        Object {
+                          "color": "#FFFFFF",
+                          "fontSize": 18,
+                          "fontWeight": "bold",
+                          "textAlign": "center",
+                        },
+                        false,
+                        false,
+                        false,
+                      ]
+                    }
+                  >
+                    Global.Continue
+                  </Text>
+                </View>
+              </View>
+            </View>
+          </View>
+        </View>
+      </View>
+    </RCTScrollView>
+  </View>
+</RNCSafeAreaView>
+`;
+
 exports[`PINEnter Screen PIN Enter renders correctly when logged out message is present 1`] = `
 <RNCSafeAreaView
   edges={
@@ -472,6 +951,7 @@ exports[`PINEnter Screen PIN Enter renders correctly when logged out message is
   }
   style={
     Object {
+      "backgroundColor": "#000000",
       "flex": 1,
     }
   }
@@ -761,7 +1241,7 @@ exports[`PINEnter Screen PIN Enter renders correctly when logged out message is
                           "top": 0,
                         }
                       }
-                      testID="com.ariesbifold:id/EnterPIN"
+                      testID="com.ariesbifold:id/PINEnter.EnterPIN"
                       textContentType="password"
                       underlineColorAndroid="transparent"
                       value=""
@@ -887,7 +1367,7 @@ exports[`PINEnter Screen PIN Enter renders correctly when logged out message is
                     "padding": 16,
                   }
                 }
-                testID="com.ariesbifold:id/Enter"
+                testID="com.ariesbifold:id/PINEnter.Unlock"
               >
                 <View
                   style={

From 65d7d3071d56052879ba09d1b6da130b0b4597f9 Mon Sep 17 00:00:00 2001
From: Christian Lippa <christian.lippa@ontario.ca>
Date: Tue, 4 Feb 2025 12:04:45 -0500
Subject: [PATCH 4/5] Fix failing tests and update screenshots

Signed-off-by: Christian Lippa <christian.lippa@ontario.ca>
---
 packages/legacy/core/App/screens/PINEnter.tsx |  2 +-
 .../legacy/core/App/screens/UseBiometry.tsx   |  2 +-
 .../__tests__/screens/UseBiometry.test.tsx    | 41 +++++++-----
 .../__snapshots__/PINEnter.test.tsx.snap      |  4 +-
 .../__snapshots__/UseBiometry.test.tsx.snap   | 66 ++++++-------------
 5 files changed, 49 insertions(+), 66 deletions(-)

diff --git a/packages/legacy/core/App/screens/PINEnter.tsx b/packages/legacy/core/App/screens/PINEnter.tsx
index 4a3b411389..bd31208bb4 100644
--- a/packages/legacy/core/App/screens/PINEnter.tsx
+++ b/packages/legacy/core/App/screens/PINEnter.tsx
@@ -124,7 +124,7 @@ const PINEnter: React.FC<PINEnterProps> = ({ setAuthenticated, usage = PINEntryU
   const primaryButtonTestId = {
     [PINEntryUsage.ChangeBiometrics]: 'Continue',
     [PINEntryUsage.PINCheck]: 'AppSettingSave',
-    [PINEntryUsage.WalletUnlock]: 'PINEnter.Unlock',
+    [PINEntryUsage.WalletUnlock]: 'Enter',
   }
 
   const incrementDeveloperMenuCounter = useCallback(() => {
diff --git a/packages/legacy/core/App/screens/UseBiometry.tsx b/packages/legacy/core/App/screens/UseBiometry.tsx
index 1bb5a88d2e..33eea3cf74 100644
--- a/packages/legacy/core/App/screens/UseBiometry.tsx
+++ b/packages/legacy/core/App/screens/UseBiometry.tsx
@@ -3,7 +3,7 @@ import { StackNavigationProp } from '@react-navigation/stack'
 import { Header, useHeaderHeight, HeaderBackButton } from '@react-navigation/elements';
 import React, { useState, useEffect, useCallback, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
-import { StyleSheet, Text, View, Modal, ScrollView, Linking, Platform, useWindowDimensions } from 'react-native'
+import { StyleSheet, Text, View, Modal, ScrollView, Linking, Platform } from 'react-native'
 import { PERMISSIONS, RESULTS, request, check, PermissionStatus } from 'react-native-permissions'
 import { SafeAreaView, useSafeAreaInsets } from 'react-native-safe-area-context'
 
diff --git a/packages/legacy/core/__tests__/screens/UseBiometry.test.tsx b/packages/legacy/core/__tests__/screens/UseBiometry.test.tsx
index daf6f48d93..120342e43a 100644
--- a/packages/legacy/core/__tests__/screens/UseBiometry.test.tsx
+++ b/packages/legacy/core/__tests__/screens/UseBiometry.test.tsx
@@ -1,13 +1,12 @@
 import { render, fireEvent, waitFor } from '@testing-library/react-native'
 import React from 'react'
-
 import { AuthContext } from '../../App/contexts/auth'
 import UseBiometry from '../../App/screens/UseBiometry'
 import { testIdWithKey } from '../../App/utils/testable'
 import authContext from '../contexts/auth'
 import timeTravel from '../helpers/timetravel'
 import { BasicAppContext } from '../helpers/app'
-import { Linking, View } from 'react-native'
+import { Linking } from 'react-native'
 import { testDefaultState } from '../contexts/store'
 import { StoreProvider } from '../../App/contexts/store'
 import { RESULTS, check, request } from 'react-native-permissions'
@@ -18,21 +17,29 @@ const mockedRequest = request as jest.MockedFunction<typeof request>
 
 jest.spyOn(Linking, 'openSettings').mockImplementation(() => Promise.resolve())
 
-jest.mock('@react-navigation/elements', () => {
-  return {
-    __esModule: true,
-    Header: jest.fn().mockImplementation(() => null),
-    HeaderBackButton: jest.fn().mockImplementation(() => {
-      return jest.fn(() => null);
-    }),
-    useHeaderHeight: jest.fn().mockReturnValue(150)
-  };
-});
+jest.mock('@react-navigation/elements', () => ({
+  Header: jest.fn().mockImplementation(() => {
+    const Component = () => null;
+    Component.displayName = 'Header';
+    return Component;
+  }),
+  HeaderBackButton: jest.fn().mockImplementation(() => {
+    const Component = () => null;
+    Component.displayName = 'HeaderBackButton';
+    return Component;
+  }),
+  useHeaderHeight: jest.fn().mockReturnValue(150)
+}));
 
 jest.mock('react-native-safe-area-context', () => ({
-  useSafeAreaInsets: jest.fn().mockImplementation(() => ({ top: 25, left: 0, bottom: 25, right: 0 }))
-}))
-
+  useSafeAreaInsets: jest.fn().mockReturnValue({
+    top: 25,
+    bottom: 25,
+    left: 0,
+    right: 0
+  }),
+  SafeAreaView: jest.fn().mockImplementation(({children}) => children)
+}));
 
 const customStore = {
   ...testDefaultState,
@@ -62,7 +69,7 @@ describe('UseBiometry Screen', () => {
     const tree = render(
       <BasicAppContext>
         <AuthContext.Provider value={authContext}>
-          <UseBiometry />
+            <UseBiometry />
         </AuthContext.Provider>
       </BasicAppContext>
     )
@@ -79,7 +86,7 @@ describe('UseBiometry Screen', () => {
     const tree = render(
       <BasicAppContext>
         <AuthContext.Provider value={authContext}>
-          <UseBiometry />
+            <UseBiometry />
         </AuthContext.Provider>
       </BasicAppContext>
     )
diff --git a/packages/legacy/core/__tests__/screens/__snapshots__/PINEnter.test.tsx.snap b/packages/legacy/core/__tests__/screens/__snapshots__/PINEnter.test.tsx.snap
index 70a312dc92..3a71a2ef10 100644
--- a/packages/legacy/core/__tests__/screens/__snapshots__/PINEnter.test.tsx.snap
+++ b/packages/legacy/core/__tests__/screens/__snapshots__/PINEnter.test.tsx.snap
@@ -424,7 +424,7 @@ exports[`PINEnter Screen PIN Enter renders correctly 1`] = `
                     "padding": 16,
                   }
                 }
-                testID="com.ariesbifold:id/PINEnter.Unlock"
+                testID="com.ariesbifold:id/Enter"
               >
                 <View
                   style={
@@ -1367,7 +1367,7 @@ exports[`PINEnter Screen PIN Enter renders correctly when logged out message is
                     "padding": 16,
                   }
                 }
-                testID="com.ariesbifold:id/PINEnter.Unlock"
+                testID="com.ariesbifold:id/Enter"
               >
                 <View
                   style={
diff --git a/packages/legacy/core/__tests__/screens/__snapshots__/UseBiometry.test.tsx.snap b/packages/legacy/core/__tests__/screens/__snapshots__/UseBiometry.test.tsx.snap
index d8c08f3447..1b0e50c2ba 100644
--- a/packages/legacy/core/__tests__/screens/__snapshots__/UseBiometry.test.tsx.snap
+++ b/packages/legacy/core/__tests__/screens/__snapshots__/UseBiometry.test.tsx.snap
@@ -1,15 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`UseBiometry Screen Renders correctly when biometry available 1`] = `
-<RNCSafeAreaView
-  edges={
-    Array [
-      "left",
-      "right",
-      "bottom",
-    ]
-  }
->
+Array [
   <RCTScrollView
     style={
       Object {
@@ -208,7 +200,7 @@ exports[`UseBiometry Screen Renders correctly when biometry available 1`] = `
         </View>
       </View>
     </View>
-  </RCTScrollView>
+  </RCTScrollView>,
   <View
     style={
       Object {
@@ -281,15 +273,15 @@ exports[`UseBiometry Screen Renders correctly when biometry available 1`] = `
             ]
           }
         >
-          Continue
+          Global.Continue
         </Text>
       </View>
     </View>
-  </View>
+  </View>,
   <Modal
     animationType="slide"
     hardwareAccelerated={false}
-    presentationStyle="pageSheet"
+    presentationStyle="fullScreen"
     style={
       Object {
         "backgroundColor": "#000000",
@@ -297,20 +289,12 @@ exports[`UseBiometry Screen Renders correctly when biometry available 1`] = `
     }
     transparent={false}
     visible={false}
-  />
-</RNCSafeAreaView>
+  />,
+]
 `;
 
 exports[`UseBiometry Screen Renders correctly when biometry not available 1`] = `
-<RNCSafeAreaView
-  edges={
-    Array [
-      "left",
-      "right",
-      "bottom",
-    ]
-  }
->
+Array [
   <RCTScrollView
     style={
       Object {
@@ -497,7 +481,7 @@ exports[`UseBiometry Screen Renders correctly when biometry not available 1`] =
         </View>
       </View>
     </View>
-  </RCTScrollView>
+  </RCTScrollView>,
   <View
     style={
       Object {
@@ -570,15 +554,15 @@ exports[`UseBiometry Screen Renders correctly when biometry not available 1`] =
             ]
           }
         >
-          Continue
+          Global.Continue
         </Text>
       </View>
     </View>
-  </View>
+  </View>,
   <Modal
     animationType="slide"
     hardwareAccelerated={false}
-    presentationStyle="pageSheet"
+    presentationStyle="fullScreen"
     style={
       Object {
         "backgroundColor": "#000000",
@@ -586,20 +570,12 @@ exports[`UseBiometry Screen Renders correctly when biometry not available 1`] =
     }
     transparent={false}
     visible={false}
-  />
-</RNCSafeAreaView>
+  />,
+]
 `;
 
 exports[`UseBiometry Screen Toggles use biometrics ok 1`] = `
-<RNCSafeAreaView
-  edges={
-    Array [
-      "left",
-      "right",
-      "bottom",
-    ]
-  }
->
+Array [
   <RCTScrollView
     style={
       Object {
@@ -798,7 +774,7 @@ exports[`UseBiometry Screen Toggles use biometrics ok 1`] = `
         </View>
       </View>
     </View>
-  </RCTScrollView>
+  </RCTScrollView>,
   <View
     style={
       Object {
@@ -912,15 +888,15 @@ exports[`UseBiometry Screen Toggles use biometrics ok 1`] = `
             ]
           }
         >
-          Continue
+          Global.Continue
         </Text>
       </View>
     </View>
-  </View>
+  </View>,
   <Modal
     animationType="slide"
     hardwareAccelerated={false}
-    presentationStyle="pageSheet"
+    presentationStyle="fullScreen"
     style={
       Object {
         "backgroundColor": "#000000",
@@ -928,6 +904,6 @@ exports[`UseBiometry Screen Toggles use biometrics ok 1`] = `
     }
     transparent={false}
     visible={false}
-  />
-</RNCSafeAreaView>
+  />,
+]
 `;

From b1b0c95590b918d52c84e544a74f41efaf707050 Mon Sep 17 00:00:00 2001
From: Christian Lippa <christian.lippa@ontario.ca>
Date: Wed, 12 Feb 2025 16:29:05 -0500
Subject: [PATCH 5/5] PR fixes

Signed-off-by: Christian Lippa <christian.lippa@ontario.ca>
---
 .../legacy/core/App/components/views/KeyboardView.tsx     | 3 ++-
 packages/legacy/core/App/screens/PINEnter.tsx             | 8 +++++++-
 .../screens/__snapshots__/PINEnter.test.tsx.snap          | 6 +++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/packages/legacy/core/App/components/views/KeyboardView.tsx b/packages/legacy/core/App/components/views/KeyboardView.tsx
index d19c8a8187..69fbbed01c 100644
--- a/packages/legacy/core/App/components/views/KeyboardView.tsx
+++ b/packages/legacy/core/App/components/views/KeyboardView.tsx
@@ -1,9 +1,10 @@
 import React from 'react'
 import { KeyboardAvoidingView, Platform, ScrollView } from 'react-native'
 import { SafeAreaView } from 'react-native-safe-area-context'
-import { ColorPallet } from '../../theme'
+import { useTheme } from '../../contexts/theme'
 
 const KeyboardView: React.FC<{ children: React.ReactNode }> = ({ children }) => {
+  const { ColorPallet } = useTheme()
   return (
     <SafeAreaView style={{ flex: 1, backgroundColor: ColorPallet.brand.primaryBackground }} edges={['bottom', 'left', 'right']}>
       <KeyboardAvoidingView
diff --git a/packages/legacy/core/App/screens/PINEnter.tsx b/packages/legacy/core/App/screens/PINEnter.tsx
index bd31208bb4..185e25ed1a 100644
--- a/packages/legacy/core/App/screens/PINEnter.tsx
+++ b/packages/legacy/core/App/screens/PINEnter.tsx
@@ -115,6 +115,12 @@ const PINEnter: React.FC<PINEnterProps> = ({ setAuthenticated, usage = PINEntryU
     [PINEntryUsage.WalletUnlock]: t('PINEnter.EnterPIN'),
   }
 
+  const inputTestId = {
+    [PINEntryUsage.ChangeBiometrics]: 'BiometricChangedEnterPIN',
+    [PINEntryUsage.PINCheck]: 'AppSettingChangedEnterPIN',
+    [PINEntryUsage.WalletUnlock]: 'EnterPIN',
+  }
+
   const primaryButtonText = {
     [PINEntryUsage.ChangeBiometrics]: t('Global.Continue'),
     [PINEntryUsage.PINCheck]: t('PINEnter.AppSettingSave'),
@@ -535,7 +541,7 @@ const PINEnter: React.FC<PINEnterProps> = ({ setAuthenticated, usage = PINEntryU
                 Keyboard.dismiss()
               }
             }}
-            testID={testIdWithKey(inputLabelText[usage])}
+            testID={testIdWithKey(inputTestId[usage])}
             accessibilityLabel={inputLabelText[usage]}
             autoFocus={true}
             inlineMessage={inlineMessageField}
diff --git a/packages/legacy/core/__tests__/screens/__snapshots__/PINEnter.test.tsx.snap b/packages/legacy/core/__tests__/screens/__snapshots__/PINEnter.test.tsx.snap
index 3a71a2ef10..72a76a55ff 100644
--- a/packages/legacy/core/__tests__/screens/__snapshots__/PINEnter.test.tsx.snap
+++ b/packages/legacy/core/__tests__/screens/__snapshots__/PINEnter.test.tsx.snap
@@ -298,7 +298,7 @@ exports[`PINEnter Screen PIN Enter renders correctly 1`] = `
                           "top": 0,
                         }
                       }
-                      testID="com.ariesbifold:id/PINEnter.EnterPIN"
+                      testID="com.ariesbifold:id/EnterPIN"
                       textContentType="password"
                       underlineColorAndroid="transparent"
                       value=""
@@ -775,7 +775,7 @@ exports[`PINEnter Screen PIN Enter renders correctly for biometrics change 1`] =
                           "top": 0,
                         }
                       }
-                      testID="com.ariesbifold:id/PINEnter.ChangeBiometricsInputLabel"
+                      testID="com.ariesbifold:id/BiometricChangedEnterPIN"
                       textContentType="password"
                       underlineColorAndroid="transparent"
                       value=""
@@ -1241,7 +1241,7 @@ exports[`PINEnter Screen PIN Enter renders correctly when logged out message is
                           "top": 0,
                         }
                       }
-                      testID="com.ariesbifold:id/PINEnter.EnterPIN"
+                      testID="com.ariesbifold:id/EnterPIN"
                       textContentType="password"
                       underlineColorAndroid="transparent"
                       value=""