Custodian mismatch message

Author: sujitacharya2005

android/java/org/chromium/chrome/browser/rewards/tipping/RewardsTippingPanelFragment.java

@@ -104,6 +104,7 @@ public class RewardsTippingPanelFragment
     private TextView mUsdSymbol1;
     private TextView mUsdSymbol2;
     private boolean mEnoughFundWarningShown;
+    private TextView mCustodianText;
 
     public static RewardsTippingPanelFragment newInstance(int tabId, String web3Url) {
         RewardsTippingPanelFragment fragment = new RewardsTippingPanelFragment();
@@ -158,6 +159,7 @@ public Dialog onCreateDialog(Bundle savedInstance) {
         mSendButton = view.findViewById(R.id.send_tip_button);
         mWeb3WalletButton = view.findViewById(R.id.use_web3_wallet_button);
         mTipProgressBar = view.findViewById(R.id.send_tip_progress_bar);
+        mCustodianText = view.findViewById(R.id.custodian_text);
 
         init(view);
         setBalanceText(view);
@@ -243,12 +245,15 @@ public void OnGetExternalWallet(String externalWallet) {
             try {
                 mExternalWallet = new BraveRewardsExternalWallet(externalWallet);
                 walletStatus = mExternalWallet.getStatus();
-
-                if (walletStatus == WalletStatus.LOGGED_OUT) {
-                    setLogoutStateMessage();
+                if (walletStatus != WalletStatus.NOT_CONNECTED) {
+                    if (walletStatus == WalletStatus.LOGGED_OUT) {
+                        setLogoutStateMessage();
+                    } else {
+                        int pubStatus = mBraveRewardsNativeWorker.GetPublisherStatus(mCurrentTabId);
+                        setPublisherNoteText(pubStatus, walletStatus);
+                    }
                 } else {
-                    int pubStatus = mBraveRewardsNativeWorker.GetPublisherStatus(mCurrentTabId);
-                    setPublisherNoteText(pubStatus, walletStatus);
+                    mCustodianText.setVisibility(View.GONE);
                 }
             } catch (JSONException e) {
                 mExternalWallet = null;
@@ -562,9 +567,8 @@ private void setCustodianIconAndName(View view) {
             custodianName = R.string.gemini;
         }
 
-        TextView custodian = view.findViewById(R.id.custodian_text);
-        custodian.setText(custodianName);
-        custodian.setCompoundDrawablesWithIntrinsicBounds(custodianIcon, 0, 0, 0);
+        mCustodianText.setText(custodianName);
+        mCustodianText.setCompoundDrawablesWithIntrinsicBounds(custodianIcon, 0, 0, 0);
     }
 
     private void initTipChoice(boolean isBat) {

android/java/res/layout/tipping_banner_tipping_panel_inside_layout.xml

@@ -38,11 +38,9 @@
         android:drawablePadding="8dp"
         android:fontFamily="sans-serif-medium"
         android:padding="4dp"
-        android:text="@string/uphold"
         android:textAllCaps="true"
         android:textColor="@color/custodian_name_color"
         android:textSize="11sp"
-        app:drawableLeftCompat="@drawable/upload_icon"
         app:layout_constraintBottom_toBottomOf="@id/brave_rewards_balance_text"
         app:layout_constraintStart_toEndOf="@id/brave_rewards_balance_text"
         app:layout_constraintTop_toTopOf="@id/brave_rewards_balance_text" />