From 66f6d563f3cce86a63ecbbdcb80c5e94aec61eca Mon Sep 17 00:00:00 2001
From: Stuart Breckenridge <stuart.breckenridge@icloud.com>
Date: Thu, 22 Dec 2022 08:48:17 +0800
Subject: [PATCH] Audited .alerts

- Consistent verb usage
- Removes dismiss buttons if they are the only action (automatically added)
---
 .../Accounts/AddAccountListView.swift                  | 10 +++-------
 .../Extensions/EnableExtensionPointView.swift          |  2 --
 .../Extensions/ExtensionsManagementView.swift          |  2 +-
 iOS/Settings/Appearance/ArticleThemeManagerView.swift  | 10 ++--------
 4 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/iOS/Settings/Account and Extensions/Accounts/AddAccountListView.swift b/iOS/Settings/Account and Extensions/Accounts/AddAccountListView.swift
index 5123ee3e3..b56e2b3a4 100644
--- a/iOS/Settings/Account and Extensions/Accounts/AddAccountListView.swift	
+++ b/iOS/Settings/Account and Extensions/Accounts/AddAccountListView.swift	
@@ -101,13 +101,9 @@ struct AddAccountListView: View {
 				}
 			}
 			.alert(Text("Error", comment: "Alert title: Error"),
-				   isPresented: $viewModel.showAddAccountError.1, actions: {
-				Button {
-					//
-				} label: {
-					Text("Dismiss", comment: "Button title")
-				}
-			}, message: {
+				   isPresented: $viewModel.showAddAccountError.1,
+				   actions: { },
+				   message: {
 				Text("\(viewModel.showAddAccountError.0?.localizedDescription ?? "Unknown Error")")
 			})
 			.dismissOnAccountAdd()
diff --git a/iOS/Settings/Account and Extensions/Extensions/EnableExtensionPointView.swift b/iOS/Settings/Account and Extensions/Extensions/EnableExtensionPointView.swift
index 868d9d479..a662d21af 100644
--- a/iOS/Settings/Account and Extensions/Extensions/EnableExtensionPointView.swift	
+++ b/iOS/Settings/Account and Extensions/Extensions/EnableExtensionPointView.swift	
@@ -22,12 +22,10 @@ struct EnableExtensionPointView: View  {
 			Section { enableButton }
 		}
 		.alert(Text("Error", comment: "Alert title: Error"), isPresented: $extensionError.1, actions: {
-			Button(action: {}, label: { Text("Dismiss", comment: "Button title") })
 		}, message: {
 			Text(extensionError.0?.localizedDescription ?? "Unknown Error")
 		})
 		.alert(Text("Error", comment: "Alert title: Error"), isPresented: $viewModel.showExtensionError.1, actions: {
-			Button(action: {}, label: { Text("Dismiss", comment: "Button title") })
 		}, message: {
 			Text(viewModel.showExtensionError.0?.localizedDescription ?? "Unknown Error")
 		})
diff --git a/iOS/Settings/Account and Extensions/Extensions/ExtensionsManagementView.swift b/iOS/Settings/Account and Extensions/Extensions/ExtensionsManagementView.swift
index f6a49df8f..41ead8854 100644
--- a/iOS/Settings/Account and Extensions/Extensions/ExtensionsManagementView.swift	
+++ b/iOS/Settings/Account and Extensions/Extensions/ExtensionsManagementView.swift	
@@ -39,7 +39,7 @@ struct ExtensionsManagementView: View {
 			Button(role: .destructive) {
 				ExtensionPointManager.shared.deactivateExtensionPoint(extensionToDeactivate!.value.extensionPointID)
 			} label: {
-				Text("Deactivate", comment: "Button: deactivate extension.")
+				Text("Deactivate Extension", comment: "Button: deactivate extension.")
 			}
 
 			Button(role: .cancel) {
diff --git a/iOS/Settings/Appearance/ArticleThemeManagerView.swift b/iOS/Settings/Appearance/ArticleThemeManagerView.swift
index e015ad355..6532daf90 100644
--- a/iOS/Settings/Appearance/ArticleThemeManagerView.swift
+++ b/iOS/Settings/Appearance/ArticleThemeManagerView.swift
@@ -107,7 +107,7 @@ struct ArticleThemeManagerView: View {
 					} label: {
 						let exists = themeManager.themeExists(filename: showImportConfirmationAlert.0?.path ?? "")
 						if exists == true {
-							Text("Overwrite", comment: "Button title")
+							Text("Overwrite Theme", comment: "Button title")
 						} else {
 							Text("Import Theme", comment: "Button title")
 						}
@@ -139,13 +139,7 @@ struct ArticleThemeManagerView: View {
 		})
 		.alert(Text("Error", comment: "Alert title: Error"),
 			   isPresented: $showImportErrorAlert.1,
-			   actions: {
-					Button(role: .cancel) {
-						
-					} label: {
-						Text("Dismiss", comment: "Button title")
-					}
-		}, message: {
+			   actions: { }, message: {
 			Text("\(showImportErrorAlert.0?.localizedDescription ?? "")")
 		})
 		.onReceive(themeManager.objectWillChange) { _ in