Merge branch 'standardised-strings' of https://github.com/RyanRory/loki-messenger-ios into standardised-strings

Session/Settings/NukeDataModal.swift

@@ -220,24 +220,19 @@ final class NukeDataModal: Modal {
                         receiveValue: { confirmations in
                             self?.dismiss(animated: true, completion: nil) // Dismiss the loader
 
+                            // Get a list of nodes which failed to delete the data
                             let potentiallyMaliciousSnodes = confirmations
                                 .compactMap { ($0.value == false ? $0.key : nil) }
                             
-                            if potentiallyMaliciousSnodes.isEmpty {
+                            // If all of the nodes successfully deleted the data then proceed
-                                let modal: ConfirmationModal = ConfirmationModal(
+                            // to delete the local data
-                                    targetView: self?.view,
+                            guard !potentiallyMaliciousSnodes.isEmpty else {
-                                    info: ConfirmationModal.Info(
+                                self?.deleteAllLocalData()
-                                        title: "clearDataAll".localized(),
+                                return
-                                        body: .text("clearDataErrorDescriptionGeneric".localized()),
-                                        confirmTitle: "clear".localized(),
-                                        confirmStyle: .danger,
-                                        cancelStyle: .alert_text
-                                    ) { [weak self] _ in
-                                        self?.clearDeviceOnly()
                             }
-                                )
+
-                                self?.present(modal, animated: true)
+                            // Otherwise we should warn the user that one or more service node
-                            } else {
+                            // failed to delete the data
                             let message: String = "clearDataErrorDescription"
                                 .putNumber(potentiallyMaliciousSnodes.count)
                                 .put(key: "service_node_id", value: potentiallyMaliciousSnodes.joined(separator: ", "))
@@ -254,7 +249,6 @@ final class NukeDataModal: Modal {
                             )
                             self?.present(modal, animated: true)
                         }
-                        }
                     )
             }
     }