From f56d89d377ebf720c221acac4a4463606f421b11 Mon Sep 17 00:00:00 2001
From: Pavneet Singh <psingh@brave.com>
Date: Fri, 18 Aug 2023 11:31:54 +0530
Subject: [PATCH] Fix pending transaction (#19733)

---
 .../browser/crypto_wallet/fragments/PortfolioFragment.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/PortfolioFragment.java b/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/PortfolioFragment.java
index 08dda70d1c0..e92c63bcdb7 100644
--- a/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/PortfolioFragment.java
+++ b/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/PortfolioFragment.java
@@ -195,6 +195,8 @@ public class PortfolioFragment
                     mPendingTxs = transactionInfos;
                     if (mCurrentPendingTx == null && mPendingTxs.size() > 0) {
                         mCurrentPendingTx = mPendingTxs.get(0);
+                    } else if (mPendingTxs.size() == 0) {
+                        mCurrentPendingTx = null;
                     }
                     updatePendingTxNotification();
                 });
@@ -397,7 +399,7 @@ public class PortfolioFragment
                                 .getAccountNameForTransaction(mCurrentPendingTx));
         approveTxBottomSheetDialogFragment.setApprovedTxObserver(this);
         approveTxBottomSheetDialogFragment.show(
-                getFragmentManager(), ApproveTxBottomSheetDialogFragment.TAG_FRAGMENT);
+                getParentFragmentManager(), ApproveTxBottomSheetDialogFragment.TAG_FRAGMENT);
     }
 
     private void showEditVisibleDialog() {