Revert "NMC 2346 - File Conflict changes"

This reverts commit d9790c0.

Author: harshada-15-tsys

iOSClient/Main/Create/NCCreateFormUploadConflict.swift

@@ -325,7 +325,7 @@ extension NCCreateFormUploadConflict: UITableViewDataSource {
             cell.switchAlreadyExistingFile.onTintColor = NCBrandColor.shared.getElement(account: metadataNewFile.account)
             cell.ocId = metadataNewFile.ocId
             cell.delegate = self
-            cell.labelFileName.text = metadataNewFile.fileNameView
+            cell.setBidiSafeFilename(metadataNewFile.fileNameView, isDirectory: metadataNewFile.directory, titleLabel: cell.labelFileName, extensionLabel: cell.labelExtensionFileName)
             cell.labelDetailAlreadyExistingFile.text = ""
             cell.labelDetailNewFile.text = ""
 

iOSClient/Main/Create/NCCreateFormUploadConflictCell.swift

@@ -26,6 +26,7 @@ import UIKit
 class NCCreateFormUploadConflictCell: UITableViewCell {
 
     @IBOutlet weak var labelFileName: UILabel!
+    @IBOutlet weak var labelExtensionFileName: UILabel!
 
     @IBOutlet weak var imageAlreadyExistingFile: UIImageView!
     @IBOutlet weak var imageNewFile: UIImageView!