From 6c9999a394b95b20700c562984f36a7324b7c3a9 Mon Sep 17 00:00:00 2001 From: thirumani-vihaan Date: Tue, 14 Jul 2026 22:18:43 +0530 Subject: [PATCH 1/3] Fix Me tab Gravatar icon not updating on first launch --- .../java/org/wordpress/android/ui/main/WPMainActivity.java | 5 ++++- .../org/wordpress/android/ui/main/WPMainNavigationView.kt | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java index 77eae30b9768..26a6da19aeca 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java @@ -1466,7 +1466,10 @@ public void onAuthenticationChanged(OnAuthenticationChanged event) { public void onAccountChanged(OnAccountChanged event) { // Sign-out is handled in `handleSiteRemoved`, no need to show the signup flow here if (mAccountStore.hasAccessToken()) { - if (mBottomNav != null) mBottomNav.showNoteBadge(mAccountStore.getAccount().getHasUnseenNotes()); + if (mBottomNav != null) { + mBottomNav.showNoteBadge(mAccountStore.getAccount().getHasUnseenNotes()); + mBottomNav.refreshGravatar(); + } } } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainNavigationView.kt b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainNavigationView.kt index 1864eec656a6..eb49b29c5069 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainNavigationView.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainNavigationView.kt @@ -452,6 +452,13 @@ class WPMainNavigationView @JvmOverloads constructor( showBadge(getPosition(NOTIFS), showBadge) } + fun refreshGravatar() { + val imgIcon = getImageViewForPosition(getPosition(ME)) + if (imgIcon != null) { + loadGravatar(imgIcon, accountStore.account?.avatarUrl.orEmpty()) + } + } + /* * show or hide the badge on the 'pageId' icon in the bottom bar */ From 2e74a4132d6e265fbc2e02a4412251ce10a8b566 Mon Sep 17 00:00:00 2001 From: thirumani-vihaan Date: Thu, 16 Jul 2026 18:14:01 +0530 Subject: [PATCH 2/3] Only refresh Gravatar on FETCH_ACCOUNT to prevent unnecessary UI updates --- .../java/org/wordpress/android/ui/main/WPMainActivity.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java index 26a6da19aeca..e33b67d2f95d 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java @@ -1468,7 +1468,9 @@ public void onAccountChanged(OnAccountChanged event) { if (mAccountStore.hasAccessToken()) { if (mBottomNav != null) { mBottomNav.showNoteBadge(mAccountStore.getAccount().getHasUnseenNotes()); - mBottomNav.refreshGravatar(); + if (event.causeOfChange == AccountAction.FETCH_ACCOUNT) { + mBottomNav.refreshGravatar(); + } } } } From bd5899fa049ed0f10ffea4317fbff63c03e88e3a Mon Sep 17 00:00:00 2001 From: thirumani-vihaan Date: Thu, 16 Jul 2026 18:37:31 +0530 Subject: [PATCH 3/3] Fix missing AccountAction import --- .../main/java/org/wordpress/android/ui/main/WPMainActivity.java | 1 + 1 file changed, 1 insertion(+) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java index e33b67d2f95d..543665906fee 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java @@ -39,6 +39,7 @@ import org.wordpress.android.analytics.AnalyticsTracker; import org.wordpress.android.analytics.AnalyticsTracker.Stat; import org.wordpress.android.fluxc.Dispatcher; +import org.wordpress.android.fluxc.action.AccountAction; import org.wordpress.android.fluxc.generated.AccountActionBuilder; import org.wordpress.android.fluxc.generated.SiteActionBuilder; import org.wordpress.android.fluxc.model.PostModel;