Clean up 1

src/Navigation.tsx

@@ -30,6 +30,7 @@ import {colors} from 'lib/styles'
 import {isNative} from 'platform/detection'
 import {useColorSchemeStyle} from 'lib/hooks/useColorSchemeStyle'
 import {router} from './routes'
+import {s} from 'lib/styles'
 import {usePalette} from 'lib/hooks/usePalette'
 import {bskyTitle} from 'lib/strings/headings'
 import {JSX} from 'react/jsx-runtime'
@@ -394,7 +395,7 @@ const FlatNavigator = () => {
         fullScreenGestureEnabled: true,
         headerShown: false,
         animationDuration: 250,
-        contentStyle: [pal.view, {flex: 'none'}],
+        contentStyle: [pal.view, styles.webContainer],
       }}>
       <Flat.Screen
         name="Home"
@@ -592,6 +593,10 @@ function handleLink(url: string) {
 }
 
 const styles = StyleSheet.create({
+  webContainer: {
+    // @ts-ignore web-only
+    flex: '',
+  },
   bgDark: {
     backgroundColor: colors.black,
   },

src/view/shell/bottom-bar/BottomBarStyles.tsx

@@ -12,6 +12,10 @@ export const styles = StyleSheet.create({
     paddingLeft: 5,
     paddingRight: 10,
   },
+  bottomBarWeb: {
+    // @ts-ignore web-only
+    position: 'fixed',
+  },
   ctrl: {
     flex: 1,
     paddingTop: 13,

src/view/shell/bottom-bar/BottomBarWeb.tsx

@@ -33,11 +33,11 @@ export function BottomBarWeb() {
     <Animated.View
       style={[
         styles.bottomBar,
+        styles.bottomBarWeb,
         pal.view,
         pal.border,
         {paddingBottom: clamp(safeAreaInsets.bottom, 15, 30)},
         footerMinimalShellTransform,
-        {position: 'fixed'},
       ]}>
       <NavItem routeName="Home" href="/">
         {({isActive}) => {

src/view/shell/index.web.tsx

@@ -33,7 +33,7 @@ function ShellInner() {
   }, [navigator, closeAllActiveElements])
 
   return (
-    <View style={[s.hContentRegion]}>
+    <View style={s.hContentRegion}>
       <View style={s.hContentRegion}>
         <ErrorBoundary>
           <FlatNavigator />