Fix brave/brave-ios#8087: VPN Reset Configuration Clear confirmation (b…

…rave/brave-ios#8122)
brave · Sep 25, 2023 · b9372f5 · b9372f5
1 parent 8e95649
commit b9372f5
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/Sources/BraveStrings/BraveStrings.swift b/Sources/BraveStrings/BraveStrings.swift
@@ -2950,6 +2950,16 @@ extension Strings {
       NSLocalizedString("vpn.resetVPNErrorBody", tableName: "BraveShared", bundle: .module,
         value: "Failed to reset vpn configuration, please try again later.",
         comment: "Message to show when vpn configuration reset fails.")
+
+    public static let resetVPNSuccessTitle =
+      NSLocalizedString("vpn.resetVPNSuccessTitle", tableName: "BraveShared", bundle: .module,
+        value: "Success",
+        comment: "Title for success message when vpn configuration reset succeeds.")
+
+    public static let resetVPNSuccessBody =
+      NSLocalizedString("vpn.resetVPNSuccessBody", tableName: "BraveShared", bundle: .module,
+        value: "VPN Configuration is resetted successfully.",
+        comment: "Message to show when vpn configuration reset succeeds.")
 
     public static let contactFormDoNotEditText =
       NSLocalizedString("vpn.contactFormDoNotEditText", tableName: "BraveShared", bundle: .module,

diff --git a/Sources/BraveVPN/BraveVPNSettingsViewController.swift b/Sources/BraveVPN/BraveVPNSettingsViewController.swift
@@ -244,9 +244,7 @@ public class BraveVPNSettingsViewController: TableViewController {
           self.isLoading = false
           self.vpnReconfigurationPending = false
           self.updateServerInfo()
-          if !success {
-            self.showVPNResetErrorAlert()
-          }
+          self.showVPNResetAlert(success: success)
         }
       }
     })
@@ -294,9 +292,11 @@ public class BraveVPNSettingsViewController: TableViewController {
     navigationController?.pushViewController(vc, animated: true)
   }
 
-  private func showVPNResetErrorAlert() {
-    let alert = UIAlertController(title: Strings.VPN.resetVPNErrorTitle,
-                                  message: Strings.VPN.resetVPNErrorBody, preferredStyle: .alert)
+  private func showVPNResetAlert(success: Bool) {
+    let alert = UIAlertController(
+      title: success ? Strings.VPN.resetVPNSuccessTitle : Strings.VPN.resetVPNErrorTitle,
+      message: success ? Strings.VPN.resetVPNSuccessBody : Strings.VPN.resetVPNErrorBody,
+      preferredStyle: .alert)
 
     let okAction = UIAlertAction(title: Strings.OKString, style: .default)
     alert.addAction(okAction)

diff --git a/Sources/BraveVPN/InstallVPNView.swift b/Sources/BraveVPN/InstallVPNView.swift
@@ -93,7 +93,7 @@ extension InstallVPNViewController {
 
     let installVPNButton = BraveButton().then {
       $0.setTitle(Strings.VPN.installProfileButtonText, for: .normal)
-      $0.backgroundColor = .braveBlurpleTint
+      $0.backgroundColor = .braveDarkerBlurple
       $0.titleLabel?.font = .systemFont(ofSize: 16, weight: .semibold)
       $0.setTitleColor(.white, for: .normal)
       $0.snp.makeConstraints { make in
@@ -109,7 +109,7 @@ extension InstallVPNViewController {
     let contactSupportButton = BraveButton(type: .system).then {
       $0.setTitle(Strings.VPN.settingsContactSupport, for: .normal)
       $0.titleLabel?.font = .systemFont(ofSize: 16)
-      $0.setTitleColor(.braveLabel, for: .normal)
+      $0.setTitleColor(.secondaryBraveLabel, for: .normal)
       $0.snp.makeConstraints { make in
         make.height.equalTo(44)
       }