From 26bcbbb9827bd1bcd019f78f22fc60499b1bc06a Mon Sep 17 00:00:00 2001
From: Artem Samoilenko <artem@brave.com>
Date: Thu, 8 May 2025 11:25:49 -0400
Subject: [PATCH] [cr137][Android] Temporary fix for `Utils.getProfile`

This function should be removed and proper profile should be passed https://github.com/brave/brave-browser/issues/45937
---
 .../chrome/browser/crypto_wallet/util/Utils.java | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/util/Utils.java b/android/java/org/chromium/chrome/browser/crypto_wallet/util/Utils.java
index f7443aa9cfa..4309d2824b9 100644
--- a/android/java/org/chromium/chrome/browser/crypto_wallet/util/Utils.java
+++ b/android/java/org/chromium/chrome/browser/crypto_wallet/util/Utils.java
@@ -1104,6 +1104,7 @@ public class Utils {
         return AndroidUtils.formatHTML(geteTldHtmlString(originInfo));
     }
 
+    @Nullable
     public static Profile getProfile(boolean isIncognito) {
         ChromeActivity chromeActivity = null;
         try {
@@ -1115,23 +1116,32 @@ public class Utils {
             chromeActivity = BraveActivity.getChromeTabbedActivity();
         }
         if (chromeActivity == null) {
-            return ProfileManager.getLastUsedRegularProfile(); // Last resort
+            return getLastUsedProfile(isIncognito); // Last resort
         }
 
         ObservableSupplier<TabModelSelector> supplier =
                 chromeActivity.getTabModelSelectorSupplier();
         TabModelSelector selector = supplier.get();
         if (selector == null) {
-            return ProfileManager.getLastUsedRegularProfile();
+            return getLastUsedProfile(isIncognito);
         }
 
         Profile profile = selector.getModel(isIncognito).getProfile();
         if (profile == null) {
-            return ProfileManager.getLastUsedRegularProfile();
+            return getLastUsedProfile(isIncognito);
         }
         return profile;
     }
 
+    @Nullable
+    private static Profile getLastUsedProfile(boolean isIncognito) {
+        if (!isIncognito) {
+            return ProfileManager.getLastUsedRegularProfile();
+        } else {
+            return ProfileManager.getLastUsedRegularProfile().getPrimaryOtrProfile(true);
+        }
+    }
+
     public static String formatErc721TokenTitle(String title, String id) {
         if (id.isEmpty() || id.equals("0")) {
             return title;