From 43ef87b852f43723579047526131cc5bc4cc804d Mon Sep 17 00:00:00 2001
From: Eric Bailey <git@esb.lol>
Date: Tue, 5 Aug 2025 16:04:54 -0500
Subject: [PATCH] Move a11y prop into FocusScope

---
 src/components/FocusScope/index.tsx            | 10 ++++++++--
 src/components/PolicyUpdateOverlay/Overlay.tsx |  1 -
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/components/FocusScope/index.tsx b/src/components/FocusScope/index.tsx
index 7d9ef8fc91..408381d5b8 100644
--- a/src/components/FocusScope/index.tsx
+++ b/src/components/FocusScope/index.tsx
@@ -14,7 +14,7 @@ import {
   findNodeHandle,
   Pressable,
   Text,
-  type View,
+  View,
 } from 'react-native'
 import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
@@ -102,7 +102,13 @@ function FocusTrap({children}: {children: ReactNode}) {
         }}>
         <Noop />
       </Pressable>
-      {decoratedChildren}
+      <View
+        /**
+         * This property traps focus effectively on iOS, but not on Android.
+         */
+        accessibilityViewIsModal>
+        {decoratedChildren}
+      </View>
       <Pressable
         accessibilityLabel={_(
           msg`You've reached the end of the active content.`,
diff --git a/src/components/PolicyUpdateOverlay/Overlay.tsx b/src/components/PolicyUpdateOverlay/Overlay.tsx
index d55496c470..dd071ef15c 100644
--- a/src/components/PolicyUpdateOverlay/Overlay.tsx
+++ b/src/components/PolicyUpdateOverlay/Overlay.tsx
@@ -109,7 +109,6 @@ export function Overlay({
 
           <FocusScope>
             <View
-              accessibilityViewIsModal
               accessible={isAndroid}
               role="dialog"
               aria-role="dialog"