From 855efa93cce2db3308c3d5d3d8f8b1e5562e8364 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Wed, 22 Apr 2020 17:29:34 +0200
Subject: [PATCH] Remove cancel button, useless.

---
 .../account/deactivation/DeactivateAccountFragment.kt    | 4 ----
 .../src/main/res/layout/fragment_deactivate_account.xml  | 9 ---------
 2 files changed, 13 deletions(-)

diff --git a/vector/src/main/java/im/vector/riotx/features/settings/account/deactivation/DeactivateAccountFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/account/deactivation/DeactivateAccountFragment.kt
index 487d913b7e..74a8a52606 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/account/deactivation/DeactivateAccountFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/account/deactivation/DeactivateAccountFragment.kt
@@ -80,10 +80,6 @@ class DeactivateAccountFragment @Inject constructor(
             viewModel.handle(DeactivateAccountAction.TogglePassword)
         }
 
-        deactivateAccountCancel.setOnClickListener {
-            (activity as? VectorBaseActivity)?.onBackPressed()
-        }
-
         deactivateAccountSubmit.setOnClickListener {
             viewModel.handle(DeactivateAccountAction.DeactivateAccount(
                     deactivateAccountPassword.text.toString(),
diff --git a/vector/src/main/res/layout/fragment_deactivate_account.xml b/vector/src/main/res/layout/fragment_deactivate_account.xml
index aca8adf12d..deba9bfdc4 100644
--- a/vector/src/main/res/layout/fragment_deactivate_account.xml
+++ b/vector/src/main/res/layout/fragment_deactivate_account.xml
@@ -102,15 +102,6 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/deactivateAccountPasswordContainer" />
 
-        <Button
-            android:id="@+id/deactivateAccountCancel"
-            style="@style/VectorButtonStyle"
-            android:layout_marginEnd="16dp"
-            android:layout_marginRight="16dp"
-            android:text="@string/cancel"
-            app:layout_constraintEnd_toStartOf="@+id/deactivateAccountSubmit"
-            app:layout_constraintTop_toTopOf="@+id/deactivateAccountSubmit" />
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </androidx.core.widget.NestedScrollView>