From 5f135aa0218e7a1c1277dcb9f0b14ca28fae9b25 Mon Sep 17 00:00:00 2001 From: flicknow Date: Wed, 1 Nov 2023 20:38:49 -0400 Subject: [PATCH 1/2] Make choose account form scrollable --- src/view/com/auth/login/Login.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/view/com/auth/login/Login.tsx b/src/view/com/auth/login/Login.tsx index fac92339..2e9926a5 100644 --- a/src/view/com/auth/login/Login.tsx +++ b/src/view/com/auth/login/Login.tsx @@ -3,6 +3,7 @@ import { ActivityIndicator, Keyboard, KeyboardAvoidingView, + ScrollView, StyleSheet, TextInput, TouchableOpacity, @@ -202,7 +203,7 @@ const ChooseAccountForm = ({ } return ( - + @@ -267,7 +268,7 @@ const ChooseAccountForm = ({ {isProcessing && } - + ) } From b782cd0d06b0fab4fae1c2aeff04f3b3196db932 Mon Sep 17 00:00:00 2001 From: Paul Frazee Date: Thu, 2 Nov 2023 09:42:29 -0700 Subject: [PATCH 2/2] Fix max-height issues --- src/view/com/auth/login/Login.tsx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/view/com/auth/login/Login.tsx b/src/view/com/auth/login/Login.tsx index 2e9926a5..8ec4cc81 100644 --- a/src/view/com/auth/login/Login.tsx +++ b/src/view/com/auth/login/Login.tsx @@ -29,6 +29,7 @@ import {isNetworkError} from 'lib/strings/errors' import {usePalette} from 'lib/hooks/usePalette' import {useTheme} from 'lib/ThemeContext' import {cleanError} from 'lib/strings/errors' +import {isWeb} from 'platform/detection' enum Forms { Login, @@ -203,7 +204,7 @@ const ChooseAccountForm = ({ } return ( - + @@ -991,4 +992,10 @@ const styles = StyleSheet.create({ marginRight: 5, }, dimmed: {opacity: 0.5}, + + maxHeight: { + // @ts-ignore web only -prf + maxHeight: isWeb ? '100vh' : undefined, + height: !isWeb ? '100%' : undefined, + }, })