Fix merge conflict

dennis531 · Apr 26, 2024 · a9e3233 · a9e3233
1 parent e4cf493
commit a9e3233
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/VideoPlayers.tsx b/src/main/VideoPlayers.tsx
@@ -128,7 +128,7 @@ interface VideoPlayerProps {
   setIsPlaying: ActionCreatorWithPayload<boolean, string>,
   setPreviewTriggered: ActionCreatorWithPayload<boolean, string>,
   setClickTriggered: ActionCreatorWithPayload<boolean, string>,
-  setJumpTriggered: ActionCreatorWithPayload<any, string>,
+  setJumpTriggered: ActionCreatorWithPayload<boolean, string>,
   setCurrentlyAt: ActionCreatorWithPayload<number, string> | AsyncThunk<void, number, AsyncThunkConfig>,
   setAspectRatio: ActionCreatorWithPayload<{ dataKey: number; } & { width: number, height: number; }, string>,
 }

diff --git a/src/redux/videoSlice.ts b/src/redux/videoSlice.ts
@@ -138,7 +138,7 @@ const videoSlice = createSlice({
     setClickTriggered: (state, action: PayloadAction<video["clickTriggered"]>) => {
       state.clickTriggered = action.payload;
     },
-    setJumpTriggered: (state, action) => {
+    setJumpTriggered: (state, action: PayloadAction<video["jumpTriggered"]>) => {
       state.jumpTriggered = action.payload;
     },
     setCurrentlyAt: (state, action: PayloadAction<video["currentlyAt"]>) => {
@@ -480,7 +480,7 @@ export const {
   setClickTriggered,
   setJumpTriggered,
   jumpToPreviousSegment,
-  jumpToNextSegment
+  jumpToNextSegment,
 } = videoSlice.actions;
 
 export const selectVideos = createSelector(