Merge branch 'flicknow-make-choose-account-scrollable' into main

bluesky-social · Nov 2, 2023 · c8b9407 · c8b9407
2 parents 29bfed7 + b782cd0
commit c8b9407
Showing 1 changed file with 10 additions and 2 deletions.
diff --git 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,
@@ -28,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,
@@ -202,7 +204,7 @@ const ChooseAccountForm = ({
   }
 
   return (
-    <View testID="chooseAccountForm">
+    <ScrollView testID="chooseAccountForm" style={styles.maxHeight}>
       <Text
         type="2xl-medium"
         style={[pal.text, styles.groupLabel, s.mt5, s.mb10]}>
@@ -267,7 +269,7 @@ const ChooseAccountForm = ({
         <View style={s.flex1} />
         {isProcessing && <ActivityIndicator />}
       </View>
-    </View>
+    </ScrollView>
   )
 }
 
@@ -990,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,
+  },
 })