ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-03 16:10:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix session verification SAS flow not automatically starting

Browse Source 
With #5116 removing the `verificationRequestAccepted` view state and its
`.startSasVerification` button action we now need another way of starting the SAS
flows whenever the verification requests gets accepted. As such a state machine
transition from `acceptingVerificationRequest` to `verificationRequestAccepted`
will now automatically call `startSasVerification` on the SessionVerificationProxy.
This commit is contained in:
Stefan Ceriu
2026-04-20 14:53:34 +03:00
parent ff88854b25
commit 354cd0f89b
4 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/Onboarding/SessionVerificationScreen/SessionVerificationScreenModels.swift
-1
View File
@@ -17,7 +17,6 @@ enum SessionVerificationScreenViewAction {
case acceptVerificationRequest case acceptVerificationRequest
case ignoreVerificationRequest case ignoreVerificationRequest
case requestVerification case requestVerification
case startSasVerification
case restart case restart
case accept case accept
case decline case decline
ElementX/Sources/Screens/Onboarding/SessionVerificationScreen/SessionVerificationScreenStateMachine.swift
-4
View File
@@ -46,8 +46,6 @@ class SessionVerificationScreenStateMachine {
case requestVerification case requestVerification
/// The current verification request has been accepted /// The current verification request has been accepted
case didAcceptVerificationRequest case didAcceptVerificationRequest
/// Start a SaS verification flow
case startSasVerification
/// Started a SaS verification flow /// Started a SaS verification flow
case didStartSasVerification case didStartSasVerification
/// Has received emojis /// Has received emojis
@@ -86,8 +84,6 @@ class SessionVerificationScreenStateMachine {
stateMachine.addRoutes(event: .didAcceptVerificationRequest, transitions: [.acceptingVerificationRequest => .verificationRequestAccepted, stateMachine.addRoutes(event: .didAcceptVerificationRequest, transitions: [.acceptingVerificationRequest => .verificationRequestAccepted,
.requestingVerification => .verificationRequestAccepted]) .requestingVerification => .verificationRequestAccepted])
stateMachine.addRoutes(event: .startSasVerification, transitions: [.verificationRequestAccepted => .startingSasVerification])
stateMachine.addRoutes(event: .didFail, transitions: [.requestingVerification => .initial, stateMachine.addRoutes(event: .didFail, transitions: [.requestingVerification => .initial,
.acceptingVerificationRequest => .initial]) .acceptingVerificationRequest => .initial])
ElementX/Sources/Screens/Onboarding/SessionVerificationScreen/SessionVerificationScreenViewModel.swift
+1 -3
View File
@@ -87,8 +87,6 @@ class SessionVerificationScreenViewModel: SessionVerificationViewModelType, Sess
actionsSubject.send(.finished) actionsSubject.send(.finished)
case .requestVerification: case .requestVerification:
stateMachine.processEvent(.requestVerification) stateMachine.processEvent(.requestVerification)
case .startSasVerification:
stateMachine.processEvent(.startSasVerification)
case .restart: case .restart:
stateMachine.processEvent(.restart) stateMachine.processEvent(.restart)
case .accept: case .accept:
@@ -133,7 +131,7 @@ class SessionVerificationScreenViewModel: SessionVerificationViewModelType, Sess
self.stateMachine.processEvent(.didFail) self.stateMachine.processEvent(.didFail)
} }
} }
case (.verificationRequestAccepted, .startSasVerification, .startingSasVerification): case (.acceptingVerificationRequest, .didAcceptVerificationRequest, .verificationRequestAccepted):
startSasVerification() startSasVerification()
case (.showingChallenge, .acceptChallenge, .acceptingChallenge): case (.showingChallenge, .acceptChallenge, .acceptingChallenge):
acceptChallenge() acceptChallenge()
UnitTests/Sources/SessionVerificationViewModelTests.swift
+2 -2
View File
@@ -109,9 +109,9 @@ struct SessionVerificationViewModelTests {
private mutating func setupChallengeReceived() async throws { private mutating func setupChallengeReceived() async throws {
let actionsPublisher = sessionVerificationController.actions.delay(for: .seconds(0.1), scheduler: DispatchQueue.main) let actionsPublisher = sessionVerificationController.actions.delay(for: .seconds(0.1), scheduler: DispatchQueue.main)
let cancellable = actionsPublisher let cancellable = actionsPublisher
.sink { [context] action in .sink { [sessionVerificationController] action in
if case .acceptedVerificationRequest = action { if case .acceptedVerificationRequest = action {
context?.send(viewAction: .startSasVerification) Task { await sessionVerificationController?.startSasVerification() }
} }
} }