Update BSK

duckduckgo · Jan 11, 2024 · 3d2b70d · 3d2b70d
1 parent 3d263b2
commit 3d2b70d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -9260,8 +9260,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit";
 			requirement = {
-				kind = exactVersion;
-				version = 100.0.3;
+				branch = "anh/netp-feedback-form";
+				kind = branch;
 			};
 		};
 		C14882EB27F211A000D59F0C /* XCRemoteSwiftPackageReference "SwiftSoup" */ = {

diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -14,8 +14,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/DuckDuckGo/BrowserServicesKit",
       "state" : {
-        "revision" : "f2b6a76e4ed0ce3147cdf0cba94cf0d1b928d687",
-        "version" : "100.0.3"
+        "branch" : "anh/netp-feedback-form",
+        "revision" : "ede282b3b9b932a94c2f45ec86e876c834c5b4bd"
       }
     },
     {
@@ -156,7 +156,7 @@
     {
       "identity" : "trackerradarkit",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/duckduckgo/TrackerRadarKit.git",
+      "location" : "https://github.com/duckduckgo/TrackerRadarKit",
       "state" : {
         "revision" : "a6b7ba151d9dc6684484f3785293875ec01cc1ff",
         "version" : "1.2.2"

diff --git a/DuckDuckGo/Feedback/VPNFeedbackFormView.swift b/DuckDuckGo/Feedback/VPNFeedbackFormView.swift
@@ -24,13 +24,17 @@ import NetworkProtection
 
 @available(iOS 15.0, *)
 struct VPNFeedbackFormCategoryView: View {
+    @Environment(\.dismiss) private var dismiss
+
     var body: some View {
         VStack {
             List {
                 Section {
                     ForEach(VPNFeedbackCategory.allCases, id: \.self) { category in
                         NavigationLink(category.displayName,
-                                       destination: VPNFeedbackFormView(viewModel: VPNFeedbackFormViewModel(category: category)))
+                                       destination: VPNFeedbackFormView(
+                                        viewModel: VPNFeedbackFormViewModel(category: category),
+                                        onDismiss: { dismiss() }))
                             .daxBodyRegular()
                             .foregroundColor(.init(designSystemColor: .textPrimary))
                     }
@@ -70,7 +74,9 @@ struct VPNFeedbackFormCategoryView: View {
 struct VPNFeedbackFormView: View {
     @ObservedObject public var viewModel: VPNFeedbackFormViewModel
     @Environment(\.dismiss) private var dismiss
-
+
+    var onDismiss: () -> Void
+
     var body: some View {
         VStack {
             header()
@@ -154,6 +160,7 @@ struct VPNFeedbackFormView: View {
                 let success = await viewModel.process()
                 if success {
                     dismiss()
+                    onDismiss()
                 }
             }
         } label: {