Fix double indicators showing under Payments tab (#7201)

Automattic · Sep 16, 2023 · 3695514 · 3695514
1 parent 6ba6fab
commit 3695514
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/changelog/fix-7042-double-payments-badge b/changelog/fix-7042-double-payments-badge
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fix double indicators showing under Payments tab
diff --git a/includes/admin/class-wc-payments-admin.php b/includes/admin/class-wc-payments-admin.php
@@ -954,9 +954,12 @@ public function add_menu_notification_badge() {
 			return;
 		}
 
+		$badge = self::MENU_NOTIFICATION_BADGE;
 		foreach ( $menu as $index => $menu_item ) {
-			if ( 'wc-admin&path=/payments/connect' === $menu_item[2] ) {
-				$menu[ $index ][0] .= self::MENU_NOTIFICATION_BADGE; // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
+			if ( false === strpos( $menu_item[0], $badge ) && ( 'wc-admin&path=/payments/connect' === $menu_item[2] ) ) {
+				$menu[ $index ][0] .= $badge; // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
+
+				// One menu item with a badge is more than enough.
 				break;
 			}
 		}

diff --git a/includes/class-wc-payments-incentives-service.php b/includes/class-wc-payments-incentives-service.php
@@ -48,9 +48,12 @@ public function add_payments_menu_badge(): void {
 			return;
 		}
 
+		$badge = WC_Payments_Admin::MENU_NOTIFICATION_BADGE;
 		foreach ( $menu as $index => $menu_item ) {
-			if ( 'wc-admin&path=/payments/connect' === $menu_item[2] ) {
-				$menu[ $index ][0] .= WC_Payments_Admin::MENU_NOTIFICATION_BADGE; // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
+			if ( false === strpos( $menu_item[0], $badge ) && ( 'wc-admin&path=/payments/connect' === $menu_item[2] ) ) {
+				$menu[ $index ][0] .= $badge; // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
+
+				// One menu item with a badge is more than enough.
 				break;
 			}
 		}