From 55824e404ef8d030e5c62d5e415bdcfe226e58ac Mon Sep 17 00:00:00 2001
From: Arifin Firdaus <af@mega.co.nz>
Date: Thu, 17 Oct 2024 13:43:17 +1300
Subject: [PATCH]  CC-8308: Cherry pick merge conflict

---
 .../Views/Videos/AllVideosCollectionViewCoordinator.swift      | 2 +-
 .../Video/Sources/Video/Views/Videos/Cells/VideoCellView.swift | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Modules/Presentation/Features/Video/Sources/Video/Views/Videos/AllVideosCollectionViewCoordinator.swift b/Modules/Presentation/Features/Video/Sources/Video/Views/Videos/AllVideosCollectionViewCoordinator.swift
index 28f07f16a..12bbc4fd8 100644
--- a/Modules/Presentation/Features/Video/Sources/Video/Views/Videos/AllVideosCollectionViewCoordinator.swift
+++ b/Modules/Presentation/Features/Video/Sources/Video/Views/Videos/AllVideosCollectionViewCoordinator.swift
@@ -48,7 +48,7 @@ final class AllVideosCollectionViewCoordinator: NSObject {
         self.videoConfig = representer.videoConfig
     }
     
-    func configureDataSource(for collectionView: UICollectionView) {        
+    func configureDataSource(for collectionView: UICollectionView) {
         dataSource = makeDataSource(for: collectionView)
         collectionView.dataSource = dataSource
     }
diff --git a/Modules/Presentation/Features/Video/Sources/Video/Views/Videos/Cells/VideoCellView.swift b/Modules/Presentation/Features/Video/Sources/Video/Views/Videos/Cells/VideoCellView.swift
index 51c8f0251..662917d51 100644
--- a/Modules/Presentation/Features/Video/Sources/Video/Views/Videos/Cells/VideoCellView.swift
+++ b/Modules/Presentation/Features/Video/Sources/Video/Views/Videos/Cells/VideoCellView.swift
@@ -1,5 +1,6 @@
 import MEGADesignToken
 import MEGADomain
+import MEGAPresentation
 import MEGASwiftUI
 import SwiftUI
 
@@ -152,7 +153,7 @@ struct VideoCellViewContent: View {
         case .selection:
             checkMarkView
                 .padding(.leading, 10)
-        case .reorder:
+        case .reorder where DIContainer.featureFlagProvider.isFeatureFlagEnabled(for: .reorderVideosInVideoPlaylistContent):
             dragIndicatorView
         default:
             EmptyView()