SEL-187: Make bottom layout scrollable on smaller screens

app/android/android-passport-reader/app/build.gradle

@@ -73,7 +73,7 @@ dependencies {
     implementation 'commons-codec:commons-codec:1.13'
 
     //Camera
-    implementation 'io.fotoapparat:fotoapparat:2.7.0'
+    implementation "com.github.RedApparat:Fotoapparat:2.7.0"
 
     implementation 'androidx.multidex:multidex:2.0.1'
 

app/android/app/build.gradle

@@ -155,7 +155,7 @@ dependencies {
     implementation 'com.google.android.gms:play-services-mlkit-text-recognition-common:19.1.0'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
     implementation 'io.reactivex.rxjava2:rxjava:2.2.21'
-    implementation 'io.fotoapparat:fotoapparat:2.7.0'
+    implementation "com.github.RedApparat:Fotoapparat:2.7.0"
 
     implementation "androidx.concurrent:concurrent-futures:1.1.0"
     implementation "com.google.guava:guava:31.1-android"

app/android/build.gradle

@@ -36,7 +36,8 @@ allprojects {
     }
     configurations.configureEach {
         resolutionStrategy.dependencySubstitution {
-        substitute(platform(module('com.gemalto.jp2:jp2-android'))) using module('com.github.Tgo1014:JP2ForAndroid:1.0.4')
+            substitute(platform(module('com.gemalto.jp2:jp2-android'))) using module('com.github.Tgo1014:JP2ForAndroid:1.0.4')
+            substitute module('io.fotoapparat:fotoapparat') using module('com.github.RedApparat:Fotoapparat:2.7.0')
         }
         resolutionStrategy.force 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava'
     }

app/src/Sentry.ts

@@ -1,8 +1,10 @@
 import { SENTRY_DSN } from '@env';
 import * as Sentry from '@sentry/react-native';
 
+export const isSentryDisabled = !SENTRY_DSN;
+
 export const initSentry = () => {
-  if (!SENTRY_DSN) {
+  if (isSentryDisabled) {
     return null;
   }
 
@@ -32,7 +34,7 @@ export const captureException = (
   error: Error,
   context?: Record<string, any>,
 ) => {
-  if (!SENTRY_DSN) {
+  if (isSentryDisabled) {
     return;
   }
   Sentry.captureException(error, {
@@ -44,7 +46,7 @@ export const captureMessage = (
   message: string,
   context?: Record<string, any>,
 ) => {
-  if (!SENTRY_DSN) {
+  if (isSentryDisabled) {
     return;
   }
   Sentry.captureMessage(message, {
@@ -53,5 +55,5 @@ export const captureMessage = (
 };
 
 export const wrapWithSentry = (App: React.ComponentType) => {
-  return SENTRY_DSN ? Sentry.wrap(App) : App;
+  return isSentryDisabled ? App : Sentry.wrap(App);
 };

app/src/hooks/useAesopRedesign.ts

@@ -1,7 +1,7 @@
 import { IS_TEST_BUILD } from '@env';
 
 export const shouldShowAesopRedesign = (): boolean => {
-  return IS_TEST_BUILD === 'true';
+  return JSON.parse(IS_TEST_BUILD);
 };
 
 export const useAesopRedesign = (): boolean => {

app/src/hooks/useAppUpdates.ts

@@ -1,5 +1,5 @@
 import { useNavigation } from '@react-navigation/native';
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
 import { Linking } from 'react-native';
 import { checkVersion } from 'react-native-check-version';
 
@@ -8,11 +8,13 @@ export const useAppUpdates = (): [boolean, () => void, boolean] => {
   const [newVersionUrl, setNewVersionUrl] = useState<string | null>(null);
   const [isModalDismissed, setIsModalDismissed] = useState(false);
 
-  checkVersion().then(version => {
-    if (version.needsUpdate) {
-      setNewVersionUrl(version.url);
-    }
-  });
+  useEffect(() => {
+    checkVersion().then(version => {
+      if (version.needsUpdate) {
+        setNewVersionUrl(version.url);
+      }
+    });
+  }, []);
 
   const showAppUpdateModal = () => {
     navigation.navigate('Modal', {
@@ -22,9 +24,8 @@ export const useAppUpdates = (): [boolean, () => void, boolean] => {
       buttonText: 'Update and restart',
       onButtonPress: async () => {
         if (newVersionUrl !== null) {
-          await Linking.openURL(
-            newVersionUrl, // TODO or use: `Platform.OS === 'ios' ? appStoreUrl : playStoreUrl`
-          );
+          // TODO or use: `Platform.OS === 'ios' ? appStoreUrl : playStoreUrl`
+          await Linking.openURL(newVersionUrl);
         }
       },
       onModalDismiss: () => {

app/src/hooks/useConnectionModal.ts

@@ -2,8 +2,8 @@ import { useNetInfo } from '@react-native-community/netinfo';
 import { useEffect } from 'react';
 import { Linking, Platform } from 'react-native';
 
-import { useModal } from '../hooks/useModal';
 import { navigationRef } from '../Navigation';
+import { useModal } from './useModal';
 
 const connectionModalParams = {
   titleText: 'Internet connection error',
@@ -21,20 +21,20 @@ const connectionModalParams = {
 } as const;
 
 export default function useConnectionModal() {
-  const { isInternetReachable } = useNetInfo();
+  const { isConnected } = useNetInfo();
   const { showModal, dismissModal, visible } = useModal(connectionModalParams);
 
   useEffect(() => {
     if (!navigationRef.isReady()) {
       return;
     }
 
-    if (isInternetReachable === false && !visible) {
+    if (isConnected === false && !visible) {
       showModal();
-    } else if (visible && isInternetReachable !== false) {
+    } else if (visible && isConnected !== false) {
       dismissModal();
     }
-  }, [isInternetReachable, dismissModal, visible, navigationRef.isReady()]);
+  }, [isConnected, dismissModal, visible, navigationRef.isReady()]);
 
   return {
     visible,

app/src/layouts/ExpandableBottomLayout.tsx

@@ -1,10 +1,21 @@
 import React from 'react';
-import { StatusBar, StyleSheet } from 'react-native';
+import {
+  Dimensions,
+  PixelRatio,
+  ScrollView,
+  StatusBar,
+  StyleSheet,
+} from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { View, ViewProps } from 'tamagui';
 
 import { black, white } from '../utils/colors';
 
+// Get the current font scale factor
+const fontScale = PixelRatio.getFontScale();
+// fontScale > 1 means the user has increased text size in accessibility settings
+const isLargerTextEnabled = fontScale > 1;
+
 interface ExpandableBottomLayoutProps extends ViewProps {
   children: React.ReactNode;
   backgroundColor: string;
@@ -90,12 +101,29 @@ const BottomSection: React.FC<BottomSectionProps> = ({
   const { bottom: safeAreaBottom } = useSafeAreaInsets();
   const incomingBottom = props.paddingBottom ?? props.pb ?? 0;
   const minBottom = Math.max(safeAreaBottom, 10);
-
   const totalBottom =
     typeof incomingBottom === 'number' ? minBottom + incomingBottom : minBottom;
+
+  let panelHeight: number | 'auto' = 'auto';
+  // set bottom section height to 38% of screen height
+  // and wrap children in a scroll view if larger text is enabled
+  if (isLargerTextEnabled) {
+    const windowHeight = Dimensions.get('window').height;
+    panelHeight = windowHeight * 0.38;
+    children = (
+      <ScrollView
+        showsVerticalScrollIndicator={false}
+        contentContainerStyle={{ flexGrow: 1 }}
+      >
+        {children}
+      </ScrollView>
+    );
+  }
+
   return (
     <View
       {...props}
+      height={panelHeight}
       style={[styles.bottomSection, style]}
       paddingBottom={totalBottom}
     >

app/src/screens/Settings/ModalScreen.tsx

@@ -35,6 +35,7 @@ interface ModalScreenProps extends StaticScreenProps<ModalParams> {}
 
 const ModalScreen: React.FC<ModalScreenProps> = ({ route: { params } }) => {
   const navigation = useNavigation();
+
   const onButtonPressed = useCallback(async () => {
     confirmTap();
     try {
@@ -43,13 +44,13 @@ const ModalScreen: React.FC<ModalScreenProps> = ({ route: { params } }) => {
     } catch (error) {
       console.error(error);
     }
-  }, []);
+  }, [params?.onButtonPress]);
 
   const onClose = useCallback(() => {
     impactLight();
     navigation.goBack();
     params?.onModalDismiss();
-  }, [params]);
+  }, [params?.onModalDismiss]);
 
   return (
     <ModalBackDrop>