diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/user/UserVerificationBottomSheet.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/user/UserVerificationBottomSheet.kt
index 9f19d9587c..b13261b7b0 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/user/UserVerificationBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/user/UserVerificationBottomSheet.kt
@@ -24,6 +24,7 @@ import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.commitTransaction
@@ -72,10 +73,23 @@ class UserVerificationBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSh
         super.onViewCreated(view, savedInstanceState)
         viewModel.observeViewEvents { event ->
             when (event) {
-                VerificationBottomSheetViewEvents.AccessSecretStore -> TODO()
-                VerificationBottomSheetViewEvents.Dismiss -> TODO()
-                VerificationBottomSheetViewEvents.GoToSettings -> TODO()
-                is VerificationBottomSheetViewEvents.ModalError -> TODO()
+                VerificationBottomSheetViewEvents.AccessSecretStore -> {
+                    // nop for user verification?
+                }
+                VerificationBottomSheetViewEvents.Dismiss -> {
+                    dismiss()
+                }
+                VerificationBottomSheetViewEvents.GoToSettings -> {
+                    // nop for user verificaiton
+                }
+                is VerificationBottomSheetViewEvents.ModalError -> {
+                    MaterialAlertDialogBuilder(requireContext())
+                            .setTitle(getString(R.string.dialog_title_error))
+                            .setMessage(event.errorMessage)
+                            .setCancelable(false)
+                            .setPositiveButton(R.string.ok, null)
+                            .show()
+                }
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/user/UserVerificationFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/user/UserVerificationFragment.kt
index 4cfce1e1dd..a7275d70b6 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/user/UserVerificationFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/user/UserVerificationFragment.kt
@@ -85,7 +85,7 @@ class UserVerificationFragment : VectorBaseFragment<BottomSheetVerificationChild
     }
 
     override fun onDone(b: Boolean) {
-//        viewModel.handle(VerificationAction.)
+        viewModel.handle(VerificationAction.GotItConclusion(true))
     }
 
     override fun onDoNotMatchButtonTapped() {
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/user/UserVerificationViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/user/UserVerificationViewModel.kt
index e4a217e4e3..e5c2d7b40e 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/user/UserVerificationViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/user/UserVerificationViewModel.kt
@@ -365,7 +365,7 @@ class UserVerificationViewModel @AssistedInject constructor(
                     viewModelScope.launch {
                         val transaction = session.cryptoService().verificationService()
                                 .getExistingTransaction(state.otherUserId, state.transactionId.orEmpty())
-                        (transaction as? SasVerificationTransaction)?.shortCodeDoesNotMatch()
+                        (transaction as? SasVerificationTransaction)?.userHasVerifiedShortCode()
                     }
                 }
             }