CC-8308: Cherry pick merge conflict

meganz · Oct 17, 2024 · 55824e4 · 55824e4
1 parent c1b3abf
commit 55824e4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/...tation/Features/Video/Sources/Video/Views/Videos/AllVideosCollectionViewCoordinator.swift b/...tation/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
@@ -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()