Merge branch 'main' into bugfix/context-username-ellipsis

bluesky-social · Oct 9, 2024 · 0bd9f0c · 0bd9f0c
2 parents 3cfe268 + da28c56
commit 0bd9f0c
Show file tree

Hide file tree

Showing 28 changed files with 29,194 additions and 26,100 deletions.
diff --git a/__e2e__/flows/curate-lists.yml b/__e2e__/flows/curate-lists.yml
@@ -163,8 +163,7 @@ appId: xyz.blueskyweb.app
 - tapOn:
     label: "Adds and removes users on curatelists from the profile"
     id: "bottomBarSearchBtn"
-- tapOn:
-    id: "searchTextInput"
+- tapOn: "Search"
 - inputText: "bob"
 - tapOn:
     id: "searchAutoCompleteResult-bob.test"

diff --git a/__e2e__/flows/feed-reorder.yml b/__e2e__/flows/feed-reorder.yml
@@ -17,10 +17,6 @@ appId: xyz.blueskyweb.app
     id: "viewHeaderDrawerBtn"
 - tapOn:
     id: "profileCardButton"
-- swipe:
-    from:
-        id: "profilePager-selector"
-    direction: LEFT
 - tapOn:
     id: "profilePager-selector-4"
 - tapOn: "alice-favs"

diff --git a/__e2e__/flows/home-screen.yml b/__e2e__/flows/home-screen.yml
@@ -20,10 +20,6 @@ appId: xyz.blueskyweb.app
 - tapOn:
     label: "Feeds button disappears after pinning a feed"
     id: "bottomBarProfileBtn"
-- swipe:
-    from:
-        id: "profilePager-selector"
-    direction: LEFT
 - tapOn:
     id: "profilePager-selector-4"
 - tapOn: "alice-favs"

diff --git a/__e2e__/flows/profile-screen-edit.yml b/__e2e__/flows/profile-screen-edit.yml
@@ -17,21 +17,6 @@ appId: xyz.blueskyweb.app
 - tapOn:
     id: "bottomBarProfileBtn"
 
-# Can see feeds
-- swipe:
-    from:
-        id: "profilePager-selector"
-    direction: LEFT
-- tapOn:
-    id: "profilePager-selector-4"
-- assertVisible: "alice-favs"
-- swipe:
-    from:
-        id: "profilePager-selector"
-    direction: RIGHT
-- tapOn:
-    id: "profilePager-selector-0"
-
 # Open and close edit profile modal
 - tapOn:
     id: "profileHeaderEditProfileButton"

diff --git a/__e2e__/flows/profile-screen.yml b/__e2e__/flows/profile-screen.yml
@@ -15,8 +15,7 @@ appId: xyz.blueskyweb.app
         id: "bottomBarSearchBtn"
 - tapOn:
     id: "bottomBarSearchBtn"
-- tapOn:
-    id: "searchTextInput"
+- tapOn: "Search"
 - inputText: "b"
 - tapOn:
     id: "searchAutoCompleteResult-bob.test"

diff --git a/__e2e__/flows/search-screen.yml b/__e2e__/flows/search-screen.yml
@@ -12,8 +12,7 @@ appId: xyz.blueskyweb.app
 # Navigate to another user profile via autocomplete
 - tapOn:
     id: "bottomBarSearchBtn"
-- tapOn:
-    id: "searchTextInput"
+- tapOn: "Search"
 - inputText: "b"
 - tapOn:
     id: "searchAutoCompleteResult-bob.test"

diff --git a/package.json b/package.json
@@ -205,7 +205,7 @@
     "zod": "^3.20.2"
   },
   "devDependencies": {
-    "@atproto/dev-env": "^0.3.39",
+    "@atproto/dev-env": "^0.3.55",
     "@babel/core": "^7.23.2",
     "@babel/preset-env": "^7.20.0",
     "@babel/runtime": "^7.20.0",

diff --git a/src/components/moderation/LabelsOnMeDialog.tsx b/src/components/moderation/LabelsOnMeDialog.tsx
@@ -10,6 +10,7 @@ import {useLabelInfo} from '#/lib/moderation/useLabelInfo'
 import {makeProfileLink} from '#/lib/routes/links'
 import {sanitizeHandle} from '#/lib/strings/handles'
 import {logger} from '#/logger'
+import {isAndroid} from '#/platform/detection'
 import {useAgent, useSession} from '#/state/session'
 import * as Toast from '#/view/com/util/Toast'
 import {atoms as a, useBreakpoints, useTheme} from '#/alf'
@@ -237,7 +238,7 @@ function AppealForm({
 
   return (
     <>
-      <View style={{flexWrap: 'wrap', flexDirection: 'row'}}>
+      <View>
         <Text style={[a.text_2xl, a.font_bold, a.pb_xs, a.leading_tight]}>
           <Trans>Appeal "{strings.name}" label</Trans>
         </Text>
@@ -300,6 +301,7 @@ function AppealForm({
           {isPending && <ButtonIcon icon={Loader} />}
         </Button>
       </View>
+      {isAndroid && <View style={{height: 300}} />}
     </>
   )
 }