Contact me added in Bug Report Screen (#1307)

* contact me added

* fixing tests

ElementX/Sources/Other/AccessibilityIdentifiers.swift

@@ -45,6 +45,7 @@ struct A11yIdentifiers {
     struct BugReportScreen {
         let report = "bug_report-report"
         let sendLogs = "bug_report-send_logs"
+        let canContact = "bug_report-can_contact"
         let screenshot = "bug_report-screenshot"
         let removeScreenshot = "bug_report-remove_screenshot"
         let attachScreenshot = "bug-report-attach_screenshot"

ElementX/Sources/Screens/BugReportScreen/BugReportScreenModels.swift

@@ -33,6 +33,7 @@ struct BugReportScreenViewState: BindableState {
 struct BugReportScreenViewStateBindings {
     var reportText: String
     var sendingLogsEnabled: Bool
+    var canContact: Bool
 }
 
 enum BugReportScreenViewAction {

ElementX/Sources/Screens/BugReportScreen/BugReportScreenViewModel.swift

@@ -38,7 +38,7 @@ class BugReportScreenViewModel: BugReportScreenViewModelType, BugReportScreenVie
         self.userID = userID
         self.deviceID = deviceID
         
-        let bindings = BugReportScreenViewStateBindings(reportText: "", sendingLogsEnabled: true)
+        let bindings = BugReportScreenViewStateBindings(reportText: "", sendingLogsEnabled: true, canContact: false)
         super.init(initialViewState: BugReportScreenViewState(screenshot: screenshot,
                                                               bindings: bindings,
                                                               isModallyPresented: isModallyPresented))
@@ -84,6 +84,7 @@ class BugReportScreenViewModel: BugReportScreenViewModelType, BugReportScreenVie
                                   text: context.reportText,
                                   includeLogs: context.sendingLogsEnabled,
                                   includeCrashLog: true,
+                                  canContact: context.canContact,
                                   githubLabels: [],
                                   files: files)
         

ElementX/Sources/Screens/BugReportScreen/View/BugReportScreen.swift

@@ -26,10 +26,9 @@ struct BugReportScreen: View {
     var body: some View {
         Form {
             textFieldSection
-            
             attachScreenshotSection
-            
             sendLogsSection
+            canContactSection
         }
         .scrollDismissesKeyboard(.immediately)
         .compoundForm()
@@ -77,6 +76,18 @@ struct BugReportScreen: View {
         .compoundFormSection()
     }
 
+    private var canContactSection: some View {
+        Section {
+            Toggle(L10n.screenBugReportContactMeTitle, isOn: $context.canContact)
+                .toggleStyle(.compoundForm)
+                .accessibilityIdentifier(A11yIdentifiers.bugReportScreen.canContact)
+        } footer: {
+            Text(L10n.screenBugReportContactMe)
+                .compoundFormSectionFooter()
+        }
+        .compoundFormSection()
+    }
+
     @ViewBuilder
     private var attachScreenshotSection: some View {
         Section {

ElementX/Sources/Services/BugReport/BugReportService.swift

@@ -103,7 +103,8 @@ class BugReportService: NSObject, BugReportServiceProtocol {
                          progressListener: CurrentValueSubject<Double, Never>) async -> Result<SubmitBugReportResponse, BugReportServiceError> {
         var params = [
             MultipartFormData(key: "user_id", type: .text(value: bugReport.userID)),
-            MultipartFormData(key: "text", type: .text(value: bugReport.text))
+            MultipartFormData(key: "text", type: .text(value: bugReport.text)),
+            MultipartFormData(key: "can_contact", type: .text(value: "\(bugReport.canContact)"))
         ]
         
         if let deviceID = bugReport.deviceID {

ElementX/Sources/Services/BugReport/BugReportServiceProtocol.swift

@@ -24,6 +24,7 @@ struct BugReport: Equatable {
     let text: String
     let includeLogs: Bool
     let includeCrashLog: Bool
+    let canContact: Bool
     let githubLabels: [String]
     let files: [URL]
 }

UITests/Sources/BugReportUITests.swift

@@ -32,11 +32,13 @@ class BugReportUITests: XCTestCase {
         // Type 4 characters and the send button should be disabled.
         app.textViews[A11yIdentifiers.bugReportScreen.report].clearAndTypeText("Text")
         XCTAssert(app.switches[A11yIdentifiers.bugReportScreen.sendLogs].isOn)
+        XCTAssert(!app.switches[A11yIdentifiers.bugReportScreen.canContact].isOn)
         try await app.assertScreenshot(.bugReport, step: 2)
         
         // Type more than 4 characters and send the button should become enabled.
         app.textViews[A11yIdentifiers.bugReportScreen.report].clearAndTypeText("Longer text")
         XCTAssert(app.switches[A11yIdentifiers.bugReportScreen.sendLogs].isOn)
+        XCTAssert(!app.switches[A11yIdentifiers.bugReportScreen.canContact].isOn)
         try await app.assertScreenshot(.bugReport, step: 3)
     }
     

UnitTests/Sources/BugReportServiceTests.swift

@@ -39,6 +39,7 @@ class BugReportServiceTests: XCTestCase {
                                   text: "i cannot send message",
                                   includeLogs: true,
                                   includeCrashLog: true,
+                                  canContact: false,
                                   githubLabels: [],
                                   files: [])
         let progressSubject = CurrentValueSubject<Double, Never>(0.0)
@@ -67,6 +68,7 @@ class BugReportServiceTests: XCTestCase {
                                   text: "i cannot send message",
                                   includeLogs: true,
                                   includeCrashLog: true,
+                                  canContact: false,
                                   githubLabels: [],
                                   files: [])
         let progressSubject = CurrentValueSubject<Double, Never>(0.0)

UnitTests/Sources/BugReportViewModelTests.swift

@@ -84,7 +84,7 @@ class BugReportViewModelTests: XCTestCase {
             }
         
         XCTAssert(mockService.submitBugReportProgressListenerCallsCount == 1)
-        XCTAssert(mockService.submitBugReportProgressListenerReceivedArguments?.bugReport == BugReport(userID: "@mock.client.com", deviceID: nil, text: "", includeLogs: true, includeCrashLog: true, githubLabels: [], files: []))
+        XCTAssert(mockService.submitBugReportProgressListenerReceivedArguments?.bugReport == BugReport(userID: "@mock.client.com", deviceID: nil, text: "", includeLogs: true, includeCrashLog: true, canContact: false, githubLabels: [], files: []))
     }
 
     func testSendReportWithError() async throws {
@@ -110,6 +110,6 @@ class BugReportViewModelTests: XCTestCase {
             }
 
         XCTAssert(mockService.submitBugReportProgressListenerCallsCount == 1)
-        XCTAssert(mockService.submitBugReportProgressListenerReceivedArguments?.bugReport == BugReport(userID: "@mock.client.com", deviceID: nil, text: "", includeLogs: true, includeCrashLog: true, githubLabels: [], files: []))
+        XCTAssert(mockService.submitBugReportProgressListenerReceivedArguments?.bugReport == BugReport(userID: "@mock.client.com", deviceID: nil, text: "", includeLogs: true, includeCrashLog: true, canContact: false, githubLabels: [], files: []))
     }
 }

changelog.d/1299.feature

@@ -0,0 +1 @@
+Contact Me switch added to the Bug Report screen.