From 13f3a8cf8a34103be97935c1f132c3d19a558d37 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Tue, 23 Aug 2022 10:45:04 -0400
Subject: [PATCH] Fix navigation bug when deactivating payments.

---
 .../payments/deactivate/DeactivateWalletFragment.java         | 4 +++-
 .../securesms/payments/preferences/PaymentsHomeFragment.java  | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/deactivate/DeactivateWalletFragment.java b/app/src/main/java/org/thoughtcrime/securesms/payments/deactivate/DeactivateWalletFragment.java
index 31a560fac..442c04806 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/payments/deactivate/DeactivateWalletFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/payments/deactivate/DeactivateWalletFragment.java
@@ -15,6 +15,8 @@ import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProviders;
 import androidx.navigation.Navigation;
 
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.payments.MoneyView;
 import org.thoughtcrime.securesms.util.SpanUtil;
@@ -56,7 +58,7 @@ public class DeactivateWalletFragment extends Fragment {
 
     //noinspection CodeBlock2Expr
     deactivateWithoutTransfer.setOnClickListener(v -> {
-      new AlertDialog.Builder(requireContext())
+      new MaterialAlertDialogBuilder(requireContext())
                      .setTitle(R.string.DeactivateWalletFragment__deactivate_without_transferring_question)
                      .setMessage(R.string.DeactivateWalletFragment__your_balance_will_remain)
                      .setNegativeButton(android.R.string.cancel, (dialog, which) -> dialog.dismiss())
diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsHomeFragment.java b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsHomeFragment.java
index 39fc89b98..aa364cfc7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsHomeFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsHomeFragment.java
@@ -143,7 +143,7 @@ public class PaymentsHomeFragment extends LoggingFragment {
     });
 
     viewModel.getPaymentStateEvents().observe(getViewLifecycleOwner(), paymentStateEvent -> {
-      AlertDialog.Builder builder = new AlertDialog.Builder(requireContext());
+      MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireContext());
 
       builder.setTitle(R.string.PaymentsHomeFragment__deactivate_payments_question);
       builder.setMessage(R.string.PaymentsHomeFragment__you_will_not_be_able_to_send);
@@ -168,7 +168,7 @@ public class PaymentsHomeFragment extends LoggingFragment {
         case DEACTIVATE_WITH_BALANCE:
           builder.setPositiveButton(getString(R.string.PaymentsHomeFragment__continue), (dialog, which) -> {
             dialog.dismiss();
-            SafeNavigation.safeNavigate(NavHostFragment.findNavController(this), R.id.deactivateWallet);
+            SafeNavigation.safeNavigate(NavHostFragment.findNavController(this), R.id.action_paymentsHome_to_deactivateWallet);
           });
           break;
         case ACTIVATED: