From 1bf1c4d8e66a85466421b9161d7b404975afcd06 Mon Sep 17 00:00:00 2001
From: Hailey <me@haileyok.com>
Date: Sun, 23 Jun 2024 03:14:12 -0700
Subject: [PATCH] fix login screen, get android working

---
 app.config.js               |  2 +-
 package.json                |  5 ++---
 src/screens/Login/index.tsx |  6 +++---
 yarn.lock                   | 21 ++++++++-------------
 4 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/app.config.js b/app.config.js
index 01d14893d6..67cce7f3a6 100644
--- a/app.config.js
+++ b/app.config.js
@@ -201,7 +201,7 @@ module.exports = function (config) {
               targetSdkVersion: 34,
               buildToolsVersion: '34.0.0',
               kotlinVersion: '1.8.0',
-              newArchEnabled: false,
+              newArchEnabled: true,
             },
           },
         ],
diff --git a/package.json b/package.json
index fa01ed7c84..970afe38ee 100644
--- a/package.json
+++ b/package.json
@@ -70,8 +70,7 @@
     "@radix-ui/react-dropdown-menu": "^2.0.6",
     "@react-native-async-storage/async-storage": "1.23.1",
     "@react-native-masked-view/masked-view": "0.3.1",
-    "@react-native-menu/menu": "^1.1.0",
-    "@react-native-picker/picker": "2.6.1",
+    "@react-native-picker/picker": "2.7.7",
     "@react-navigation/bottom-tabs": "^6.5.20",
     "@react-navigation/drawer": "^6.6.15",
     "@react-navigation/native": "^6.1.17",
@@ -170,7 +169,7 @@
     "react-native-gesture-handler": "~2.16.2",
     "react-native-get-random-values": "~1.11.0",
     "react-native-image-crop-picker": "0.40.3",
-    "react-native-keyboard-controller": "^1.12.1",
+    "react-native-keyboard-controller": "^1.12.4",
     "react-native-pager-view": "6.2.3",
     "react-native-picker-select": "^9.1.3",
     "react-native-progress": "bluesky-social/react-native-progress",
diff --git a/src/screens/Login/index.tsx b/src/screens/Login/index.tsx
index 1fce63d298..d2e31b260e 100644
--- a/src/screens/Login/index.tsx
+++ b/src/screens/Login/index.tsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import {KeyboardAvoidingView} from 'react-native'
+import {View} from 'react-native'
 import {LayoutAnimationConfig} from 'react-native-reanimated'
 import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
@@ -163,7 +163,7 @@ export const Login = ({onPressBack}: {onPressBack: () => void}) => {
   }
 
   return (
-    <KeyboardAvoidingView testID="signIn" behavior="padding" style={a.flex_1}>
+    <View testID="signIn" behavior="padding" style={a.flex_1}>
       <LoggedOutLayout
         leadin=""
         title={title}
@@ -173,6 +173,6 @@ export const Login = ({onPressBack}: {onPressBack: () => void}) => {
           <ScreenTransition key={currentForm}>{content}</ScreenTransition>
         </LayoutAnimationConfig>
       </LoggedOutLayout>
-    </KeyboardAvoidingView>
+    </View>
   )
 }
diff --git a/yarn.lock b/yarn.lock
index fda78daddd..c262e194d5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5418,15 +5418,10 @@
   resolved "https://registry.yarnpkg.com/@react-native-masked-view/masked-view/-/masked-view-0.3.1.tgz#5bd76f17004a6ccbcec03856893777ee91f23d29"
   integrity sha512-uVm8U6nwFIlUd1iDIB5cS+lDadApKR+l8k4k84d9hn+GN4lzAIJhUZ9syYX7c022MxNgAlbxoFLt0pqKoyaAGg==
 
-"@react-native-menu/menu@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@react-native-menu/menu/-/menu-1.1.0.tgz#e89c0850f7e5aa4c671c44a9c10edafadb23c35a"
-  integrity sha512-vf9zp0M4nbAFnSKz5NJYKUPM5UzXWmLyGcjtuPaKWYxxloz9C0Pp6XdZRJnoOSlfRShE8NksX3bVY8W4wGnlCQ==
-
-"@react-native-picker/picker@2.6.1":
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/@react-native-picker/picker/-/picker-2.6.1.tgz#3b20ddd1385fab0487db103dc6519570f8892e6d"
-  integrity sha512-oJftvmLOj6Y6/bF4kPcK6L83yNBALGmqNYugf94BzP0FQGpHBwimVN2ygqkQ2Sn2ZU3pGUZMs0jV6+Gku2GyYg==
+"@react-native-picker/picker@2.7.7":
+  version "2.7.7"
+  resolved "https://registry.yarnpkg.com/@react-native-picker/picker/-/picker-2.7.7.tgz#6e19c3a72a482be015f5194794e6c14efe8762e8"
+  integrity sha512-CTHthVmx8ujlH/u5AnxLQfsheh/DoEbo+Kbx0HGTlbKVLC1eZ4Kr9jXIIUcwB7JEgOXifdZIPQCsoTc/7GQ0ag==
 
 "@react-native/assets-registry@0.74.83", "@react-native/assets-registry@~0.74.83":
   version "0.74.83"
@@ -18832,10 +18827,10 @@ react-native-image-crop-picker@0.40.3:
   resolved "https://registry.yarnpkg.com/react-native-image-crop-picker/-/react-native-image-crop-picker-0.40.3.tgz#a6b135cd1218a33ad126c1a148ec5a1bd01737ff"
   integrity sha512-45PKcTnsnLS+E36YwoXutllQdRSOuOsMN0IRcAcwsFXOuAQIOtugXlAuGGL28JHKb/ATaSSPvqCSrdG65Jv3GA==
 
-react-native-keyboard-controller@^1.12.1:
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/react-native-keyboard-controller/-/react-native-keyboard-controller-1.12.1.tgz#6de22ed4d060528a0dd25621eeaa7f71772ce35f"
-  integrity sha512-2OpQcesiYsMilrTzgcTafSGexd9UryRQRuHudIcOn0YaqvvzNpnhVZMVuJMH93fJv/iaZYp3138rgUKOdHhtSw==
+react-native-keyboard-controller@^1.12.4:
+  version "1.12.4"
+  resolved "https://registry.yarnpkg.com/react-native-keyboard-controller/-/react-native-keyboard-controller-1.12.4.tgz#ca95babd7acd72f2681b5af4e86eb77f91d640cc"
+  integrity sha512-s8QbP2TIgblqIQUHCRCo/FeO7TdLzPIFAqjpW5t1ArFG/yd81MT7kgJAffAzkYWxY+WyFrHnLNX8Z8xGQRcMvw==
 
 react-native-pager-view@6.2.3:
   version "6.2.3"