diff options
| author | Ivan Chen <ivan@tagg.id> | 2021-07-23 18:55:27 -0400 |
|---|---|---|
| committer | Ivan Chen <ivan@tagg.id> | 2021-07-23 18:55:27 -0400 |
| commit | c3febe151a34456cecbe84ffaac6eeea56254005 (patch) | |
| tree | 3e1465a0e195c3b9676513606089a3dd141b0176 /src/routes | |
| parent | 811426f6a4d2e3495d45c0ed1b209f2ea539e26f (diff) | |
| parent | e39fcbd9e35f6a5e36afe248e24bea0dd3859202 (diff) | |
Merge branch 'master' into tma994-bugfix-camera-screen-preview
# Conflicts:
# src/components/moments/TrimmerPlayer.tsx
# src/screens/upload/EditMedia.tsx
Diffstat (limited to 'src/routes')
| -rw-r--r-- | src/routes/main/MainStackNavigator.tsx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/routes/main/MainStackNavigator.tsx b/src/routes/main/MainStackNavigator.tsx index 11e9d08d..8def19e3 100644 --- a/src/routes/main/MainStackNavigator.tsx +++ b/src/routes/main/MainStackNavigator.tsx @@ -46,7 +46,7 @@ export type MainStackParams = { }; CaptionScreen: { screenType: ScreenType; - media?: {uri: string; isVideo: boolean}; + media?: {uri: string; isVideo: boolean; videoDuration: number | undefined}; selectedCategory?: string; selectedTags?: MomentTagType[]; moment?: MomentType; @@ -58,6 +58,7 @@ export type MainStackParams = { media: { uri: string; isVideo: boolean; + videoDuration: number | undefined; }; selectedTags?: MomentTagType[]; }; |