diff options
| author | Ivan Chen <ivan@tagg.id> | 2021-06-11 17:01:43 -0400 |
|---|---|---|
| committer | Ivan Chen <ivan@tagg.id> | 2021-06-11 17:01:43 -0400 |
| commit | bcfbaf00f60b65ab5f8c38ff8766644a2496bed1 (patch) | |
| tree | af2fd669cf1f4cd427e832a39ac9deb2cd7a1430 /src/routes/main | |
| parent | 47b087816844473be858adf766b2f538ecf6d0aa (diff) | |
| parent | 17d3f1255bd7692772b675b09685a92b305e8d9b (diff) | |
Merge branch 'master' into tma904-moment-comment-revamp
# Conflicts:
# src/components/moments/MomentPost.tsx
# src/components/moments/MomentPostContent.tsx
# src/services/MomentService.ts
Diffstat (limited to 'src/routes/main')
| -rw-r--r-- | src/routes/main/MainStackNavigator.tsx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/routes/main/MainStackNavigator.tsx b/src/routes/main/MainStackNavigator.tsx index d22c1874..8fce5e2f 100644 --- a/src/routes/main/MainStackNavigator.tsx +++ b/src/routes/main/MainStackNavigator.tsx @@ -37,14 +37,14 @@ export type MainStackParams = { screenType: ScreenType; }; CaptionScreen: { - title: string; - image: Image; + title?: string; + image?: Image; screenType: ScreenType; selectedTags?: MomentTagType[]; + moment?: MomentType; }; TagFriendsScreen: { - image: Image; - screenType: ScreenType; + imagePath: string; selectedTags?: MomentTagType[]; }; TagSelectionScreen: { |