diff options
| author | Ivan Chen <ivan@tagg.id> | 2021-04-07 13:14:36 -0400 |
|---|---|---|
| committer | Ivan Chen <ivan@tagg.id> | 2021-04-07 13:14:36 -0400 |
| commit | f36ce8993d45ed69845a2ff6340f4d52d03855d9 (patch) | |
| tree | 2c2acec3adfeda204c0b48eb7c7b22a7802780eb /src/routes | |
| parent | 4b0e55cd751bd77e05b8158177a74bd190974218 (diff) | |
| parent | a3abb3abe322ea84306e1a12cec46972a81a37de (diff) | |
Merge branch 'master' into chat-poc
# Conflicts:
# src/components/profile/Content.tsx
# src/components/taggs/TaggsBar.tsx
# src/screens/profile/ProfileScreen.tsx
# src/types/types.ts
Diffstat (limited to 'src/routes')
| -rw-r--r-- | src/routes/main/MainStackNavigator.tsx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/routes/main/MainStackNavigator.tsx b/src/routes/main/MainStackNavigator.tsx index 021c0688..01b28fd4 100644 --- a/src/routes/main/MainStackNavigator.tsx +++ b/src/routes/main/MainStackNavigator.tsx @@ -73,6 +73,7 @@ export type MainStackParams = { screenType: ScreenType; momentCategory: string; profileBodyHeight: number; + socialsBarHeight: number; }; AnimatedTutorial: { screenType: ScreenType; |