From fb8b1c227f396461ce9868c69ea98a6fe04b7bc8 Mon Sep 17 00:00:00 2001 From: TSI-amrutwaghmare <96108296+TSI-amrutwaghmare@users.noreply.github.com> Date: Mon, 9 Oct 2023 12:48:10 +0530 Subject: [PATCH 1/3] NMC 2346 - More Details option removed from file conflict dialogue alert --- iOSClient/Main/Create/NCCreateFormUploadConflict.swift | 5 ----- 1 file changed, 5 deletions(-) diff --git a/iOSClient/Main/Create/NCCreateFormUploadConflict.swift b/iOSClient/Main/Create/NCCreateFormUploadConflict.swift index 68041c44a8..f92e55bcda 100644 --- a/iOSClient/Main/Create/NCCreateFormUploadConflict.swift +++ b/iOSClient/Main/Create/NCCreateFormUploadConflict.swift @@ -169,11 +169,6 @@ class NCCreateFormUploadConflict: UIViewController { self.buttonContinueTouch(action) })) - // MORE - conflictAlert.addAction(UIAlertAction(title: NSLocalizedString("_more_action_title_", comment: ""), style: .default, handler: { _ in - self.blurView.removeFromSuperview() - })) - // CANCEL conflictAlert.addAction(UIAlertAction(title: NSLocalizedString("_cancel_keep_existing_action_title_", comment: ""), style: .cancel, handler: { _ in self.dismiss(animated: true) { From a31b9c28d8c030388430bc2eb81020d0ca59f8ba Mon Sep 17 00:00:00 2001 From: harshada-15-tsys Date: Mon, 15 Dec 2025 12:59:39 +0530 Subject: [PATCH 2/3] NMC 2346 - File Conflict changes --- iOSClient/Main/Create/NCCreateFormUploadConflict.swift | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/iOSClient/Main/Create/NCCreateFormUploadConflict.swift b/iOSClient/Main/Create/NCCreateFormUploadConflict.swift index f92e55bcda..68041c44a8 100644 --- a/iOSClient/Main/Create/NCCreateFormUploadConflict.swift +++ b/iOSClient/Main/Create/NCCreateFormUploadConflict.swift @@ -169,6 +169,11 @@ class NCCreateFormUploadConflict: UIViewController { self.buttonContinueTouch(action) })) + // MORE + conflictAlert.addAction(UIAlertAction(title: NSLocalizedString("_more_action_title_", comment: ""), style: .default, handler: { _ in + self.blurView.removeFromSuperview() + })) + // CANCEL conflictAlert.addAction(UIAlertAction(title: NSLocalizedString("_cancel_keep_existing_action_title_", comment: ""), style: .cancel, handler: { _ in self.dismiss(animated: true) { From de7fe343f552b4662d82d05fe4703fc4c61d931b Mon Sep 17 00:00:00 2001 From: harshada-15-tsys Date: Tue, 16 Jun 2026 16:09:11 +0530 Subject: [PATCH 3/3] NMC 2346 - File Conflict changes --- iOSClient/Main/Create/NCCreateFormUploadConflict.swift | 2 +- iOSClient/Main/Create/NCCreateFormUploadConflictCell.swift | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/iOSClient/Main/Create/NCCreateFormUploadConflict.swift b/iOSClient/Main/Create/NCCreateFormUploadConflict.swift index 68041c44a8..b1937b3299 100644 --- a/iOSClient/Main/Create/NCCreateFormUploadConflict.swift +++ b/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.setBidiSafeFilename(metadataNewFile.fileNameView, isDirectory: metadataNewFile.directory, titleLabel: cell.labelFileName, extensionLabel: cell.labelExtensionFileName) + cell.labelFileName.text = metadataNewFile.fileNameView cell.labelDetailAlreadyExistingFile.text = "" cell.labelDetailNewFile.text = "" diff --git a/iOSClient/Main/Create/NCCreateFormUploadConflictCell.swift b/iOSClient/Main/Create/NCCreateFormUploadConflictCell.swift index 446a02edde..0c49140faa 100644 --- a/iOSClient/Main/Create/NCCreateFormUploadConflictCell.swift +++ b/iOSClient/Main/Create/NCCreateFormUploadConflictCell.swift @@ -26,7 +26,6 @@ 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!