[iOS] - Uplift Leo QA Iteration 4 - 1.64.x

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

@@ -16,6 +16,9 @@ public struct AIChatView: View {
   @ObservedObject
   var model: AIChatViewModel
 
+  @ObservedObject
+  var speechRecognizer: SpeechRecognizer
+
   @Environment(\.dismiss)
   private var dismiss
 
@@ -42,8 +45,13 @@ public struct AIChatView: View {
 
   var openURL: ((URL) -> Void)
 
-  public init(model: AIChatViewModel, openURL: @escaping (URL) -> Void) {
+  public init(
+    model: AIChatViewModel,
+    speechRecognizer: SpeechRecognizer,
+    openURL: @escaping (URL) -> Void
+  ) {
     self.model = model
+    self.speechRecognizer = speechRecognizer
     self.openURL = openURL
   }
 
@@ -236,7 +244,7 @@ public struct AIChatView: View {
       }
 
       if model.isAgreementAccepted || (!hasSeenIntro.value && !model.isAgreementAccepted) {
-        AIChatPromptInputView { prompt in
+        AIChatPromptInputView(speechRecognizer: speechRecognizer) { prompt in
           hasSeenIntro.value = true
           model.submitQuery(prompt)
           hideKeyboard()
@@ -253,7 +261,7 @@ public struct AIChatView: View {
       AIChatPaywallView(
         premiumUpgrageSuccessful: { _ in
           Task { @MainActor in
-            await model.refreshPremiumStatusOrderCredentials()
+            await model.refreshPremiumStatus()
           }
         })
     }
@@ -265,7 +273,7 @@ public struct AIChatView: View {
     }
     .onAppear {
       Task { @MainActor in
-        await model.refreshPremiumStatusOrderCredentials()
+        await model.refreshPremiumStatus()
       }
 
       if let query = model.querySubmited {
@@ -412,19 +420,14 @@ public struct AIChatView: View {
         },
         dismissAction: {
           Task { @MainActor in
-            // This is needed to try to mitigate a bug in SkusSDK
-            // See: https://github.com/brave/brave-browser/issues/36824
-            // Also see the comment on the function
-            if model.premiumStatus == .active || model.premiumStatus == .activeDisconnected {
-              await model.refreshPremiumStatusOrderCredentials()
-            }
-          }
+            await model.refreshPremiumStatus()
 
-          if let basicModel = model.models.first(where: { $0.access == .basic }) {
-            model.changeModel(modelKey: basicModel.key)
-            model.retryLastRequest()
-          } else {
-            Logger.module.error("No basic models available")
+            if let basicModel = model.models.first(where: { $0.access == .basic }) {
+              model.changeModel(modelKey: basicModel.key)
+              model.retryLastRequest()
+            } else {
+              Logger.module.error("No basic models available")
+            }
           }
         }
       )
@@ -441,6 +444,7 @@ public struct AIChatView: View {
 
   private var feedbackView: some View {
     AIChatFeedbackView(
+      speechRecognizer: speechRecognizer,
       premiumStatus: model.premiumStatus,
       shouldShowPremiumAd: shouldShowFeedbackPremiumAd.value,
       onSubmit: { category, feedback in
@@ -537,6 +541,7 @@ struct AIChatView_Preview: PreviewProvider {
             .background(Color(braveSystemName: .containerBackground))
 
             AIChatFeedbackView(
+              speechRecognizer: SpeechRecognizer(),
               premiumStatus: .inactive,
               shouldShowPremiumAd: true,
               onSubmit: {
@@ -572,7 +577,7 @@ struct AIChatView_Preview: PreviewProvider {
       )
       .padding()
 
-      AIChatPromptInputView {
+      AIChatPromptInputView(speechRecognizer: SpeechRecognizer()) {
         print("Prompt Submitted: \($0)")
       }
     }

ios/brave-ios/Sources/AIChat/Components/Feedback/AIChatFeedbackView.swift

@@ -185,7 +185,7 @@ private struct AIChatDropdownView: View {
 }
 
 private struct AIChatFeedbackInputView: View {
-  private var speechRecognizer = SpeechRecognizer()
+  private var speechRecognizer: SpeechRecognizer
 
   @State
   private var isVoiceEntryPresented = false
@@ -196,7 +196,8 @@ private struct AIChatFeedbackInputView: View {
   @Binding
   var text: String
 
-  init(text: Binding<String>) {
+  init(speechRecognizer: SpeechRecognizer, text: Binding<String>) {
+    self.speechRecognizer = speechRecognizer
     _text = text
   }
 
@@ -337,6 +338,7 @@ struct AIChatFeedbackView: View {
   @State
   private var feedbackText: String = ""
 
+  var speechRecognizer: SpeechRecognizer
   var premiumStatus: AiChat.PremiumStatus
 
   var shouldShowPremiumAd: Bool
@@ -360,7 +362,7 @@ struct AIChatFeedbackView: View {
         .frame(maxWidth: .infinity, alignment: .leading)
         .padding([.horizontal, .top])
 
-      AIChatFeedbackInputView(text: $feedbackText)
+      AIChatFeedbackInputView(speechRecognizer: speechRecognizer, text: $feedbackText)
         .padding([.horizontal, .bottom])
 
       if premiumStatus != .active && premiumStatus != .activeDisconnected && shouldShowPremiumAd {
@@ -397,6 +399,7 @@ struct AIChatFeedbackView: View {
 struct AIChatFeedbackView_Previews: PreviewProvider {
   static var previews: some View {
     AIChatFeedbackView(
+      speechRecognizer: SpeechRecognizer(),
       premiumStatus: .inactive,
       shouldShowPremiumAd: true,
       onSubmit: {

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

@@ -9,7 +9,7 @@ import SpeechRecognition
 import SwiftUI
 
 struct AIChatPromptInputView: View {
-  private var speechRecognizer = SpeechRecognizer()
+  private var speechRecognizer: SpeechRecognizer
 
   @State
   private var isVoiceEntryPresented = false
@@ -22,7 +22,8 @@ struct AIChatPromptInputView: View {
 
   var onSubmit: (String) -> Void
 
-  init(onSubmit: @escaping (String) -> Void) {
+  init(speechRecognizer: SpeechRecognizer, onSubmit: @escaping (String) -> Void) {
+    self.speechRecognizer = speechRecognizer
     self.onSubmit = onSubmit
   }
 
@@ -109,7 +110,7 @@ struct AIChatPromptInputView: View {
 #if DEBUG
 struct AIChatPromptInputView_Preview: PreviewProvider {
   static var previews: some View {
-    AIChatPromptInputView {
+    AIChatPromptInputView(speechRecognizer: SpeechRecognizer()) {
       print("Prompt Submitted: \($0)")
     }
     .previewLayout(.sizeThatFits)