From 42a8c561db553cc6c398a74b13710b592b0a1f9f Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 26 Mar 2020 11:44:47 +0100
Subject: [PATCH] Fix / Verification was not cancelled on back in ready state

---
 .../verification/VerificationBottomSheetViewModel.kt       | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewModel.kt b/vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewModel.kt
index 731f12cca4..e1edde7905 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewModel.kt
@@ -69,7 +69,7 @@ data class VerificationBottomSheetViewState(
 
 class VerificationBottomSheetViewModel @AssistedInject constructor(
         @Assisted initialState: VerificationBottomSheetViewState,
-        @Assisted args: VerificationBottomSheet.VerificationArgs,
+        @Assisted val args: VerificationBottomSheet.VerificationArgs,
         private val session: Session,
         private val supportedVerificationMethodsProvider: SupportedVerificationMethodsProvider)
     : VectorViewModel<VerificationBottomSheetViewState, VerificationAction, VerificationBottomSheetViewEvents>(initialState),
@@ -447,7 +447,10 @@ class VerificationBottomSheetViewModel @AssistedInject constructor(
                 || pr.localId == state.pendingRequest.invoke()?.localId
                 || state.pendingRequest.invoke()?.transactionId == pr.transactionId) {
             setState {
-                copy(pendingRequest = Success(pr))
+                copy(
+                        transactionId = args.verificationId ?: pr.transactionId,
+                        pendingRequest = Success(pr)
+                )
             }
         }
     }