about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--src/view/shell/mobile/index.tsx9
-rw-r--r--todos.txt4
2 files changed, 7 insertions, 6 deletions
diff --git a/src/view/shell/mobile/index.tsx b/src/view/shell/mobile/index.tsx
index 69e3a66f1..63edf4e69 100644
--- a/src/view/shell/mobile/index.tsx
+++ b/src/view/shell/mobile/index.tsx
@@ -112,11 +112,11 @@ export const MobileShell: React.FC = observer(() => {
         </TouchableOpacity>
       </View>
       <SafeAreaView style={styles.innerContainer}>
-        <ScreenContainer>
+        <ScreenContainer style={styles.screenContainer}>
           {screenRenderDesc.screens.map(({Com, params, key, activityState}) => (
             <Screen
               key={key}
-              style={styles.screen}
+              style={[StyleSheet.absoluteFill, styles.screen]}
               activityState={activityState}>
               <Com params={params} />
             </Screen>
@@ -177,7 +177,7 @@ function constructScreenRenderDesc(nav: NavigationModel): {
       return Object.assign(matchRes, {
         key: `t${tab.id}-s${screen.index}`,
         activityState: isCurrent ? 2 : 0,
-      })
+      }) as ScreenRenderDesc
     })
     screens = screens.concat(parsedTabScreens)
   }
@@ -194,6 +194,9 @@ const styles = StyleSheet.create({
   innerContainer: {
     flex: 1,
   },
+  screenContainer: {
+    flex: 1,
+  },
   screen: {
     backgroundColor: colors.gray1,
   },
diff --git a/todos.txt b/todos.txt
index bf08cd3a2..661f8082b 100644
--- a/todos.txt
+++ b/todos.txt
@@ -14,6 +14,4 @@ Paul's todo list
   - Follows list
 - Navigation
   - Restore all functionality that was disabled during the refactor
-  - Reduce extraneous triggers of useLoadEffect
-- Bugs
-  - Home screen goes white sometimes, not sure why (possibly related to multiple active instances of the screen)
\ No newline at end of file
+  - Reduce extraneous triggers of useLoadEffect
\ No newline at end of file