From 2527cab73e6aa198b511550305c6b1ae5096e5d6 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Fri, 7 Oct 2022 17:48:40 +0300
Subject: [PATCH] Fix cancel actions.

---
 .../app/features/login/qr/QrCodeLoginShowQrCodeFragment.kt | 2 +-
 .../app/features/login/qr/QrCodeLoginStatusFragment.kt     | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginShowQrCodeFragment.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginShowQrCodeFragment.kt
index 69fd8bde81..b5437626bc 100644
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginShowQrCodeFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginShowQrCodeFragment.kt
@@ -43,7 +43,7 @@ class QrCodeLoginShowQrCodeFragment : VectorBaseFragment<FragmentQrCodeLoginShow
 
     private fun initCancelButton() {
         views.qrCodeLoginShowQrCodeCancelButton.debouncedClicks {
-            activity?.supportFragmentManager?.popBackStack()
+            parentFragmentManager.popBackStack()
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginStatusFragment.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginStatusFragment.kt
index fa9ea1351e..380db73376 100644
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginStatusFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginStatusFragment.kt
@@ -39,9 +39,16 @@ class QrCodeLoginStatusFragment : VectorBaseFragment<FragmentQrCodeLoginStatusBi
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        initCancelButton()
         observeViewState()
     }
 
+    private fun initCancelButton() {
+        views.qrCodeLoginStatusCancelButton.debouncedClicks {
+            parentFragmentManager.popBackStack()
+        }
+    }
+
     private fun observeViewState() {
         viewModel.onEach {
             when (it.connectionStatus) {