From 384ea52069a64c84358dccc27ea93ebc35cc305a Mon Sep 17 00:00:00 2001
From: Filipe Santos <48060475+fc-santos@users.noreply.github.com>
Date: Tue, 31 Dec 2024 14:54:20 -0500
Subject: [PATCH 1/2] fix: let user accept again terms and condition after back
 action from create pin screen (#1367)

Signed-off-by: fc-santos <filipesantos@live.ca>
---
 packages/legacy/core/App/screens/Terms.tsx    |  46 +-
 .../screens/__snapshots__/Terms.test.tsx.snap | 544 +++++++++---------
 2 files changed, 304 insertions(+), 286 deletions(-)

diff --git a/packages/legacy/core/App/screens/Terms.tsx b/packages/legacy/core/App/screens/Terms.tsx
index 01b665207..385bb7279 100644
--- a/packages/legacy/core/App/screens/Terms.tsx
+++ b/packages/legacy/core/App/screens/Terms.tsx
@@ -20,19 +20,19 @@ export const TermsVersion = true
 
 const Terms: React.FC = () => {
   const [store, dispatch] = useStore()
-  const [checked, setChecked] = useState(false)
+  const agreedToPreviousTerms = store.onboarding.didAgreeToTerms
+  const [checked, setChecked] = useState(agreedToPreviousTerms)
   const { t } = useTranslation()
   const navigation = useNavigation<StackNavigationProp<AuthenticateStackParams>>()
   const { OnboardingTheme, TextTheme } = useTheme()
   const [Button] = useServices([TOKENS.COMP_BUTTON])
-  const agreedToPreviousTerms = store.onboarding.didAgreeToTerms
   const onSubmitPressed = useCallback(() => {
     dispatch({
       type: DispatchAction.DID_AGREE_TO_TERMS,
       payload: [{ DidAgreeToTerms: TermsVersion }],
     })
 
-    if (!agreedToPreviousTerms) {
+    if (!(agreedToPreviousTerms && store.onboarding.didCreatePIN)) {
       navigation.navigate(Screens.CreatePIN)
     } else if (store.onboarding.postAuthScreens.length) {
       const screens: string[] = store.onboarding.postAuthScreens
@@ -44,7 +44,7 @@ const Terms: React.FC = () => {
         dispatch({ type: DispatchAction.DID_COMPLETE_ONBOARDING, payload: [true] })
       }
     }
-  }, [dispatch, agreedToPreviousTerms, navigation, store.onboarding.postAuthScreens])
+  }, [dispatch, agreedToPreviousTerms, navigation, store.onboarding.postAuthScreens, store.onboarding.didCreatePIN])
   const style = StyleSheet.create({
     container: {
       ...OnboardingTheme.container,
@@ -95,25 +95,27 @@ const Terms: React.FC = () => {
           est laborum.
         </Text>
         <View style={style.controlsContainer}>
-          {!agreedToPreviousTerms && (
-            <CheckBoxRow
-              title={t('Terms.Attestation')}
-              accessibilityLabel={t('Terms.IAgree')}
-              testID={testIdWithKey('IAgree')}
-              checked={checked}
-              onPress={() => setChecked(!checked)}
-            />
+          {!(agreedToPreviousTerms && store.authentication.didAuthenticate) && (
+            <View style={{ marginBottom: agreedToPreviousTerms ? 20 : 0 }}>
+              <CheckBoxRow
+                title={t('Terms.Attestation')}
+                accessibilityLabel={t('Terms.IAgree')}
+                testID={testIdWithKey('IAgree')}
+                checked={!!checked}
+                onPress={() => setChecked(!checked)}
+              />
+              <View style={{ paddingTop: 10 }}>
+                <Button
+                  title={agreedToPreviousTerms ? t('Global.Accept') : t('Global.Continue')}
+                  accessibilityLabel={agreedToPreviousTerms ? t('Global.Accept') : t('Global.Continue')}
+                  testID={agreedToPreviousTerms ? testIdWithKey('Accept') : testIdWithKey('Continue')}
+                  disabled={!checked}
+                  onPress={onSubmitPressed}
+                  buttonType={ButtonType.Primary}
+                />
+              </View>
+            </View>
           )}
-          <View style={{ paddingTop: 10 }}>
-            <Button
-              title={agreedToPreviousTerms ? t('Global.Accept') : t('Global.Continue')}
-              accessibilityLabel={agreedToPreviousTerms ? t('Global.Accept') : t('Global.Continue')}
-              testID={agreedToPreviousTerms ? testIdWithKey('Accept') : testIdWithKey('Continue')}
-              disabled={!checked && !agreedToPreviousTerms}
-              onPress={onSubmitPressed}
-              buttonType={ButtonType.Primary}
-            />
-          </View>
           {!agreedToPreviousTerms && (
             <View style={{ paddingTop: 10, marginBottom: 20 }}>
               <Button
diff --git a/packages/legacy/core/__tests__/screens/__snapshots__/Terms.test.tsx.snap b/packages/legacy/core/__tests__/screens/__snapshots__/Terms.test.tsx.snap
index aade8a4b8..bcad013cb 100644
--- a/packages/legacy/core/__tests__/screens/__snapshots__/Terms.test.tsx.snap
+++ b/packages/legacy/core/__tests__/screens/__snapshots__/Terms.test.tsx.snap
@@ -187,175 +187,183 @@ exports[`Terms Screen Button enabled by checkbox being checked 1`] = `
         <View
           style={
             Object {
-              "alignItems": "center",
-              "flex": 1,
-              "flexDirection": "row",
-              "margin": 10,
+              "marginBottom": 0,
             }
           }
         >
           <View
-            accessibilityLabel="Terms.IAgree"
-            accessibilityState={
+            style={
               Object {
-                "busy": undefined,
-                "checked": undefined,
-                "disabled": undefined,
-                "expanded": undefined,
-                "selected": undefined,
+                "alignItems": "center",
+                "flex": 1,
+                "flexDirection": "row",
+                "margin": 10,
               }
             }
-            accessibilityValue={
-              Object {
-                "max": undefined,
-                "min": undefined,
-                "now": undefined,
-                "text": undefined,
+          >
+            <View
+              accessibilityLabel="Terms.IAgree"
+              accessibilityState={
+                Object {
+                  "busy": undefined,
+                  "checked": undefined,
+                  "disabled": undefined,
+                  "expanded": undefined,
+                  "selected": undefined,
+                }
               }
-            }
-            accessible={true}
-            collapsable={false}
-            focusable={true}
-            hitSlop={
-              Object {
-                "bottom": 44,
-                "left": 44,
-                "right": 44,
-                "top": 44,
+              accessibilityValue={
+                Object {
+                  "max": undefined,
+                  "min": undefined,
+                  "now": undefined,
+                  "text": undefined,
+                }
               }
-            }
-            onClick={[Function]}
-            onResponderGrant={[Function]}
-            onResponderMove={[Function]}
-            onResponderRelease={[Function]}
-            onResponderTerminate={[Function]}
-            onResponderTerminationRequest={[Function]}
-            onStartShouldSetResponder={[Function]}
-            style={
-              Object {
-                "opacity": 1,
+              accessible={true}
+              collapsable={false}
+              focusable={true}
+              hitSlop={
+                Object {
+                  "bottom": 44,
+                  "left": 44,
+                  "right": 44,
+                  "top": 44,
+                }
               }
-            }
-            testID="com.ariesbifold:id/IAgree"
-          >
+              onClick={[Function]}
+              onResponderGrant={[Function]}
+              onResponderMove={[Function]}
+              onResponderRelease={[Function]}
+              onResponderTerminate={[Function]}
+              onResponderTerminationRequest={[Function]}
+              onStartShouldSetResponder={[Function]}
+              style={
+                Object {
+                  "opacity": 1,
+                }
+              }
+              testID="com.ariesbifold:id/IAgree"
+            >
+              <Text
+                allowFontScaling={false}
+                selectable={false}
+                style={
+                  Array [
+                    Object {
+                      "color": "#42803E",
+                      "fontSize": 36,
+                    },
+                    undefined,
+                    Object {
+                      "fontFamily": "Material Icons",
+                      "fontStyle": "normal",
+                      "fontWeight": "normal",
+                    },
+                    Object {},
+                  ]
+                }
+              >
+                
+              </Text>
+            </View>
             <Text
-              allowFontScaling={false}
-              selectable={false}
               style={
                 Array [
                   Object {
-                    "color": "#42803E",
-                    "fontSize": 36,
-                  },
-                  undefined,
-                  Object {
-                    "fontFamily": "Material Icons",
-                    "fontStyle": "normal",
+                    "color": "#FFFFFF",
+                    "flexShrink": 1,
+                    "fontSize": 18,
                     "fontWeight": "normal",
+                    "marginLeft": 10,
+                    "marginRight": 0,
                   },
                   Object {},
                 ]
               }
             >
-              
+              Terms.Attestation
             </Text>
           </View>
-          <Text
-            style={
-              Array [
-                Object {
-                  "color": "#FFFFFF",
-                  "flexShrink": 1,
-                  "fontSize": 18,
-                  "fontWeight": "normal",
-                  "marginLeft": 10,
-                  "marginRight": 0,
-                },
-                Object {},
-              ]
-            }
-          >
-            Terms.Attestation
-          </Text>
-        </View>
-        <View
-          style={
-            Object {
-              "paddingTop": 10,
-            }
-          }
-        >
           <View
-            accessibilityLabel="Global.Continue"
-            accessibilityRole="button"
-            accessibilityState={
-              Object {
-                "busy": undefined,
-                "checked": undefined,
-                "disabled": true,
-                "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": "rgba(53, 130, 63, 0.35)",
-                "borderRadius": 4,
-                "opacity": 1,
-                "padding": 16,
+                "paddingTop": 10,
               }
             }
-            testID="com.ariesbifold:id/Continue"
           >
             <View
+              accessibilityLabel="Global.Continue"
+              accessibilityRole="button"
+              accessibilityState={
+                Object {
+                  "busy": undefined,
+                  "checked": undefined,
+                  "disabled": true,
+                  "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 {
-                  "alignItems": "center",
-                  "flexDirection": "row",
-                  "justifyContent": "center",
+                  "backgroundColor": "rgba(53, 130, 63, 0.35)",
+                  "borderRadius": 4,
+                  "opacity": 1,
+                  "padding": 16,
                 }
               }
+              testID="com.ariesbifold:id/Continue"
             >
-              <Text
+              <View
                 style={
-                  Array [
-                    Object {
-                      "color": "#FFFFFF",
-                      "fontSize": 18,
-                      "fontWeight": "bold",
-                      "textAlign": "center",
-                    },
-                    Object {
-                      "color": "#FFFFFF",
-                      "fontSize": 18,
-                      "fontWeight": "bold",
-                      "textAlign": "center",
-                    },
-                    false,
-                    false,
-                  ]
+                  Object {
+                    "alignItems": "center",
+                    "flexDirection": "row",
+                    "justifyContent": "center",
+                  }
                 }
               >
-                Global.Continue
-              </Text>
+                <Text
+                  style={
+                    Array [
+                      Object {
+                        "color": "#FFFFFF",
+                        "fontSize": 18,
+                        "fontWeight": "bold",
+                        "textAlign": "center",
+                      },
+                      Object {
+                        "color": "#FFFFFF",
+                        "fontSize": 18,
+                        "fontWeight": "bold",
+                        "textAlign": "center",
+                      },
+                      false,
+                      false,
+                    ]
+                  }
+                >
+                  Global.Continue
+                </Text>
+              </View>
             </View>
           </View>
         </View>
@@ -630,175 +638,183 @@ exports[`Terms Screen Renders correctly 1`] = `
         <View
           style={
             Object {
-              "alignItems": "center",
-              "flex": 1,
-              "flexDirection": "row",
-              "margin": 10,
+              "marginBottom": 0,
             }
           }
         >
           <View
-            accessibilityLabel="Terms.IAgree"
-            accessibilityState={
+            style={
               Object {
-                "busy": undefined,
-                "checked": undefined,
-                "disabled": undefined,
-                "expanded": undefined,
-                "selected": undefined,
+                "alignItems": "center",
+                "flex": 1,
+                "flexDirection": "row",
+                "margin": 10,
               }
             }
-            accessibilityValue={
-              Object {
-                "max": undefined,
-                "min": undefined,
-                "now": undefined,
-                "text": undefined,
+          >
+            <View
+              accessibilityLabel="Terms.IAgree"
+              accessibilityState={
+                Object {
+                  "busy": undefined,
+                  "checked": undefined,
+                  "disabled": undefined,
+                  "expanded": undefined,
+                  "selected": undefined,
+                }
               }
-            }
-            accessible={true}
-            collapsable={false}
-            focusable={true}
-            hitSlop={
-              Object {
-                "bottom": 44,
-                "left": 44,
-                "right": 44,
-                "top": 44,
+              accessibilityValue={
+                Object {
+                  "max": undefined,
+                  "min": undefined,
+                  "now": undefined,
+                  "text": undefined,
+                }
               }
-            }
-            onClick={[Function]}
-            onResponderGrant={[Function]}
-            onResponderMove={[Function]}
-            onResponderRelease={[Function]}
-            onResponderTerminate={[Function]}
-            onResponderTerminationRequest={[Function]}
-            onStartShouldSetResponder={[Function]}
-            style={
-              Object {
-                "opacity": 1,
+              accessible={true}
+              collapsable={false}
+              focusable={true}
+              hitSlop={
+                Object {
+                  "bottom": 44,
+                  "left": 44,
+                  "right": 44,
+                  "top": 44,
+                }
               }
-            }
-            testID="com.ariesbifold:id/IAgree"
-          >
+              onClick={[Function]}
+              onResponderGrant={[Function]}
+              onResponderMove={[Function]}
+              onResponderRelease={[Function]}
+              onResponderTerminate={[Function]}
+              onResponderTerminationRequest={[Function]}
+              onStartShouldSetResponder={[Function]}
+              style={
+                Object {
+                  "opacity": 1,
+                }
+              }
+              testID="com.ariesbifold:id/IAgree"
+            >
+              <Text
+                allowFontScaling={false}
+                selectable={false}
+                style={
+                  Array [
+                    Object {
+                      "color": "#42803E",
+                      "fontSize": 36,
+                    },
+                    undefined,
+                    Object {
+                      "fontFamily": "Material Icons",
+                      "fontStyle": "normal",
+                      "fontWeight": "normal",
+                    },
+                    Object {},
+                  ]
+                }
+              >
+                
+              </Text>
+            </View>
             <Text
-              allowFontScaling={false}
-              selectable={false}
               style={
                 Array [
                   Object {
-                    "color": "#42803E",
-                    "fontSize": 36,
-                  },
-                  undefined,
-                  Object {
-                    "fontFamily": "Material Icons",
-                    "fontStyle": "normal",
+                    "color": "#FFFFFF",
+                    "flexShrink": 1,
+                    "fontSize": 18,
                     "fontWeight": "normal",
+                    "marginLeft": 10,
+                    "marginRight": 0,
                   },
                   Object {},
                 ]
               }
             >
-              
+              Terms.Attestation
             </Text>
           </View>
-          <Text
-            style={
-              Array [
-                Object {
-                  "color": "#FFFFFF",
-                  "flexShrink": 1,
-                  "fontSize": 18,
-                  "fontWeight": "normal",
-                  "marginLeft": 10,
-                  "marginRight": 0,
-                },
-                Object {},
-              ]
-            }
-          >
-            Terms.Attestation
-          </Text>
-        </View>
-        <View
-          style={
-            Object {
-              "paddingTop": 10,
-            }
-          }
-        >
           <View
-            accessibilityLabel="Global.Continue"
-            accessibilityRole="button"
-            accessibilityState={
-              Object {
-                "busy": undefined,
-                "checked": undefined,
-                "disabled": true,
-                "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": "rgba(53, 130, 63, 0.35)",
-                "borderRadius": 4,
-                "opacity": 1,
-                "padding": 16,
+                "paddingTop": 10,
               }
             }
-            testID="com.ariesbifold:id/Continue"
           >
             <View
+              accessibilityLabel="Global.Continue"
+              accessibilityRole="button"
+              accessibilityState={
+                Object {
+                  "busy": undefined,
+                  "checked": undefined,
+                  "disabled": true,
+                  "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 {
-                  "alignItems": "center",
-                  "flexDirection": "row",
-                  "justifyContent": "center",
+                  "backgroundColor": "rgba(53, 130, 63, 0.35)",
+                  "borderRadius": 4,
+                  "opacity": 1,
+                  "padding": 16,
                 }
               }
+              testID="com.ariesbifold:id/Continue"
             >
-              <Text
+              <View
                 style={
-                  Array [
-                    Object {
-                      "color": "#FFFFFF",
-                      "fontSize": 18,
-                      "fontWeight": "bold",
-                      "textAlign": "center",
-                    },
-                    Object {
-                      "color": "#FFFFFF",
-                      "fontSize": 18,
-                      "fontWeight": "bold",
-                      "textAlign": "center",
-                    },
-                    false,
-                    false,
-                  ]
+                  Object {
+                    "alignItems": "center",
+                    "flexDirection": "row",
+                    "justifyContent": "center",
+                  }
                 }
               >
-                Global.Continue
-              </Text>
+                <Text
+                  style={
+                    Array [
+                      Object {
+                        "color": "#FFFFFF",
+                        "fontSize": 18,
+                        "fontWeight": "bold",
+                        "textAlign": "center",
+                      },
+                      Object {
+                        "color": "#FFFFFF",
+                        "fontSize": 18,
+                        "fontWeight": "bold",
+                        "textAlign": "center",
+                      },
+                      false,
+                      false,
+                    ]
+                  }
+                >
+                  Global.Continue
+                </Text>
+              </View>
             </View>
           </View>
         </View>

From 5c0f8ec791d06e6914822d25b20f02a55f9c973c Mon Sep 17 00:00:00 2001
From: Filipe Santos <48060475+fc-santos@users.noreply.github.com>
Date: Thu, 2 Jan 2025 19:57:36 -0500
Subject: [PATCH 2/2] chore: add accessibility props to components and screens
 (#1370)

Signed-off-by: fc-santos <filipesantos@live.ca>
---
 .../App/components/buttons/ToggleButton.tsx   |  4 ++-
 .../core/App/components/chat/ActionSlider.tsx |  1 +
 .../core/App/components/chat/ChatMessage.tsx  |  1 +
 .../App/components/inputs/CheckBoxRow.tsx     |  2 ++
 .../components/listItems/ContactListItem.tsx  |  1 +
 .../core/App/components/misc/InfoBox.tsx      |  6 +++-
 .../core/App/components/misc/NewQRView.tsx    |  2 +-
 .../core/App/components/misc/ScanTab.tsx      |  1 +
 .../misc/VerifierCredentialCard.tsx           |  5 +--
 .../App/components/modals/AppGuideModal.tsx   |  2 +-
 .../core/App/components/record/Record.tsx     |  1 +
 .../components/record/RecordBinaryField.tsx   |  1 +
 .../App/components/record/RecordField.tsx     |  1 +
 .../core/App/components/texts/HeaderTitle.tsx |  2 +-
 .../core/App/components/tour/TourOverlay.tsx  |  6 +++-
 .../legacy/core/App/localization/en/index.ts  |  2 ++
 .../legacy/core/App/localization/fr/index.ts  |  2 ++
 .../core/App/localization/pt-br/index.ts      |  2 ++
 .../openid/components/CredentialRowCard.tsx   |  7 +++-
 .../components/OpenIDCredentialCard.tsx       |  1 +
 packages/legacy/core/App/screens/Language.tsx |  4 ++-
 .../core/App/screens/ListProofRequests.tsx    |  1 +
 .../App/screens/ProofChangeCredential.tsx     |  1 +
 .../App/screens/ProofRequestUsageHistory.tsx  |  1 +
 packages/legacy/core/App/screens/Settings.tsx |  1 +
 .../legacy/core/App/screens/UseBiometry.tsx   |  9 ++---
 .../__snapshots__/ChatMessage.test.tsx.snap   |  9 +++--
 .../__snapshots__/CheckBoxRow.test.tsx.snap   |  3 +-
 .../__snapshots__/InfoBox.test.tsx.snap       |  4 +++
 .../__snapshots__/NewQRView.test.tsx.snap     |  8 +++++
 .../RecordBinaryField.test.tsx.snap           |  1 +
 .../__snapshots__/RecordField.test.tsx.snap   |  1 +
 .../__snapshots__/ScanTab.test.tsx.snap       |  1 +
 .../__snapshots__/ToggleButton.test.tsx.snap  |  6 ++--
 .../__snapshots__/TourOverlay.test.tsx.snap   |  1 +
 .../__snapshots__/ErrorModal.test.tsx.snap    |  1 +
 .../__tests__/screens/UseBiometry.test.tsx    | 26 +++++++--------
 .../__snapshots__/ListContacts.test.tsx.snap  |  3 ++
 .../ListProofRequests.test.tsx.snap           |  2 ++
 .../__snapshots__/Preface.test.tsx.snap       |  6 ++--
 .../__snapshots__/Settings.test.tsx.snap      |  7 ++++
 .../screens/__snapshots__/Terms.test.tsx.snap |  6 ++--
 .../__snapshots__/UseBiometry.test.tsx.snap   | 33 ++++++++++++++-----
 43 files changed, 138 insertions(+), 47 deletions(-)

diff --git a/packages/legacy/core/App/components/buttons/ToggleButton.tsx b/packages/legacy/core/App/components/buttons/ToggleButton.tsx
index dc6f41f8f..79f2fe21f 100644
--- a/packages/legacy/core/App/components/buttons/ToggleButton.tsx
+++ b/packages/legacy/core/App/components/buttons/ToggleButton.tsx
@@ -2,6 +2,7 @@ import React, { useState, useEffect } from 'react'
 import { Pressable, Animated } from 'react-native'
 import Icon from 'react-native-vector-icons/MaterialIcons'
 import { useTheme } from '../../contexts/theme'
+import { useTranslation } from 'react-i18next'
 
 interface ToggleButtonProps {
   isEnabled: boolean
@@ -24,6 +25,7 @@ const ToggleButton: React.FC<ToggleButtonProps> = ({
 }) => {
   const { ColorPallet } = useTheme()
   const [toggleAnim] = useState(new Animated.Value(isEnabled ? 1 : 0))
+  const { t } = useTranslation()
 
   useEffect(() => {
     Animated.timing(toggleAnim, {
@@ -47,7 +49,7 @@ const ToggleButton: React.FC<ToggleButtonProps> = ({
     <Pressable
       accessible
       testID={testID}
-      accessibilityLabel="Toggle Button"
+      accessibilityLabel={isEnabled ? t('Biometry.On') : t('Biometry.Off')}
       accessibilityRole="switch"
       accessibilityState={{
         checked: isEnabled,
diff --git a/packages/legacy/core/App/components/chat/ActionSlider.tsx b/packages/legacy/core/App/components/chat/ActionSlider.tsx
index 32a50506d..ea886acfa 100644
--- a/packages/legacy/core/App/components/chat/ActionSlider.tsx
+++ b/packages/legacy/core/App/components/chat/ActionSlider.tsx
@@ -85,6 +85,7 @@ const ActionSlider: React.FC<Props> = ({ actions, onDismiss }) => {
                   key={action.text}
                   testID={testIdWithKey(action.text)}
                   accessibilityLabel={testIdWithKey(action.text)}
+                  accessibilityRole="button"
                   style={styles.drawerRow}
                   onPress={action.onPress}
                 >
diff --git a/packages/legacy/core/App/components/chat/ChatMessage.tsx b/packages/legacy/core/App/components/chat/ChatMessage.tsx
index 85740b650..b7ece6ff6 100644
--- a/packages/legacy/core/App/components/chat/ChatMessage.tsx
+++ b/packages/legacy/core/App/components/chat/ChatMessage.tsx
@@ -121,6 +121,7 @@ export const ChatMessage: React.FC<ChatMessageProps> = ({ messageProps }) => {
         {message.messageOpensCallbackType && (
           <TouchableOpacity
             accessibilityLabel={textForCallbackType(message.messageOpensCallbackType)}
+            accessibilityRole="button"
             testID={testIdForCallbackType(message.messageOpensCallbackType)}
             onPress={() => {
               if (message.onDetails) message.onDetails()
diff --git a/packages/legacy/core/App/components/inputs/CheckBoxRow.tsx b/packages/legacy/core/App/components/inputs/CheckBoxRow.tsx
index 9a5a62276..3127761d9 100644
--- a/packages/legacy/core/App/components/inputs/CheckBoxRow.tsx
+++ b/packages/legacy/core/App/components/inputs/CheckBoxRow.tsx
@@ -46,6 +46,8 @@ const CheckBoxRow: React.FC<Props> = ({
       <TouchableOpacity
         accessible={accessible}
         accessibilityLabel={accessibilityLabel}
+        accessibilityRole="checkbox"
+        accessibilityState={{ checked }}
         testID={testID}
         onPress={onPress}
         hitSlop={hitSlop}
diff --git a/packages/legacy/core/App/components/listItems/ContactListItem.tsx b/packages/legacy/core/App/components/listItems/ContactListItem.tsx
index cb5fec12a..d1d01fcf9 100644
--- a/packages/legacy/core/App/components/listItems/ContactListItem.tsx
+++ b/packages/legacy/core/App/components/listItems/ContactListItem.tsx
@@ -90,6 +90,7 @@ const ContactListItem: React.FC<ContactListItemProps> = ({ contact, navigation }
       onPress={navigateToContact}
       testID={testIdWithKey('Contact')}
       accessibilityLabel={t('ContactDetails.AContact')}
+      accessibilityRole="button"
     >
       <View style={styles.container}>
         <View style={styles.avatarContainer}>
diff --git a/packages/legacy/core/App/components/misc/InfoBox.tsx b/packages/legacy/core/App/components/misc/InfoBox.tsx
index c5a049426..caef7a965 100644
--- a/packages/legacy/core/App/components/misc/InfoBox.tsx
+++ b/packages/legacy/core/App/components/misc/InfoBox.tsx
@@ -223,6 +223,7 @@ const InfoBox: React.FC<InfoBoxProps> = ({
           {message && !showDetails && (showDetailsInfo ?? true) && (
             <TouchableOpacity
               accessibilityLabel={t('Global.ShowDetails')}
+              accessibilityRole="button"
               testID={testIdWithKey('ShowDetails')}
               style={{ marginVertical: 14 }}
               onPress={onShowDetailsTouched}
@@ -263,7 +264,10 @@ const InfoBox: React.FC<InfoBoxProps> = ({
             </View>
           )}
           {showVersionFooter ? (
-            <Text style={[TextTheme.caption, { flex: 1, marginTop: 8, textAlign: 'center' }]} testID={testIdWithKey('VersionNumber')}>
+            <Text
+              style={[TextTheme.caption, { flex: 1, marginTop: 8, textAlign: 'center' }]}
+              testID={testIdWithKey('VersionNumber')}
+            >
               {`${t('Settings.Version')} ${getVersion()} (${getBuildNumber()})`}
             </Text>
           ) : null}
diff --git a/packages/legacy/core/App/components/misc/NewQRView.tsx b/packages/legacy/core/App/components/misc/NewQRView.tsx
index 20948f65b..3fb03f44c 100644
--- a/packages/legacy/core/App/components/misc/NewQRView.tsx
+++ b/packages/legacy/core/App/components/misc/NewQRView.tsx
@@ -327,7 +327,7 @@ const NewQRView: React.FC<Props> = ({ defaultToConnect, handleCodeScan, error, e
           </ScrollView>
         )}
 
-        <View style={styles.tabContainer}>
+        <View accessible={true} style={styles.tabContainer} accessibilityRole="tablist">
           <ScanTab
             title={t('Scan.ScanQRCode')}
             iconName={'crop-free'}
diff --git a/packages/legacy/core/App/components/misc/ScanTab.tsx b/packages/legacy/core/App/components/misc/ScanTab.tsx
index 7f8a872fd..820732614 100644
--- a/packages/legacy/core/App/components/misc/ScanTab.tsx
+++ b/packages/legacy/core/App/components/misc/ScanTab.tsx
@@ -32,6 +32,7 @@ const ScanTab: React.FC<ScanTabProps> = ({ onPress, active, iconName, title }) =
       style={styles.container}
       onPress={onPress}
       accessibilityLabel={title}
+      accessibilityRole="tab"
       testID={testIdWithKey(title)}
     >
       <Icon name={iconName} size={30} color={styles.text.color}></Icon>
diff --git a/packages/legacy/core/App/components/misc/VerifierCredentialCard.tsx b/packages/legacy/core/App/components/misc/VerifierCredentialCard.tsx
index ef2e57563..5054da6ca 100644
--- a/packages/legacy/core/App/components/misc/VerifierCredentialCard.tsx
+++ b/packages/legacy/core/App/components/misc/VerifierCredentialCard.tsx
@@ -139,7 +139,7 @@ const VerifierCredentialCard: React.FC<VerifierCredentialCardProps> = ({
       language: i18n.language,
     }
     bundleResolver.resolveAllBundles(params).then((bundle) => {
-      setOverlay(o => ({
+      setOverlay((o) => ({
         ...o,
         ...bundle,
         brandingOverlay: bundle.brandingOverlay as BrandingOverlay,
@@ -185,7 +185,7 @@ const VerifierCredentialCard: React.FC<VerifierCredentialCardProps> = ({
     const [showImageModal, setShowImageModal] = useState(false)
 
     useEffect(() => {
-      setValue(v => formatIfDate(item.format, v))
+      setValue((v) => formatIfDate(item.format, v))
     }, [item.format])
 
     return (
@@ -208,6 +208,7 @@ const VerifierCredentialCard: React.FC<VerifierCredentialCardProps> = ({
             {isDataUrl(value) ? (
               <TouchableOpacity
                 accessibilityLabel={t('Record.Zoom')}
+                accessibilityRole="imagebutton"
                 testID={testIdWithKey('zoom')}
                 onPress={() => setShowImageModal(true)}
               >
diff --git a/packages/legacy/core/App/components/modals/AppGuideModal.tsx b/packages/legacy/core/App/components/modals/AppGuideModal.tsx
index 06e4a639d..aeb08c0d9 100644
--- a/packages/legacy/core/App/components/modals/AppGuideModal.tsx
+++ b/packages/legacy/core/App/components/modals/AppGuideModal.tsx
@@ -79,7 +79,7 @@ const AppGuideModal: React.FC<AppGuideModalProps> = ({
   })
 
   return (
-    <Modal transparent>
+    <Modal transparent accessibilityViewIsModal>
       <View style={styles.modalCenter}>
         <View style={styles.container}>
           <View style={styles.headerContainer}>
diff --git a/packages/legacy/core/App/components/record/Record.tsx b/packages/legacy/core/App/components/record/Record.tsx
index 89fef2342..0836f00be 100644
--- a/packages/legacy/core/App/components/record/Record.tsx
+++ b/packages/legacy/core/App/components/record/Record.tsx
@@ -79,6 +79,7 @@ const Record: React.FC<RecordProps> = ({ header, footer, fields, hideFieldValues
                   testID={testIdWithKey('HideAll')}
                   accessible={true}
                   accessibilityLabel={t('Record.HideAll')}
+                  accessibilityRole="button"
                 >
                   <Text style={ListItems.recordLink}>{t('Record.HideAll')}</Text>
                 </TouchableOpacity>
diff --git a/packages/legacy/core/App/components/record/RecordBinaryField.tsx b/packages/legacy/core/App/components/record/RecordBinaryField.tsx
index b6ffd24ce..993b12d47 100644
--- a/packages/legacy/core/App/components/record/RecordBinaryField.tsx
+++ b/packages/legacy/core/App/components/record/RecordBinaryField.tsx
@@ -37,6 +37,7 @@ const RecordBinaryField: React.FC<RecordBinaryFieldProps> = ({ attributeValue, s
           accessibilityLabel={t('Record.Zoom')}
           testID={testIdWithKey('zoom')}
           onPress={() => setShowImageModal(true)}
+          accessibilityRole="imagebutton"
         >
           <Image style={styles.image} source={{ uri: attributeValue }} />
         </TouchableOpacity>
diff --git a/packages/legacy/core/App/components/record/RecordField.tsx b/packages/legacy/core/App/components/record/RecordField.tsx
index 324169fad..b5d539754 100644
--- a/packages/legacy/core/App/components/record/RecordField.tsx
+++ b/packages/legacy/core/App/components/record/RecordField.tsx
@@ -107,6 +107,7 @@ const RecordField: React.FC<RecordFieldProps> = ({
           <TouchableOpacity
             accessible={true}
             accessibilityLabel={shown ? t('Record.Hide') : t('Record.Show')}
+            accessibilityRole="button"
             testID={testIdWithKey('ShowHide')}
             activeOpacity={1}
             onPress={onToggleViewPressed}
diff --git a/packages/legacy/core/App/components/texts/HeaderTitle.tsx b/packages/legacy/core/App/components/texts/HeaderTitle.tsx
index 41d566718..12dfe3c86 100644
--- a/packages/legacy/core/App/components/texts/HeaderTitle.tsx
+++ b/packages/legacy/core/App/components/texts/HeaderTitle.tsx
@@ -19,7 +19,7 @@ const HeaderTitle: React.FC<Props> = ({ children }) => {
   })
 
   return (
-    <Text numberOfLines={1} ellipsizeMode="tail" style={styles.title}>
+    <Text accessibilityRole="header" numberOfLines={1} ellipsizeMode="tail" style={styles.title}>
       {children}
     </Text>
   )
diff --git a/packages/legacy/core/App/components/tour/TourOverlay.tsx b/packages/legacy/core/App/components/tour/TourOverlay.tsx
index 00edc84bd..a853ee5d9 100644
--- a/packages/legacy/core/App/components/tour/TourOverlay.tsx
+++ b/packages/legacy/core/App/components/tour/TourOverlay.tsx
@@ -85,7 +85,11 @@ export const TourOverlay = (props: TourOverlayProps) => {
   }, [windowWidth, windowHeight])
 
   return currentStep !== undefined ? (
-    <View style={{ position: 'absolute', top: 0, left: 0, height: windowHeight + 1, width: windowWidth + 1 }} testID={testIdWithKey('SpotlightOverlay')}>
+    <View
+      accessibilityViewIsModal
+      style={{ position: 'absolute', top: 0, left: 0, height: windowHeight + 1, width: windowWidth + 1 }}
+      testID={testIdWithKey('SpotlightOverlay')}
+    >
       <Svg
         testID={testIdWithKey('SpotOverlay')}
         height={windowHeight + 1}
diff --git a/packages/legacy/core/App/localization/en/index.ts b/packages/legacy/core/App/localization/en/index.ts
index 637db03ae..3e7d03fb5 100644
--- a/packages/legacy/core/App/localization/en/index.ts
+++ b/packages/legacy/core/App/localization/en/index.ts
@@ -279,6 +279,8 @@ const translation = {
   },
   "Biometry": {
     "Toggle": "Toggle Biometrics",
+    "On": "Biomtrics On",
+    "Off": "Biometrics Off",
     "EnabledText1": "Unlock the wallet with your phone's biometrics instead of your wallet PIN.",
     "EnabledText2": "Using biometrics means that all fingerprints or face ID added on this phone will have access to your wallet.",
     "NotEnabledText1": "Biometrics is not currently setup on this device and therefore cannot be enabled.",
diff --git a/packages/legacy/core/App/localization/fr/index.ts b/packages/legacy/core/App/localization/fr/index.ts
index 949dca777..4fe919d42 100644
--- a/packages/legacy/core/App/localization/fr/index.ts
+++ b/packages/legacy/core/App/localization/fr/index.ts
@@ -278,6 +278,8 @@ const translation = {
     },
     "Biometry": {
         "Toggle": "Basculer la biométrie",
+        "On": "Biométrie Activée",
+        "Off": "Biométrie Desactivée",
         "EnabledText1": "Déverrouiller votre portefeuille avec la biométrie de votre appareil au lieu d’utiliser le NIP du portefeuille.",
         "EnabledText2": "Toute personne qui a des données biométriques enregistrées sur cet appareil pourra déverrouiller votre portefeuille et avoir accès à vos attestations.",
         "NotEnabledText1": "La biométrie n'est pas actuellement configurée sur cet appareil et ne peut donc pas être activée.",
diff --git a/packages/legacy/core/App/localization/pt-br/index.ts b/packages/legacy/core/App/localization/pt-br/index.ts
index 8ef9a81b1..1ae6946fb 100644
--- a/packages/legacy/core/App/localization/pt-br/index.ts
+++ b/packages/legacy/core/App/localization/pt-br/index.ts
@@ -256,6 +256,8 @@ const translation = {
   },
   "Biometry": {
     "Toggle": "Habilitar Biometria",
+    "On": "Biometria ativada",
+    "Off": "Biometria desativada",
     "EnabledText1": "Destravar a carteira utilizando a biometria de seu telefone ao invés do seu PIN.",
     "EnabledText2": "Usar a biometria significa que todas impressões digitais ou face ID adicionadas neste telefone terão acesso à sua carteira.",
     "NotEnabledText1": "Biometria não está configurada nesse dispositivo e portanto não pode ser habilitada.",
diff --git a/packages/legacy/core/App/modules/openid/components/CredentialRowCard.tsx b/packages/legacy/core/App/modules/openid/components/CredentialRowCard.tsx
index 2f9fa1962..edf8fe1f0 100644
--- a/packages/legacy/core/App/modules/openid/components/CredentialRowCard.tsx
+++ b/packages/legacy/core/App/modules/openid/components/CredentialRowCard.tsx
@@ -46,7 +46,12 @@ export function OpenIDCredentialRowCard({ name, issuer, bgColor, bgImage, txtCol
   //
   return (
     <View style={style.container}>
-      <TouchableOpacity onPress={onPress} style={style.rowContainer}>
+      <TouchableOpacity
+        onPress={onPress}
+        style={style.rowContainer}
+        accessibilityLabel={name}
+        accessibilityRole="button"
+      >
         <View style={[style.issuerBadge, bgColor ? { backgroundColor: bgColor } : {}]}>
           {bgImage ? <Image style={style.imageStyle} source={{ uri: bgImage }} resizeMode="cover" /> : null}
         </View>
diff --git a/packages/legacy/core/App/modules/openid/components/OpenIDCredentialCard.tsx b/packages/legacy/core/App/modules/openid/components/OpenIDCredentialCard.tsx
index bc36f607b..5a9e392b3 100644
--- a/packages/legacy/core/App/modules/openid/components/OpenIDCredentialCard.tsx
+++ b/packages/legacy/core/App/modules/openid/components/OpenIDCredentialCard.tsx
@@ -227,6 +227,7 @@ const OpenIDCredentialCard: React.FC<CredentialCardProps> = ({
       accessibilityLabel={`${display?.issuer.name ? `${t('Credentials.IssuedBy')} ${display?.issuer.name}` : ''}, ${t(
         'Credentials.Credential'
       )}.`}
+      accessibilityRole="button"
       disabled={typeof onPress === 'undefined' ? true : false}
       onPress={onPress}
       style={[styles.container, style]}
diff --git a/packages/legacy/core/App/screens/Language.tsx b/packages/legacy/core/App/screens/Language.tsx
index a558a1a81..716799537 100644
--- a/packages/legacy/core/App/screens/Language.tsx
+++ b/packages/legacy/core/App/screens/Language.tsx
@@ -67,7 +67,9 @@ const Language = () => {
             <View style={[styles.section, styles.sectionRow]}>
               <Text style={TextTheme.title}>{value}</Text>
               <BouncyCheckbox
-                accessibilityLabel={value}
+                accessibilityLabel={''} // To avoid Voice Over reading the value twice (one time from the text component and another time from the BouncyCheckbox component)
+                accessibilityRole="radio"
+                accessibilityState={{ checked: id === i18n.language }}
                 disableText
                 fillColor={ColorPallet.brand.secondaryBackground}
                 unfillColor={ColorPallet.brand.secondaryBackground}
diff --git a/packages/legacy/core/App/screens/ListProofRequests.tsx b/packages/legacy/core/App/screens/ListProofRequests.tsx
index 7d5ad19c2..e0fa02f21 100644
--- a/packages/legacy/core/App/screens/ListProofRequests.tsx
+++ b/packages/legacy/core/App/screens/ListProofRequests.tsx
@@ -83,6 +83,7 @@ const ProofRequestsCard: React.FC<ProofRequestsCardProps> = ({ navigation, templ
       style={style.card}
       onPress={() => navigation.navigate(Screens.ProofRequestDetails, { templateId: template.id, connectionId })}
       accessibilityLabel={t('Screens.ProofRequestDetails')}
+      accessibilityRole="button"
       testID={testIdWithKey('ProofRequestsCard')}
     >
       <View style={style.textContainer}>
diff --git a/packages/legacy/core/App/screens/ProofChangeCredential.tsx b/packages/legacy/core/App/screens/ProofChangeCredential.tsx
index 2bd1d6c6f..c173c4798 100644
--- a/packages/legacy/core/App/screens/ProofChangeCredential.tsx
+++ b/packages/legacy/core/App/screens/ProofChangeCredential.tsx
@@ -153,6 +153,7 @@ const ProofChangeCredential: React.FC<ProofChangeProps> = ({ route, navigation }
           return (
             <View style={styles.pageMargin}>
               <TouchableOpacity
+                accessibilityRole="button"
                 testID={testIdWithKey(`select:${item.credId}`)}
                 onPress={() => changeCred(item.credId ?? '')}
                 style={[item.credId === selectedCred ? styles.selectedCred : undefined, { marginBottom: 10 }]}
diff --git a/packages/legacy/core/App/screens/ProofRequestUsageHistory.tsx b/packages/legacy/core/App/screens/ProofRequestUsageHistory.tsx
index aabc45230..3c41c4e92 100644
--- a/packages/legacy/core/App/screens/ProofRequestUsageHistory.tsx
+++ b/packages/legacy/core/App/screens/ProofRequestUsageHistory.tsx
@@ -98,6 +98,7 @@ const ProofRequestUsageHistoryRecord: React.FC<ProofRequestUsageHistoryRecordPro
       onPress={onDetails}
       disabled={!presentationReceived}
       accessibilityLabel={t('Screens.ProofDetails')}
+      accessibilityRole="button"
       testID={testIdWithKey('ProofDetails')}
     >
       <View style={style.leftContainer}>
diff --git a/packages/legacy/core/App/screens/Settings.tsx b/packages/legacy/core/App/screens/Settings.tsx
index 49038ab29..eb80c5fbe 100644
--- a/packages/legacy/core/App/screens/Settings.tsx
+++ b/packages/legacy/core/App/screens/Settings.tsx
@@ -339,6 +339,7 @@ const Settings: React.FC<SettingsProps> = ({ navigation }) => {
       <TouchableOpacity
         accessible={true}
         accessibilityLabel={accessibilityLabel}
+        accessibilityRole="button"
         testID={testID}
         style={styles.sectionRow}
         onPress={onPress}
diff --git a/packages/legacy/core/App/screens/UseBiometry.tsx b/packages/legacy/core/App/screens/UseBiometry.tsx
index b58977a82..ce004e48a 100644
--- a/packages/legacy/core/App/screens/UseBiometry.tsx
+++ b/packages/legacy/core/App/screens/UseBiometry.tsx
@@ -61,6 +61,9 @@ const UseBiometry: React.FC = () => {
       minHeight: 200,
       marginBottom: 66,
     },
+    biometryAvailableRowGap: {
+      rowGap: 20,
+    },
   })
 
   useEffect(() => {
@@ -281,18 +284,16 @@ const UseBiometry: React.FC = () => {
           <Assets.svg.biometrics style={styles.image} />
         </View>
         {biometryAvailable ? (
-          <View>
+          <View style={styles.biometryAvailableRowGap}>
             <Text style={TextTheme.normal}>{t('Biometry.EnabledText1')}</Text>
-            <Text></Text>
             <Text style={TextTheme.normal}>
               {t('Biometry.EnabledText2')}
               <Text style={TextTheme.bold}> {t('Biometry.Warning')}</Text>
             </Text>
           </View>
         ) : (
-          <View>
+          <View style={styles.biometryAvailableRowGap}>
             <Text style={TextTheme.normal}>{t('Biometry.NotEnabledText1')}</Text>
-            <Text></Text>
             <Text style={TextTheme.normal}>{t('Biometry.NotEnabledText2')}</Text>
           </View>
         )}
diff --git a/packages/legacy/core/__tests__/components/__snapshots__/ChatMessage.test.tsx.snap b/packages/legacy/core/__tests__/components/__snapshots__/ChatMessage.test.tsx.snap
index 0c1082c1b..90ae5297b 100644
--- a/packages/legacy/core/__tests__/components/__snapshots__/ChatMessage.test.tsx.snap
+++ b/packages/legacy/core/__tests__/components/__snapshots__/ChatMessage.test.tsx.snap
@@ -123,7 +123,7 @@ exports[`ChatMessage Credential offer renders correctly 1`] = `
                 ]
               }
             >
-              Jan 1, 12:00 am
+              Jan 1, 2024, 12:00 am
             </Text>
           </View>
         </View>
@@ -131,6 +131,7 @@ exports[`ChatMessage Credential offer renders correctly 1`] = `
     </View>
     <View
       accessibilityLabel="Chat.ViewOffer"
+      accessibilityRole="button"
       accessibilityState={
         Object {
           "busy": undefined,
@@ -324,7 +325,7 @@ exports[`ChatMessage Proof request renders correctly 1`] = `
                 ]
               }
             >
-              Jan 1, 12:00 am
+              Jan 1, 2024, 12:00 am
             </Text>
           </View>
         </View>
@@ -332,6 +333,7 @@ exports[`ChatMessage Proof request renders correctly 1`] = `
     </View>
     <View
       accessibilityLabel="Chat.ViewRequest"
+      accessibilityRole="button"
       accessibilityState={
         Object {
           "busy": undefined,
@@ -525,7 +527,7 @@ exports[`ChatMessage Sent presentation renders correctly 1`] = `
                 ]
               }
             >
-              Jan 1, 12:00 am
+              Jan 1, 2024, 12:00 am
             </Text>
           </View>
         </View>
@@ -533,6 +535,7 @@ exports[`ChatMessage Sent presentation renders correctly 1`] = `
     </View>
     <View
       accessibilityLabel="Chat.OpenPresentation"
+      accessibilityRole="button"
       accessibilityState={
         Object {
           "busy": undefined,
diff --git a/packages/legacy/core/__tests__/components/__snapshots__/CheckBoxRow.test.tsx.snap b/packages/legacy/core/__tests__/components/__snapshots__/CheckBoxRow.test.tsx.snap
index b8dde0922..376f1c0e3 100644
--- a/packages/legacy/core/__tests__/components/__snapshots__/CheckBoxRow.test.tsx.snap
+++ b/packages/legacy/core/__tests__/components/__snapshots__/CheckBoxRow.test.tsx.snap
@@ -13,10 +13,11 @@ exports[`CheckBoxRow Component Renders correctly 1`] = `
 >
   <View
     accessibilityLabel="Hey"
+    accessibilityRole="checkbox"
     accessibilityState={
       Object {
         "busy": undefined,
-        "checked": undefined,
+        "checked": true,
         "disabled": undefined,
         "expanded": undefined,
         "selected": undefined,
diff --git a/packages/legacy/core/__tests__/components/__snapshots__/InfoBox.test.tsx.snap b/packages/legacy/core/__tests__/components/__snapshots__/InfoBox.test.tsx.snap
index 7c698cd9d..f7e3b85b4 100644
--- a/packages/legacy/core/__tests__/components/__snapshots__/InfoBox.test.tsx.snap
+++ b/packages/legacy/core/__tests__/components/__snapshots__/InfoBox.test.tsx.snap
@@ -88,6 +88,7 @@ exports[`InfoBox Component Renders correctly as Error 1`] = `
     <View>
       <View
         accessibilityLabel="Global.ShowDetails"
+        accessibilityRole="button"
         accessibilityState={
           Object {
             "busy": undefined,
@@ -342,6 +343,7 @@ exports[`InfoBox Component Renders correctly as Info 1`] = `
     <View>
       <View
         accessibilityLabel="Global.ShowDetails"
+        accessibilityRole="button"
         accessibilityState={
           Object {
             "busy": undefined,
@@ -596,6 +598,7 @@ exports[`InfoBox Component Renders correctly as Success 1`] = `
     <View>
       <View
         accessibilityLabel="Global.ShowDetails"
+        accessibilityRole="button"
         accessibilityState={
           Object {
             "busy": undefined,
@@ -850,6 +853,7 @@ exports[`InfoBox Component Renders correctly as Warning 1`] = `
     <View>
       <View
         accessibilityLabel="Global.ShowDetails"
+        accessibilityRole="button"
         accessibilityState={
           Object {
             "busy": undefined,
diff --git a/packages/legacy/core/__tests__/components/__snapshots__/NewQRView.test.tsx.snap b/packages/legacy/core/__tests__/components/__snapshots__/NewQRView.test.tsx.snap
index 58bb0d03d..09736368f 100644
--- a/packages/legacy/core/__tests__/components/__snapshots__/NewQRView.test.tsx.snap
+++ b/packages/legacy/core/__tests__/components/__snapshots__/NewQRView.test.tsx.snap
@@ -377,6 +377,8 @@ Array [
       </View>
     </View>
     <View
+      accessibilityRole="tablist"
+      accessible={true}
       style={
         Object {
           "backgroundColor": "#313132",
@@ -396,6 +398,7 @@ Array [
     >
       <View
         accessibilityLabel="Scan.ScanQRCode"
+        accessibilityRole="tab"
         accessibilityState={
           Object {
             "busy": undefined,
@@ -457,6 +460,7 @@ Array [
       </View>
       <View
         accessibilityLabel="Scan.MyQRCode"
+        accessibilityRole="tab"
         accessibilityState={
           Object {
             "busy": undefined,
@@ -744,6 +748,8 @@ Array [
       </View>
     </RCTScrollView>
     <View
+      accessibilityRole="tablist"
+      accessible={true}
       style={
         Object {
           "backgroundColor": "#313132",
@@ -763,6 +769,7 @@ Array [
     >
       <View
         accessibilityLabel="Scan.ScanQRCode"
+        accessibilityRole="tab"
         accessibilityState={
           Object {
             "busy": undefined,
@@ -824,6 +831,7 @@ Array [
       </View>
       <View
         accessibilityLabel="Scan.MyQRCode"
+        accessibilityRole="tab"
         accessibilityState={
           Object {
             "busy": undefined,
diff --git a/packages/legacy/core/__tests__/components/__snapshots__/RecordBinaryField.test.tsx.snap b/packages/legacy/core/__tests__/components/__snapshots__/RecordBinaryField.test.tsx.snap
index 81babb567..571027945 100644
--- a/packages/legacy/core/__tests__/components/__snapshots__/RecordBinaryField.test.tsx.snap
+++ b/packages/legacy/core/__tests__/components/__snapshots__/RecordBinaryField.test.tsx.snap
@@ -4,6 +4,7 @@ exports[`RecordBinaryField Component Base64 render field value as image 1`] = `
 <View>
   <View
     accessibilityLabel="Record.Zoom"
+    accessibilityRole="imagebutton"
     accessibilityState={
       Object {
         "busy": undefined,
diff --git a/packages/legacy/core/__tests__/components/__snapshots__/RecordField.test.tsx.snap b/packages/legacy/core/__tests__/components/__snapshots__/RecordField.test.tsx.snap
index 479424c63..b5466de54 100644
--- a/packages/legacy/core/__tests__/components/__snapshots__/RecordField.test.tsx.snap
+++ b/packages/legacy/core/__tests__/components/__snapshots__/RecordField.test.tsx.snap
@@ -54,6 +54,7 @@ exports[`RecordField Component Shown binary field should render a binary field 1
       <View>
         <View
           accessibilityLabel="Record.Zoom"
+          accessibilityRole="imagebutton"
           accessibilityState={
             Object {
               "busy": undefined,
diff --git a/packages/legacy/core/__tests__/components/__snapshots__/ScanTab.test.tsx.snap b/packages/legacy/core/__tests__/components/__snapshots__/ScanTab.test.tsx.snap
index f54699700..66cc59b6d 100644
--- a/packages/legacy/core/__tests__/components/__snapshots__/ScanTab.test.tsx.snap
+++ b/packages/legacy/core/__tests__/components/__snapshots__/ScanTab.test.tsx.snap
@@ -3,6 +3,7 @@
 exports[`ScanTab Component Renders correctly 1`] = `
 <View
   accessibilityLabel="title"
+  accessibilityRole="tab"
   accessibilityState={
     Object {
       "busy": undefined,
diff --git a/packages/legacy/core/__tests__/components/__snapshots__/ToggleButton.test.tsx.snap b/packages/legacy/core/__tests__/components/__snapshots__/ToggleButton.test.tsx.snap
index ba55974da..19020f357 100644
--- a/packages/legacy/core/__tests__/components/__snapshots__/ToggleButton.test.tsx.snap
+++ b/packages/legacy/core/__tests__/components/__snapshots__/ToggleButton.test.tsx.snap
@@ -2,7 +2,7 @@
 
 exports[`ToggleButton Component renders correctly when disabled 1`] = `
 <View
-  accessibilityLabel="Toggle Button"
+  accessibilityLabel="Biometry.Off"
   accessibilityRole="switch"
   accessibilityState={
     Object {
@@ -95,7 +95,7 @@ exports[`ToggleButton Component renders correctly when disabled 1`] = `
 
 exports[`ToggleButton Component renders correctly when enabled 1`] = `
 <View
-  accessibilityLabel="Toggle Button"
+  accessibilityLabel="Biometry.On"
   accessibilityRole="switch"
   accessibilityState={
     Object {
@@ -188,7 +188,7 @@ exports[`ToggleButton Component renders correctly when enabled 1`] = `
 
 exports[`ToggleButton Component renders correctly when not available 1`] = `
 <View
-  accessibilityLabel="Toggle Button"
+  accessibilityLabel="Biometry.Off"
   accessibilityRole="switch"
   accessibilityState={
     Object {
diff --git a/packages/legacy/core/__tests__/components/__snapshots__/TourOverlay.test.tsx.snap b/packages/legacy/core/__tests__/components/__snapshots__/TourOverlay.test.tsx.snap
index 98d37ec16..ade9a74ec 100644
--- a/packages/legacy/core/__tests__/components/__snapshots__/TourOverlay.test.tsx.snap
+++ b/packages/legacy/core/__tests__/components/__snapshots__/TourOverlay.test.tsx.snap
@@ -2,6 +2,7 @@
 
 exports[`TourOverlay Component Renders properly with defaults 1`] = `
 <View
+  accessibilityViewIsModal={true}
   style={
     Object {
       "height": 1335,
diff --git a/packages/legacy/core/__tests__/modals/__snapshots__/ErrorModal.test.tsx.snap b/packages/legacy/core/__tests__/modals/__snapshots__/ErrorModal.test.tsx.snap
index bc9bbf68c..c1f93987b 100644
--- a/packages/legacy/core/__tests__/modals/__snapshots__/ErrorModal.test.tsx.snap
+++ b/packages/legacy/core/__tests__/modals/__snapshots__/ErrorModal.test.tsx.snap
@@ -112,6 +112,7 @@ exports[`ErrorModal Component Renders correctly 1`] = `
         <View>
           <View
             accessibilityLabel="Global.ShowDetails"
+            accessibilityRole="button"
             accessibilityState={
               Object {
                 "busy": undefined,
diff --git a/packages/legacy/core/__tests__/screens/UseBiometry.test.tsx b/packages/legacy/core/__tests__/screens/UseBiometry.test.tsx
index cd08e5290..ed222ce03 100644
--- a/packages/legacy/core/__tests__/screens/UseBiometry.test.tsx
+++ b/packages/legacy/core/__tests__/screens/UseBiometry.test.tsx
@@ -13,8 +13,8 @@ import { StoreProvider } from '../../App/contexts/store'
 import { RESULTS, check, request } from 'react-native-permissions'
 
 jest.mock('react-native-permissions', () => require('react-native-permissions/mock'))
-const mockedCheck = check as jest.MockedFunction<typeof check>;
-const mockedRequest = request as jest.MockedFunction<typeof request>;
+const mockedCheck = check as jest.MockedFunction<typeof check>
+const mockedRequest = request as jest.MockedFunction<typeof request>
 
 jest.spyOn(Linking, 'openSettings').mockImplementation(() => Promise.resolve())
 
@@ -22,14 +22,14 @@ const customStore = {
   ...testDefaultState,
   preferences: {
     ...testDefaultState.preferences,
-    useBiometry: false
+    useBiometry: false,
   },
 }
 
 describe('UseBiometry Screen', () => {
   beforeAll(() => {
     // eslint-disable-next-line @typescript-eslint/no-empty-function
-    jest.spyOn(global.console, 'error').mockImplementation(() => { })
+    jest.spyOn(global.console, 'error').mockImplementation(() => {})
   })
 
   beforeEach(() => {
@@ -110,7 +110,7 @@ describe('UseBiometry Screen', () => {
       const { getByTestId } = render(
         <BasicAppContext>
           <AuthContext.Provider value={authContext}>
-            <UseBiometry/>
+            <UseBiometry />
           </AuthContext.Provider>
         </BasicAppContext>
       )
@@ -141,17 +141,17 @@ describe('UseBiometry Screen', () => {
       // and biometric is not available
       customStore.preferences.useBiometry = true
       authContext.isBiometricsActive = jest.fn().mockResolvedValueOnce(false)
-      
+
       const { getByTestId } = render(
         <StoreProvider initialState={customStore}>
           <BasicAppContext>
             <AuthContext.Provider value={authContext}>
-              <UseBiometry/>
+              <UseBiometry />
             </AuthContext.Provider>
           </BasicAppContext>
         </StoreProvider>
       )
-      
+
       const toggleButton = getByTestId(testIdWithKey('ToggleBiometrics'))
 
       await waitFor(() => {
@@ -168,7 +168,7 @@ describe('UseBiometry Screen', () => {
         <StoreProvider initialState={customStore}>
           <BasicAppContext>
             <AuthContext.Provider value={authContext}>
-              <UseBiometry/>
+              <UseBiometry />
             </AuthContext.Provider>
           </BasicAppContext>
         </StoreProvider>
@@ -190,7 +190,7 @@ describe('UseBiometry Screen', () => {
         <StoreProvider initialState={customStore}>
           <BasicAppContext>
             <AuthContext.Provider value={authContext}>
-              <UseBiometry/>
+              <UseBiometry />
             </AuthContext.Provider>
           </BasicAppContext>
         </StoreProvider>
@@ -215,7 +215,7 @@ describe('UseBiometry Screen', () => {
         <StoreProvider initialState={customStore}>
           <BasicAppContext>
             <AuthContext.Provider value={authContext}>
-              <UseBiometry/>
+              <UseBiometry />
             </AuthContext.Provider>
           </BasicAppContext>
         </StoreProvider>
@@ -241,7 +241,7 @@ describe('UseBiometry Screen', () => {
         <StoreProvider initialState={customStore}>
           <BasicAppContext>
             <AuthContext.Provider value={authContext}>
-              <UseBiometry/>
+              <UseBiometry />
             </AuthContext.Provider>
           </BasicAppContext>
         </StoreProvider>
@@ -292,7 +292,7 @@ describe('UseBiometry Screen', () => {
         <StoreProvider initialState={customStore}>
           <BasicAppContext>
             <AuthContext.Provider value={authContext}>
-              <UseBiometry/>
+              <UseBiometry />
             </AuthContext.Provider>
           </BasicAppContext>
         </StoreProvider>
diff --git a/packages/legacy/core/__tests__/screens/__snapshots__/ListContacts.test.tsx.snap b/packages/legacy/core/__tests__/screens/__snapshots__/ListContacts.test.tsx.snap
index f88deee93..27f8d58e9 100644
--- a/packages/legacy/core/__tests__/screens/__snapshots__/ListContacts.test.tsx.snap
+++ b/packages/legacy/core/__tests__/screens/__snapshots__/ListContacts.test.tsx.snap
@@ -108,6 +108,7 @@ exports[`ListContacts Screen Renders correctly 1`] = `
       >
         <View
           accessibilityLabel="ContactDetails.AContact"
+          accessibilityRole="button"
           accessibilityState={
             Object {
               "busy": undefined,
@@ -244,6 +245,7 @@ exports[`ListContacts Screen Renders correctly 1`] = `
       >
         <View
           accessibilityLabel="ContactDetails.AContact"
+          accessibilityRole="button"
           accessibilityState={
             Object {
               "busy": undefined,
@@ -380,6 +382,7 @@ exports[`ListContacts Screen Renders correctly 1`] = `
       >
         <View
           accessibilityLabel="ContactDetails.AContact"
+          accessibilityRole="button"
           accessibilityState={
             Object {
               "busy": undefined,
diff --git a/packages/legacy/core/__tests__/screens/__snapshots__/ListProofRequests.test.tsx.snap b/packages/legacy/core/__tests__/screens/__snapshots__/ListProofRequests.test.tsx.snap
index f57e8d3ae..efa652a1f 100644
--- a/packages/legacy/core/__tests__/screens/__snapshots__/ListProofRequests.test.tsx.snap
+++ b/packages/legacy/core/__tests__/screens/__snapshots__/ListProofRequests.test.tsx.snap
@@ -122,6 +122,7 @@ exports[`ListProofRequests Component Renders correctly 1`] = `
       >
         <View
           accessibilityLabel="Screens.ProofRequestDetails"
+          accessibilityRole="button"
           accessibilityState={
             Object {
               "busy": undefined,
@@ -236,6 +237,7 @@ exports[`ListProofRequests Component Renders correctly 1`] = `
       >
         <View
           accessibilityLabel="Screens.ProofRequestDetails"
+          accessibilityRole="button"
           accessibilityState={
             Object {
               "busy": undefined,
diff --git a/packages/legacy/core/__tests__/screens/__snapshots__/Preface.test.tsx.snap b/packages/legacy/core/__tests__/screens/__snapshots__/Preface.test.tsx.snap
index 2818e813a..d761f3ecc 100644
--- a/packages/legacy/core/__tests__/screens/__snapshots__/Preface.test.tsx.snap
+++ b/packages/legacy/core/__tests__/screens/__snapshots__/Preface.test.tsx.snap
@@ -89,10 +89,11 @@ exports[`Preface Screen Button enabled by checkbox being checked 1`] = `
           >
             <View
               accessibilityLabel="Terms.IAgree"
+              accessibilityRole="checkbox"
               accessibilityState={
                 Object {
                   "busy": undefined,
-                  "checked": undefined,
+                  "checked": true,
                   "disabled": undefined,
                   "expanded": undefined,
                   "selected": undefined,
@@ -345,10 +346,11 @@ exports[`Preface Screen Renders correctly 1`] = `
           >
             <View
               accessibilityLabel="Terms.IAgree"
+              accessibilityRole="checkbox"
               accessibilityState={
                 Object {
                   "busy": undefined,
-                  "checked": undefined,
+                  "checked": false,
                   "disabled": undefined,
                   "expanded": undefined,
                   "selected": undefined,
diff --git a/packages/legacy/core/__tests__/screens/__snapshots__/Settings.test.tsx.snap b/packages/legacy/core/__tests__/screens/__snapshots__/Settings.test.tsx.snap
index 40a4755bb..8008e971e 100644
--- a/packages/legacy/core/__tests__/screens/__snapshots__/Settings.test.tsx.snap
+++ b/packages/legacy/core/__tests__/screens/__snapshots__/Settings.test.tsx.snap
@@ -214,6 +214,7 @@ exports[`Settings Screen Renders correctly 1`] = `
             <View>
               <View
                 accessibilityLabel="Screens.Contacts"
+                accessibilityRole="button"
                 accessibilityState={
                   Object {
                     "busy": undefined,
@@ -329,6 +330,7 @@ exports[`Settings Screen Renders correctly 1`] = `
             <View>
               <View
                 accessibilityLabel="Settings.WhatAreContacts"
+                accessibilityRole="button"
                 accessibilityState={
                   Object {
                     "busy": undefined,
@@ -514,6 +516,7 @@ exports[`Settings Screen Renders correctly 1`] = `
             <View>
               <View
                 accessibilityLabel="Global.Biometrics"
+                accessibilityRole="button"
                 accessibilityState={
                   Object {
                     "busy": undefined,
@@ -631,6 +634,7 @@ exports[`Settings Screen Renders correctly 1`] = `
             <View>
               <View
                 accessibilityLabel="Settings.ChangePin"
+                accessibilityRole="button"
                 accessibilityState={
                   Object {
                     "busy": undefined,
@@ -746,6 +750,7 @@ exports[`Settings Screen Renders correctly 1`] = `
             <View>
               <View
                 accessibilityLabel="Settings.Language"
+                accessibilityRole="button"
                 accessibilityState={
                   Object {
                     "busy": undefined,
@@ -863,6 +868,7 @@ exports[`Settings Screen Renders correctly 1`] = `
             <View>
               <View
                 accessibilityLabel="Settings.AutoLockTime"
+                accessibilityRole="button"
                 accessibilityState={
                   Object {
                     "busy": undefined,
@@ -980,6 +986,7 @@ exports[`Settings Screen Renders correctly 1`] = `
             <View>
               <View
                 accessibilityLabel="Settings.Developer"
+                accessibilityRole="button"
                 accessibilityState={
                   Object {
                     "busy": undefined,
diff --git a/packages/legacy/core/__tests__/screens/__snapshots__/Terms.test.tsx.snap b/packages/legacy/core/__tests__/screens/__snapshots__/Terms.test.tsx.snap
index bcad013cb..4a174022f 100644
--- a/packages/legacy/core/__tests__/screens/__snapshots__/Terms.test.tsx.snap
+++ b/packages/legacy/core/__tests__/screens/__snapshots__/Terms.test.tsx.snap
@@ -203,10 +203,11 @@ exports[`Terms Screen Button enabled by checkbox being checked 1`] = `
           >
             <View
               accessibilityLabel="Terms.IAgree"
+              accessibilityRole="checkbox"
               accessibilityState={
                 Object {
                   "busy": undefined,
-                  "checked": undefined,
+                  "checked": false,
                   "disabled": undefined,
                   "expanded": undefined,
                   "selected": undefined,
@@ -654,10 +655,11 @@ exports[`Terms Screen Renders correctly 1`] = `
           >
             <View
               accessibilityLabel="Terms.IAgree"
+              accessibilityRole="checkbox"
               accessibilityState={
                 Object {
                   "busy": undefined,
-                  "checked": undefined,
+                  "checked": false,
                   "disabled": undefined,
                   "expanded": undefined,
                   "selected": undefined,
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 87f87a06f..58bfe19ef 100644
--- a/packages/legacy/core/__tests__/screens/__snapshots__/UseBiometry.test.tsx.snap
+++ b/packages/legacy/core/__tests__/screens/__snapshots__/UseBiometry.test.tsx.snap
@@ -37,7 +37,13 @@ exports[`UseBiometry Screen Renders correctly when biometry available 1`] = `
           }
         />
       </View>
-      <View>
+      <View
+        style={
+          Object {
+            "rowGap": 20,
+          }
+        }
+      >
         <Text
           style={
             Object {
@@ -49,7 +55,6 @@ exports[`UseBiometry Screen Renders correctly when biometry available 1`] = `
         >
           Biometry.EnabledText1
         </Text>
-        <Text />
         <Text
           style={
             Object {
@@ -111,7 +116,7 @@ exports[`UseBiometry Screen Renders correctly when biometry available 1`] = `
           }
         >
           <View
-            accessibilityLabel="Toggle Button"
+            accessibilityLabel="Biometry.Off"
             accessibilityRole="switch"
             accessibilityState={
               Object {
@@ -332,7 +337,13 @@ exports[`UseBiometry Screen Renders correctly when biometry not available 1`] =
           }
         />
       </View>
-      <View>
+      <View
+        style={
+          Object {
+            "rowGap": 20,
+          }
+        }
+      >
         <Text
           style={
             Object {
@@ -344,7 +355,6 @@ exports[`UseBiometry Screen Renders correctly when biometry not available 1`] =
         >
           Biometry.NotEnabledText1
         </Text>
-        <Text />
         <Text
           style={
             Object {
@@ -394,7 +404,7 @@ exports[`UseBiometry Screen Renders correctly when biometry not available 1`] =
           }
         >
           <View
-            accessibilityLabel="Toggle Button"
+            accessibilityLabel="Biometry.Off"
             accessibilityRole="switch"
             accessibilityState={
               Object {
@@ -615,7 +625,13 @@ exports[`UseBiometry Screen Toggles use biometrics ok 1`] = `
           }
         />
       </View>
-      <View>
+      <View
+        style={
+          Object {
+            "rowGap": 20,
+          }
+        }
+      >
         <Text
           style={
             Object {
@@ -627,7 +643,6 @@ exports[`UseBiometry Screen Toggles use biometrics ok 1`] = `
         >
           Biometry.EnabledText1
         </Text>
-        <Text />
         <Text
           style={
             Object {
@@ -689,7 +704,7 @@ exports[`UseBiometry Screen Toggles use biometrics ok 1`] = `
           }
         >
           <View
-            accessibilityLabel="Toggle Button"
+            accessibilityLabel="Biometry.Off"
             accessibilityRole="switch"
             accessibilityState={
               Object {