From 0168aada372d6a42f8ee4557f6d6dcfa1a81ed71 Mon Sep 17 00:00:00 2001
From: Paul Frazee <pfrazee@gmail.com>
Date: Thu, 5 Oct 2023 15:55:31 -0700
Subject: [PATCH] Pull upstream bugfixes to bottom-sheet (#1606)

* Bump bottom-sheet to latest for bugfixes

* Small tweak to the account switcher
---
 package.json                          |   2 +-
 src/view/com/modals/SwitchAccount.tsx | 113 ++++++++++++--------------
 yarn.lock                             |   8 +-
 3 files changed, 59 insertions(+), 64 deletions(-)

diff --git a/package.json b/package.json
index cd8518738f..a886bfcd01 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
     "@fortawesome/free-regular-svg-icons": "^6.1.1",
     "@fortawesome/free-solid-svg-icons": "^6.1.1",
     "@fortawesome/react-native-fontawesome": "^0.3.0",
-    "@gorhom/bottom-sheet": "^4.4.7",
+    "@gorhom/bottom-sheet": "^4.5.1",
     "@mattermost/react-native-paste-input": "^0.6.4",
     "@miblanchard/react-native-slider": "^2.3.1",
     "@react-native-async-storage/async-storage": "1.18.2",
diff --git a/src/view/com/modals/SwitchAccount.tsx b/src/view/com/modals/SwitchAccount.tsx
index 51d75e3ef4..d5fa32692b 100644
--- a/src/view/com/modals/SwitchAccount.tsx
+++ b/src/view/com/modals/SwitchAccount.tsx
@@ -37,74 +37,69 @@ export function Component({}: {}) {
   }, [track, store])
 
   return (
-    <View style={[styles.container, pal.view]}>
+    <BottomSheetScrollView
+      style={[styles.container, pal.view]}
+      contentContainerStyle={[styles.innerContainer, pal.view]}>
       <Text type="title-xl" style={[styles.title, pal.text]}>
         Switch Account
       </Text>
-      <BottomSheetScrollView
-        style={styles.container}
-        contentContainerStyle={[styles.innerContainer, pal.view]}>
-        {isSwitching ? (
+      {isSwitching ? (
+        <View style={[pal.view, styles.linkCard]}>
+          <ActivityIndicator />
+        </View>
+      ) : (
+        <Link href={makeProfileLink(store.me)} title="Your profile" noFeedback>
           <View style={[pal.view, styles.linkCard]}>
-            <ActivityIndicator />
-          </View>
-        ) : (
-          <Link
-            href={makeProfileLink(store.me)}
-            title="Your profile"
-            noFeedback>
-            <View style={[pal.view, styles.linkCard]}>
-              <View style={styles.avi}>
-                <UserAvatar size={40} avatar={store.me.avatar} />
-              </View>
-              <View style={[s.flex1]}>
-                <Text type="md-bold" style={pal.text} numberOfLines={1}>
-                  {store.me.displayName || store.me.handle}
-                </Text>
-                <Text type="sm" style={pal.textLight} numberOfLines={1}>
-                  {store.me.handle}
-                </Text>
-              </View>
-              <TouchableOpacity
-                testID="signOutBtn"
-                onPress={isSwitching ? undefined : onPressSignout}
-                accessibilityRole="button"
-                accessibilityLabel="Sign out"
-                accessibilityHint={`Signs ${store.me.displayName} out of Bluesky`}>
-                <Text type="lg" style={pal.link}>
-                  Sign out
-                </Text>
-              </TouchableOpacity>
-            </View>
-          </Link>
-        )}
-        {store.session.switchableAccounts.map(account => (
-          <TouchableOpacity
-            testID={`switchToAccountBtn-${account.handle}`}
-            key={account.did}
-            style={[pal.view, styles.linkCard, isSwitching && styles.dimmed]}
-            onPress={
-              isSwitching ? undefined : () => onPressSwitchAccount(account)
-            }
-            accessibilityRole="button"
-            accessibilityLabel={`Switch to ${account.handle}`}
-            accessibilityHint="Switches the account you are logged in to">
             <View style={styles.avi}>
-              <UserAvatar size={40} avatar={account.aviUrl} />
+              <UserAvatar size={40} avatar={store.me.avatar} />
             </View>
             <View style={[s.flex1]}>
-              <Text type="md-bold" style={pal.text}>
-                {account.displayName || account.handle}
+              <Text type="md-bold" style={pal.text} numberOfLines={1}>
+                {store.me.displayName || store.me.handle}
               </Text>
-              <Text type="sm" style={pal.textLight}>
-                {account.handle}
+              <Text type="sm" style={pal.textLight} numberOfLines={1}>
+                {store.me.handle}
               </Text>
             </View>
-            <AccountDropdownBtn handle={account.handle} />
-          </TouchableOpacity>
-        ))}
-      </BottomSheetScrollView>
-    </View>
+            <TouchableOpacity
+              testID="signOutBtn"
+              onPress={isSwitching ? undefined : onPressSignout}
+              accessibilityRole="button"
+              accessibilityLabel="Sign out"
+              accessibilityHint={`Signs ${store.me.displayName} out of Bluesky`}>
+              <Text type="lg" style={pal.link}>
+                Sign out
+              </Text>
+            </TouchableOpacity>
+          </View>
+        </Link>
+      )}
+      {store.session.switchableAccounts.map(account => (
+        <TouchableOpacity
+          testID={`switchToAccountBtn-${account.handle}`}
+          key={account.did}
+          style={[pal.view, styles.linkCard, isSwitching && styles.dimmed]}
+          onPress={
+            isSwitching ? undefined : () => onPressSwitchAccount(account)
+          }
+          accessibilityRole="button"
+          accessibilityLabel={`Switch to ${account.handle}`}
+          accessibilityHint="Switches the account you are logged in to">
+          <View style={styles.avi}>
+            <UserAvatar size={40} avatar={account.aviUrl} />
+          </View>
+          <View style={[s.flex1]}>
+            <Text type="md-bold" style={pal.text}>
+              {account.displayName || account.handle}
+            </Text>
+            <Text type="sm" style={pal.textLight}>
+              {account.handle}
+            </Text>
+          </View>
+          <AccountDropdownBtn handle={account.handle} />
+        </TouchableOpacity>
+      ))}
+    </BottomSheetScrollView>
   )
 }
 
