From e2bd63b35e8d79e908e693ce2d0ce58f4d686675 Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Tue, 29 Oct 2024 00:06:54 +0000
Subject: [PATCH] move fix to layout screen

---
 src/components/Layout.tsx                | 3 ++-
 src/screens/Messages/Conversation.tsx    | 4 ++--
 src/screens/StarterPack/Wizard/index.tsx | 6 ++----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/components/Layout.tsx b/src/components/Layout.tsx
index 57e3731645..3ea1eaa6a0 100644
--- a/src/components/Layout.tsx
+++ b/src/components/Layout.tsx
@@ -3,7 +3,7 @@ import {View, ViewStyle} from 'react-native'
 import {StyleProp} from 'react-native'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
 
-import {atoms as a} from '#/alf'
+import {atoms as a, web} from '#/alf'
 
 // Every screen should have a Layout component wrapping it.
 // This component provides a default padding for the top of the screen.
@@ -31,6 +31,7 @@ let Screen = ({
       style={[
         {paddingTop: disableTopPadding ? 0 : top},
         a.util_screen_outer,
+        web([{minHeight: 0}, a.flex_1]),
         style,
       ]}
       {...props}
diff --git a/src/screens/Messages/Conversation.tsx b/src/screens/Messages/Conversation.tsx
index 651915738a..5599c86abc 100644
--- a/src/screens/Messages/Conversation.tsx
+++ b/src/screens/Messages/Conversation.tsx
@@ -18,7 +18,7 @@ import {useProfileQuery} from '#/state/queries/profile'
 import {useSetMinimalShellMode} from '#/state/shell'
 import {CenteredView} from '#/view/com/util/Views'
 import {MessagesList} from '#/screens/Messages/components/MessagesList'
-import {atoms as a, useBreakpoints, useTheme, web} from '#/alf'
+import {atoms as a, useBreakpoints, useTheme} from '#/alf'
 import {MessagesListBlockedFooter} from '#/components/dms/MessagesListBlockedFooter'
 import {MessagesListHeader} from '#/components/dms/MessagesListHeader'
 import {Error} from '#/components/Error'
@@ -65,7 +65,7 @@ export function MessagesConversationScreen({route}: Props) {
   )
 
   return (
-    <Layout.Screen testID="convoScreen" style={web([{minHeight: 0}, a.flex_1])}>
+    <Layout.Screen testID="convoScreen">
       <ConvoProvider key={convoId} convoId={convoId}>
         <Inner />
       </ConvoProvider>
diff --git a/src/screens/StarterPack/Wizard/index.tsx b/src/screens/StarterPack/Wizard/index.tsx
index 9a90a1f514..addac22048 100644
--- a/src/screens/StarterPack/Wizard/index.tsx
+++ b/src/screens/StarterPack/Wizard/index.tsx
@@ -49,7 +49,7 @@ import {useWizardState, WizardStep} from '#/screens/StarterPack/Wizard/State'
 import {StepDetails} from '#/screens/StarterPack/Wizard/StepDetails'
 import {StepFeeds} from '#/screens/StarterPack/Wizard/StepFeeds'
 import {StepProfiles} from '#/screens/StarterPack/Wizard/StepProfiles'
-import {atoms as a, useTheme, web} from '#/alf'
+import {atoms as a, useTheme} from '#/alf'
 import {Button, ButtonText} from '#/components/Button'
 import {useDialogControl} from '#/components/Dialog'
 import * as Layout from '#/components/Layout'
@@ -121,9 +121,7 @@ export function Wizard({
   }
 
   return (
-    <Layout.Screen
-      testID="starterPackWizardScreen"
-      style={web([{minHeight: 0}, a.flex_1])}>
+    <Layout.Screen testID="starterPackWizardScreen">
       <Provider starterPack={starterPack} listItems={listItems}>
         <WizardInner
           currentStarterPack={starterPack}