Commit 79f8ae299c5 for woocommerce

commit 79f8ae299c53942f7d53a127626e31947358bfa5
Author: Ann <annchichi@users.noreply.github.com>
Date:   Wed Apr 29 03:10:17 2026 +0800

    Fix confusing error notice in shipping tour close handler (#64181)

    * fix: replace confusing error notice with silent retry in shipping tour closeHandler

    When updateOptions fails to save the tour-completion flag, the only
    consequence is the guided tour replaying on next visit. The previous
    error notice confused merchants for zero impact. Replace with a silent
    retry and remove the unused walkthrough_settings_shipping_updated_option_error
    tracking event.

    Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

    * Restore option error tracking and make shipping tour retry fire-and-forget

    * Add changefile(s) from automation for the following project(s): woocommerce, woocommerce/client/admin

    ---------

    Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
    Co-authored-by: woocommercebot <woocommercebot@users.noreply.github.com>

diff --git a/plugins/woocommerce/changelog/64181-fix-shipping-tour-silent-retry b/plugins/woocommerce/changelog/64181-fix-shipping-tour-silent-retry
new file mode 100644
index 00000000000..27b466271b5
--- /dev/null
+++ b/plugins/woocommerce/changelog/64181-fix-shipping-tour-silent-retry
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Remove confusing error notice when shipping tour completion flag fails to save.
\ No newline at end of file
diff --git a/plugins/woocommerce/client/admin/client/guided-tours/shipping-tour.tsx b/plugins/woocommerce/client/admin/client/guided-tours/shipping-tour.tsx
index be5e7ab4239..8b5a969e207 100644
--- a/plugins/woocommerce/client/admin/client/guided-tours/shipping-tour.tsx
+++ b/plugins/woocommerce/client/admin/client/guided-tours/shipping-tour.tsx
@@ -218,7 +218,6 @@ export const ShippingTour = ( {
 	const { updateOptions } = useDispatch( optionsStore );
 	const { show: showTour, isUspsDhlEligible } = useShowShippingTour();
 	const [ step, setStepNumber ] = useState( 0 );
-	const { createNotice } = useDispatch( 'core/notices' );

 	const tourConfig: TourKitTypes.WooConfig = {
 		placement: 'auto',
@@ -316,16 +315,21 @@ export const ShippingTour = ( {
 			} );

 			if ( ! update.success ) {
-				createNotice(
-					'error',
-					__(
-						'There was a problem marking the shipping tour as completed.',
-						'woocommerce'
-					)
-				);
+				const { message, code } = update as {
+					message?: string;
+					code?: string;
+				};
 				recordEvent(
-					'walkthrough_settings_shipping_updated_option_error'
+					'walkthrough_settings_shipping_updated_option_error',
+					{
+						error_message: message,
+						error_code: code,
+					}
 				);
+				// Fire-and-forget retry — failure only means the tour replays next visit.
+				updateOptions( {
+					[ REVIEWED_DEFAULTS_OPTION ]: 'yes',
+				} );
 			}

 			if ( source === 'close-btn' ) {