Skip to content

Commit cbbbebc

Browse files
committed
Merge branch 'release/1.5.0'
# Conflicts: # apps/app/.gitignore
2 parents 0ee2c37 + 0c6858f commit cbbbebc

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

apps/app/.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
expo-env.d.ts
66
# @end expo-cli
77

8-
dist/
8+
dist/

apps/app/src/app/(home)/habits/index.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ export default function Habits() {
6464
}, [])
6565

6666
return (
67-
<SafeAreaView className="flex-1 pt-2">
67+
<SafeAreaView edges={["top"]} className="flex-1 pt-2 relative">
6868
<View className="flex flex-row items-center justify-between px-4 pb-2">
6969
<Heading className="text-3xl">Habits</Heading>
7070
<Link href="/habits/stats" asChild>
@@ -89,7 +89,7 @@ export default function Habits() {
8989
</View>
9090

9191
<HabitsListContainer />
92-
<View className="absolute bottom-4 right-4 gap-1">
92+
<View pointerEvents="box-none" className="absolute bottom-4 right-4 gap-1">
9393
<TouchableOpacity
9494
onPress={() => {
9595
scrollViewRef.current?.scrollToEnd()

0 commit comments

Comments
 (0)