[iOS] - Uplift 1.63.x of Leo Bug Fixes QA Iteration 1 (#22519)

* Fix popover not displaying correctly when something else is presented (keyboard, other controller, etc).
Update strings to be lowercased localized and uppercased in code.
Allow QA to test production links on a release channel.

Fix premium subscription info discrepancy.
The AppStore says the user is subscribed, but Leo says they are not.
We only allow the user to MANUALLY activate premium so this causes a bug.

Fix yet another bug in Skus SDK where order does not refresh automatically
Fix popover clipping on iPad
Regenerate other chat indices instead of just the last one.
Fix textField not being fully tappable.

* Fix compiling on 1.63 and 1.64.x

Author: Brandon-T

ios/brave-ios/Sources/AIChat/AIChatStrings.swift

@@ -47,7 +47,7 @@ extension Strings {
       "aichat.feedbackSuccessAnswerDisLikedTitle",
       tableName: "BraveLeo",
       bundle: .module,
-      value: "Answer DisLiked",
+      value: "Answer Disliked",
       comment: "The title for feedback view when response is sucessfull but disliked"
     )
     public static let feedbackSubmittedTitle = NSLocalizedString(
@@ -495,7 +495,7 @@ extension Strings {
       "aichat.advancedSettingsSubscriptionHeaderTitle",
       tableName: "BraveLeo",
       bundle: .module,
-      value: "SUBSCRIPTION",
+      value: "Subscription",
       comment: "The title for the header for subscription details"
     )
     public static let appStoreErrorTitle = NSLocalizedString(
@@ -551,21 +551,21 @@ extension Strings {
       "wallet.defaultModelChatSectionTitle",
       tableName: "BraveWallet",
       bundle: .module,
-      value: "CHAT",
+      value: "Chat",
       comment: "The title of the section where chat models are displayed as a list."
     )
     public static let unlimitedModelStatusTitle = NSLocalizedString(
       "wallet.unlimitedModelStatusTitle",
       tableName: "BraveWallet",
       bundle: .module,
-      value: "UNLIMITED",
+      value: "Unlimited",
       comment: "The title of the badge where a model which can be used unlimited"
     )
     public static let limitedModelStatusTitle = NSLocalizedString(
       "wallet.limitedModelStatusTitle",
       tableName: "BraveWallet",
       bundle: .module,
-      value: "LIMITED",
+      value: "Limited",
       comment: "The title of the badge where a model which can be used limited"
     )
     public static let defaultModelLanguageSectionTitle = NSLocalizedString(
@@ -607,7 +607,7 @@ extension Strings {
       "aichat.premiumNavigationBarBadgeTitle",
       tableName: "BraveLeo",
       bundle: .module,
-      value: "PREMIUM",
+      value: "Premium",
       comment: "Title shown next to Leo in navigation bar when user has premium subcription"
     )
     public static let infoAboutPageContext = NSLocalizedString(
@@ -726,7 +726,7 @@ extension Strings {
       "aichat.chatMenuSectionTitle",
       tableName: "BraveLeo",
       bundle: .module,
-      value: "CHAT",
+      value: "Chat",
       comment: "The title for the chat section in the menu"
     )
     public static let askLeoSearchSuggestionTitle = NSLocalizedString(

ios/brave-ios/Sources/AIChat/Components/AIChatNavigationView.swift

@@ -65,7 +65,7 @@ struct AIChatNavigationView<Content>: View where Content: View {
           .padding(.vertical)
 
         if premiumStatus == .active || premiumStatus == .activeDisconnected {
-          Text(Strings.AIChat.premiumNavigationBarBadgeTitle)
+          Text(Strings.AIChat.premiumNavigationBarBadgeTitle.uppercased())
             .font(.caption2.weight(.bold))
             .foregroundStyle(Color(braveSystemName: .blue50))
             .padding(.horizontal, 6.0)

ios/brave-ios/Sources/AIChat/Components/AIChatView.swift

@@ -299,7 +299,7 @@ public struct AIChatView: View {
               }
             } else {
               // The purchase was through the Brave Account Website
-              if BraveStoreSDK.shared.enviroment != .production {
+              if BraveStoreSDK.shared.environment != .production {
                 openURL(.brave.braveLeoManageSubscriptionStaging)
               } else {
                 openURL(.brave.braveLeoManageSubscriptionProd)
@@ -321,9 +321,14 @@ public struct AIChatView: View {
       title: Strings.AIChat.responseContextMenuRegenerateTitle,
       icon: Image(braveSystemName: "leo.refresh"),
       onSelected: {
-        model.retryLastRequest()
-      })
-    
+        if turnIndex == model.conversationHistory.count - 1 {
+          model.retryLastRequest()
+        } else if let query = model.conversationHistory[safe: turnIndex - 1]?.text {
+          model.submitQuery(query)
+        }
+      }
+    )
+
     AIChatResponseMessageViewContextMenuButton(
       title: Strings.AIChat.responseContextMenuCopyTitle,
       icon: Image(braveSystemName: "leo.copy"),

ios/brave-ios/Sources/AIChat/Components/Input/AIChatPaddedTextField.swift

@@ -0,0 +1,135 @@
+// Copyright 2024 The Brave Authors. All rights reserved.
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+import Foundation
+import SwiftUI
+
+struct AIChatPaddedTextField: UIViewRepresentable {
+  private var title: String
+
+  @Binding
+  private var text: String
+
+  private var textColor: UIColor?
+
+  private var prompt: String?
+
+  private var promptColor: UIColor?
+
+  private var font: UIFont?
+
+  private var submitLabel: UIReturnKeyType
+
+  private var onSubmit: (() -> Void)?
+
+  private var insets: CGSize
+
+  init<S>(
+    _ title: S,
+    text: Binding<String>,
+    textColor: UIColor? = nil,
+    prompt: String? = nil,
+    promptColor: UIColor? = nil,
+    font: UIFont? = nil,
+    submitLabel: UIReturnKeyType = .done,
+    onSubmit: (() -> Void)? = nil,
+    insets: CGSize = .zero
+  )
+  where S: StringProtocol {
+    self.title = String(title)
+    self._text = text
+    self.textColor = textColor
+    self.prompt = prompt
+    self.promptColor = promptColor
+    self.font = font
+    self.submitLabel = submitLabel
+    self.onSubmit = onSubmit
+    self.insets = insets
+  }
+
+  func makeUIView(context: Context) -> PaddedTextField {
+    let view = PaddedTextField()
+
+    view.accessibilityLabel = title
+    view.text = text
+    view.textColor = textColor
+    view.font = font
+    view.returnKeyType = submitLabel
+    view.xInset = insets.width
+    view.yInset = insets.height
+    view.setContentHuggingPriority(.defaultHigh, for: .vertical)
+    view.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
+    view.setContentCompressionResistancePriority(.defaultHigh, for: .vertical)
+    view.delegate = context.coordinator
+    view.addTarget(
+      context.coordinator,
+      action: #selector(Coordinator.textFieldTextChanged(_:)),
+      for: .editingChanged
+    )
+
+    if let prompt = prompt, !prompt.isEmpty {
+      if let promptColor = promptColor {
+        let attributedPlaceHolder = NSMutableAttributedString(string: prompt)
+        attributedPlaceHolder.addAttribute(
+          .foregroundColor,
+          value: promptColor,
+          range: NSRange(location: 0, length: prompt.count)
+        )
+        view.attributedPlaceholder = attributedPlaceHolder
+      } else {
+        view.placeholder = prompt
+      }
+    }
+    return view
+  }
+
+  func updateUIView(_ view: PaddedTextField, context: Context) {
+    view.text = text
+  }
+
+  func makeCoordinator() -> Coordinator {
+    return Coordinator(text: $text, onSubmit: onSubmit)
+  }
+
+  class PaddedTextField: UITextField {
+    var xInset: CGFloat = 0.0
+    var yInset: CGFloat = 0.0
+
+    override func textRect(forBounds bounds: CGRect) -> CGRect {
+      return super.textRect(forBounds: bounds.insetBy(dx: xInset, dy: yInset))
+    }
+
+    override func editingRect(forBounds bounds: CGRect) -> CGRect {
+      return textRect(forBounds: bounds)
+    }
+
+    override func placeholderRect(forBounds bounds: CGRect) -> CGRect {
+      return textRect(forBounds: bounds)
+    }
+  }
+
+  class Coordinator: NSObject, UITextFieldDelegate {
+    @Binding
+    private var text: String
+
+    private var onSubmit: (() -> Void)?
+
+    init(text: Binding<String>, onSubmit: (() -> Void)?) {
+      self._text = text
+      self.onSubmit = onSubmit
+      super.init()
+    }
+
+    func textFieldShouldReturn(_ textField: UITextField) -> Bool {
+      onSubmit?()
+      return true
+    }
+
+    @objc
+    func textFieldTextChanged(_ textField: UITextField) {
+      self.text = textField.text ?? ""
+    }
+  }
+}

ios/brave-ios/Sources/AIChat/Components/AIChatPromptInputView.swift renamed to ios/brave-ios/Sources/AIChat/Components/Input/AIChatPromptInputView.swift

@@ -3,49 +3,48 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-import SwiftUI
+import AVFoundation
 import DesignSystem
 import SpeechRecognition
-import AVFoundation
+import SwiftUI
 
 struct AIChatPromptInputView: View {
   private var speechRecognizer = SpeechRecognizer()
-  
+
   @State
   private var isVoiceEntryPresented = false
-  
+
   @State
   private var isNoMicrophonePermissionPresented = false
-  
+
   @State
   private var prompt: String = ""
-  
+
   var onSubmit: (String) -> Void
-  
+
   init(onSubmit: @escaping (String) -> Void) {
     self.onSubmit = onSubmit
   }
 
   var body: some View {
     HStack(spacing: 0.0) {
-      TextField(
+      AIChatPaddedTextField(
         Strings.AIChat.promptPlaceHolderDescription,
         text: $prompt,
-        prompt: Text(Strings.AIChat.promptPlaceHolderDescription)
-          .font(.subheadline)
-          .foregroundColor(Color(braveSystemName: .textTertiary))
+        textColor: UIColor(braveSystemName: .textPrimary),
+        prompt: Strings.AIChat.promptPlaceHolderDescription,
+        promptColor: UIColor(braveSystemName: .textTertiary),
+        font: .preferredFont(forTextStyle: .subheadline),
+        submitLabel: .send,
+        onSubmit: {
+          if !prompt.isEmpty {
+            onSubmit(prompt)
+            prompt = ""
+          }
+        },
+        insets: .init(width: 16.0, height: 16.0)
       )
-      .font(.subheadline)
-      .foregroundColor(Color(braveSystemName: .textPrimary))
-      .submitLabel(.send)
-      .onSubmit {
-        if !prompt.isEmpty {
-          onSubmit(prompt)
-          prompt = ""
-        }
-      }
-      .padding(.leading)
-      
+
       if prompt.isEmpty {
         Button {
           Task { @MainActor in
@@ -63,6 +62,8 @@ struct AIChatPromptInputView: View {
           .labelStyle(.iconOnly)
         }
         .opacity(speechRecognizer.isVoiceSearchAvailable ? 1.0 : 0.0)
+        .disabled(!speechRecognizer.isVoiceSearchAvailable)
+        .frame(width: speechRecognizer.isVoiceSearchAvailable ? nil : 0.0)
       } else {
         Button {
           onSubmit(prompt)
@@ -93,7 +94,7 @@ struct AIChatPromptInputView: View {
       )
     }
   }
-  
+
   @MainActor
   private func activateSpeechRecognition() async {
     let permissionStatus = await speechRecognizer.askForUserPermission()
@@ -108,7 +109,7 @@ struct AIChatPromptInputView: View {
 #if DEBUG
 struct AIChatPromptInputView_Preview: PreviewProvider {
   static var previews: some View {
-    AIChatPromptInputView() {
+    AIChatPromptInputView {
       print("Prompt Submitted: \($0)")
     }
     .previewLayout(.sizeThatFits)

ios/brave-ios/Sources/AIChat/Components/PageContext/AIChatPageContextView.swift

@@ -49,6 +49,7 @@ struct AIChatPageContextView: View {
             ) {
               AIChatPageContextInfoView(url: url, pageTitle: pageTitle)
                 .background(Color(braveSystemName: .containerBackground))
+                .frame(maxWidth: 400.0)
             }
         }
       }

ios/brave-ios/Sources/AIChat/Components/Popover/PopoverView.swift

@@ -53,17 +53,43 @@ struct BravePopoverView<Content: View & PopoverContentComponent>: UIViewControll
 
   func updateUIViewController(_ uiViewController: UIViewController, context: Context) {
     if isPresented {
-      guard uiViewController.presentedViewController == nil, let parent = uiViewController.parent else {
+      guard uiViewController.presentedViewController == nil
+      else {
+        // The system dismissed our popover automatically, but never updated our presentation state
+        // It usually does this if you present another popover or sheet
+        // Manually update it
+        if context.coordinator.presentedViewController != nil {
+          DispatchQueue.main.async {
+            isPresented = false
+          }
+        }
         return
       }
-      
-      let controller = PopoverController(content: content)
-      context.coordinator.presentedViewController = .init(controller)
-      controller.popoverDidDismiss = { _ in
-        self.isPresented = false
+
+      if let parent = uiViewController.parent, !parent.isBeingDismissed {
+        let controller = PopoverController(content: content)
+        context.coordinator.presentedViewController = .init(controller)
+        controller.popoverDidDismiss = { _ in
+          self.isPresented = false
+        }
+
+        DispatchQueue.main.async {
+          if KeyboardHelper.defaultHelper.currentState != nil {
+            UIApplication.shared.sendAction(
+              #selector(UIResponder.resignFirstResponder),
+              to: nil,
+              from: nil,
+              for: nil
+            )
+
+            DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+              controller.present(from: uiViewController.view, on: parent)
+            }
+          } else {
+            controller.present(from: uiViewController.view, on: parent)
+          }
+        }
       }
-      
-      controller.present(from: uiViewController.view, on: parent)
     } else {
       if let presentedViewController = context.coordinator.presentedViewController?.value,
          presentedViewController == uiViewController.presentedViewController {