From c0b7a7f94b0cd2d0e4e130050a805b19d7ca8131 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/2] 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 2f09bbcab728276488aeeeed795f44b1b3915e2f Mon Sep 17 00:00:00 2001 From: harshada-15-tsys Date: Mon, 15 Dec 2025 12:59:39 +0530 Subject: [PATCH 2/2] 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) {