MESSENGER-3671 Merge FOSS 1.9.8

Conflicts:
 - CommonConfiguration.swift
 - BuildSettings.swift
 - Generated/images.Swift
 - RoomMemberDetailsViewController.m
 - LiveLocationSharingViewModell
-  PinCodeEnterViewController.m

RiotSwiftUI/Modules/Onboarding/UseCase/Coordinator/OnboardingUseCaseSelectionCoordinator.swift

@@ -14,11 +14,10 @@
 // limitations under the License.
 //
 
-import SwiftUI
 import CommonKit
+import SwiftUI
 
 final class OnboardingUseCaseSelectionCoordinator: Coordinator, Presentable {
-    
     // MARK: - Properties
     
     // MARK: Private
@@ -50,6 +49,7 @@ final class OnboardingUseCaseSelectionCoordinator: Coordinator, Presentable {
     }
     
     // MARK: - Public
+
     func start() {
         MXLog.debug("[OnboardingUseCaseSelectionCoordinator] did start.")
         onboardingUseCaseViewModel.completion = { [weak self] result in
@@ -63,7 +63,7 @@ final class OnboardingUseCaseSelectionCoordinator: Coordinator, Presentable {
     }
     
     func toPresentable() -> UIViewController {
-        return self.onboardingUseCaseHostingController
+        onboardingUseCaseHostingController
     }
     
     /// Stops any ongoing activities in the coordinator.

RiotSwiftUI/Modules/Onboarding/UseCase/MockOnboardingUseCaseScreenState.swift

@@ -1,4 +1,4 @@
-// 
+//
 // Copyright 2021 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -37,7 +37,7 @@ enum MockOnboardingUseCaseSelectionScreenState: MockScreenState, CaseIterable {
     }
     
     /// Generate the view struct for the screen state.
-    var screenView: ([Any], AnyView)  {
+    var screenView: ([Any], AnyView) {
         let viewModel = OnboardingUseCaseViewModel()
         
         // can simulate service and viewModel actions here if needs be.

RiotSwiftUI/Modules/Onboarding/UseCase/OnboardingUseCaseModels.swift

@@ -1,4 +1,4 @@
-// 
+//
 // Copyright 2021 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,10 +20,6 @@ import Foundation
 
 // MARK: View model
 
-enum OnboardingUseCaseStateAction {
-    case viewAction(OnboardingUseCaseViewAction)
-}
-
 enum OnboardingUseCaseViewModelResult {
     case personalMessaging
     case workMessaging

RiotSwiftUI/Modules/Onboarding/UseCase/OnboardingUseCaseViewModel.swift

@@ -16,12 +16,9 @@
 
 import SwiftUI
 
-typealias OnboardingUseCaseViewModelType = StateStoreViewModel<OnboardingUseCaseViewState,
-                                                               OnboardingUseCaseStateAction,
-                                                               OnboardingUseCaseViewAction>
+typealias OnboardingUseCaseViewModelType = StateStoreViewModel<OnboardingUseCaseViewState, OnboardingUseCaseViewAction>
 
 class OnboardingUseCaseViewModel: OnboardingUseCaseViewModelType, OnboardingUseCaseViewModelProtocol {
-
     // MARK: - Properties
 
     // MARK: Private
@@ -44,8 +41,4 @@ class OnboardingUseCaseViewModel: OnboardingUseCaseViewModelType, OnboardingUseC
             completion?(result)
         }
     }
-
-    override class func reducer(state: inout OnboardingUseCaseViewState, action: OnboardingUseCaseStateAction) {
-        // There is no mutable state to reduce :)
-    }
 }

RiotSwiftUI/Modules/Onboarding/UseCase/OnboardingUseCaseViewModelProtocol.swift

@@ -1,4 +1,4 @@
-// 
+//
 // Copyright 2021 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,7 +17,6 @@
 import Foundation
 
 protocol OnboardingUseCaseViewModelProtocol {
-    
     var completion: ((OnboardingUseCaseViewModelResult) -> Void)? { get set }
     var context: OnboardingUseCaseViewModelType.Context { get }
 }

RiotSwiftUI/Modules/Onboarding/UseCase/Test/UI/OnboardingUseCaseUITests.swift

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-import XCTest
 import RiotSwiftUI
+import XCTest
 
 class OnboardingUseCaseUITests: MockScreenTestCase {
     // The view has no parameters or changing state to test.

RiotSwiftUI/Modules/Onboarding/UseCase/Test/Unit/OnboardingUseCaseViewModelTests.swift

@@ -1,4 +1,4 @@
-// 
+//
 // Copyright 2021 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

RiotSwiftUI/Modules/Onboarding/UseCase/View/OnboardingUseCaseButton.swift

@@ -1,4 +1,4 @@
-// 
+//
 // Copyright 2021 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,7 +18,6 @@ import SwiftUI
 
 /// A button used for the Use Case selection.
 struct OnboardingUseCaseButton: View {
-    
     // MARK: Private
     
     @Environment(\.theme) private var theme

RiotSwiftUI/Modules/Onboarding/UseCase/View/OnboardingUseCaseSelectionScreen.swift

@@ -1,4 +1,4 @@
-// 
+//
 // Copyright 2021 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,7 +18,6 @@ import SwiftUI
 
 /// The screen shown to a new user to select their use case for the app.
 struct OnboardingUseCaseSelectionScreen: View {
-
     // MARK: - Properties
     
     // MARK: Private