fix: refactor

Author: thelullabyy

src/components/Modal/BaseModal.tsx

@@ -40,6 +40,7 @@ type ModalComponentProps = (ReactNativeModalProps | ReanimatedModalProps) & {
     shouldUseReanimatedModal?: boolean;
     shouldPreventScrollOnFocus?: boolean;
     initialFocus?: FocusTrapOptions['initialFocus'];
+    isVisible: boolean;
 };
 
 function ModalComponent({type, shouldUseReanimatedModal, isVisible, shouldPreventScrollOnFocus, initialFocus, children, ...props}: ModalComponentProps) {
@@ -66,7 +67,7 @@ function ModalComponent({type, shouldUseReanimatedModal, isVisible, shouldPreven
             isVisible={isVisible}
         >
             <FocusTrapForModal
-                active={isVisible ?? false}
+                active={isVisible}
                 initialFocus={initialFocus}
                 shouldPreventScroll={shouldPreventScrollOnFocus}
             >

src/components/Modal/ReanimatedModal/index.tsx

@@ -187,13 +187,14 @@ function ReanimatedModal({
         );
     }
     const isBackdropMounted = isVisibleState || ((isTransitioning || isContainerOpen !== isVisibleState) && getPlatform() === CONST.PLATFORM.WEB);
+    const modalVisibility = isVisibleState || isTransitioning || isContainerOpen !== isVisibleState;
     return (
         <LayoutAnimationConfig skipExiting={getPlatform() !== CONST.PLATFORM.WEB}>
             <Modal
                 transparent
                 animationType="none"
                 // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-                visible={isVisibleState || isTransitioning || isContainerOpen !== isVisibleState}
+                visible={modalVisibility}
                 onRequestClose={onBackButtonPress}
                 statusBarTranslucent={statusBarTranslucent}
                 testID={testID}
@@ -217,7 +218,7 @@ function ReanimatedModal({
                     </KeyboardAvoidingView>
                 ) : (
                     <FocusTrapForModal
-                        active={isVisibleState || isTransitioning || isContainerOpen !== isVisibleState}
+                        active={modalVisibility}
                         initialFocus={initialFocus}
                         shouldPreventScroll={shouldPreventScrollOnFocus}
                     >