@@ -113,7 +108,7 @@ const styles = StyleSheet.create({
     flex: 1,
   },
   innerContainer: {
-    paddingBottom: 20,
+    paddingBottom: 40,
   },
   title: {
     textAlign: 'center',
diff --git a/yarn.lock b/yarn.lock
index 8e92fcd2b3..fffbff57ea 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2255,10 +2255,10 @@
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
 
-"@gorhom/bottom-sheet@^4.4.7":
-  version "4.4.7"
-  resolved "https://registry.yarnpkg.com/@gorhom/bottom-sheet/-/bottom-sheet-4.4.7.tgz#fc80b3f0b7ebab056ce226f3aa3a89b2db8660dd"
-  integrity sha512-ukTuTqDQi2heo68hAJsBpUQeEkdqP9REBcn47OpuvPKhdPuO1RBOOADjqXJNCnZZRcY+HqbnGPMSLFVc31zylQ==
+"@gorhom/bottom-sheet@^4.5.1":
+  version "4.5.1"
+  resolved "https://registry.yarnpkg.com/@gorhom/bottom-sheet/-/bottom-sheet-4.5.1.tgz#1ac4b234a80e7dff263f0b7ac207f92e41562849"
+  integrity sha512-4Qy6hzvN32fXu2hDxDXOIS0IBGBT6huST7J7+K1V5bXemZ08KIx5ZffyLgwhCUl+CnyeG2KG6tqk6iYLkIwi7Q==
   dependencies:
     "@gorhom/portal" "1.0.14"
     invariant "^2.2.4"