From 949ee151ab350df652a90574bf29432170a28bcd Mon Sep 17 00:00:00 2001
From: Pavneet-Sing <psingh@brave.com>
Date: Tue, 31 May 2022 13:54:34 +0530
Subject: [PATCH] fix(wallet):transaction approval not shown in release

---
 .../java/org/chromium/chrome/browser/app/BraveActivity.java  | 2 +-
 .../org/chromium/chrome/browser/app/domain/CryptoModel.java  | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/android/java/org/chromium/chrome/browser/app/BraveActivity.java b/android/java/org/chromium/chrome/browser/app/BraveActivity.java
index 2edc237274b..6926bfff05f 100644
--- a/android/java/org/chromium/chrome/browser/app/BraveActivity.java
+++ b/android/java/org/chromium/chrome/browser/app/BraveActivity.java
@@ -1017,7 +1017,7 @@ public abstract class BraveActivity<C extends ChromeActivityComponent> extends C
 
     public void openBraveWalletSettings() {
         SettingsLauncher settingsLauncher = new SettingsLauncherImpl();
-        settingsLauncher.launchSettingsActivity(this, BraveWalletPreferences.class);   
+        settingsLauncher.launchSettingsActivity(this, BraveWalletPreferences.class);
     }
 
     public void openBraveWallet(boolean fromDapp) {
diff --git a/android/java/org/chromium/chrome/browser/app/domain/CryptoModel.java b/android/java/org/chromium/chrome/browser/app/domain/CryptoModel.java
index 99f1254bb09..e58c087d690 100644
--- a/android/java/org/chromium/chrome/browser/app/domain/CryptoModel.java
+++ b/android/java/org/chromium/chrome/browser/app/domain/CryptoModel.java
@@ -101,7 +101,8 @@ public class CryptoModel {
     }
 
     public void refreshTransactions() {
-        mPendingTxHelper.fetchTransactions(null);
+        mKeyringService.getKeyringInfo(BraveWalletConstants.DEFAULT_KEYRING_ID,
+                keyringInfo -> { mPendingTxHelper.setAccountInfos(keyringInfo.accountInfos); });
     }
 
     public LiveData<TransactionInfo> getSelectedPendingRequest() {
@@ -139,7 +140,7 @@ public class CryptoModel {
 
         @Override
         public String getChainId() {
-            if (mNetworkModel.mChainId == null) {
+            if (mNetworkModel.mChainId.getValue() == null) {
                 return BraveWalletConstants.MAINNET_CHAIN_ID;
             }
             return mNetworkModel.mChainId.getValue();