diff --git a/plugins/woocommerce-admin/TESTING-INSTRUCTIONS.md b/plugins/woocommerce-admin/TESTING-INSTRUCTIONS.md
index 82c6f25402b..448f76a5854 100644
--- a/plugins/woocommerce-admin/TESTING-INSTRUCTIONS.md
+++ b/plugins/woocommerce-admin/TESTING-INSTRUCTIONS.md
@@ -39,11 +39,24 @@
### Deprecate Onboarding::has_woocommerce_support #6401
-- Clear existing site transients. For example, by using the [Transients Manager](https://wordpress.org/plugins/transients-manager/) plugin, and pressing the "Delete all transients" button it provides.
-- Add any new theme to WordPress but **DO NOT** activate it.
-- Initialize the Onboarding Wizard.
-- See that the Themes step loads fast 😎
-- See that the new theme is listed in the Themes step.
+- Clear existing site transients. For example, by using the [Transients Manager](https://wordpress.org/plugins/transients-manager/) plugin, and pressing the "Delete all transients" button it provides.
+- Add any new theme to WordPress but **DO NOT** activate it.
+- Initialize the Onboarding Wizard.
+- See that the Themes step loads fast 😎
+- See that the new theme is listed in the Themes step.
+
+### Set up tasks can now navigate back to the home screen #6397
+
+1. With a fresh install of wc-admin and woocommerce, go to the home screen
+2. Going to the homescreen redirects to the profile setup wizard, click "Skip setup store details" to return to the home screen
+3. On the home screen you will see the setup task list. It has the heading "Get ready to start selling"
+
+For each task in that list apart from "Store details":
+
+1. Click the item
+2. You should land on the setup task page
+3. A title in the top left should reflect the original task name from the task list. e.g. "Add tax rates"
+4. Clicking the chevron to the left of the title should take you back to the home screen
## 2.1.0
@@ -86,9 +99,9 @@ wp option delete 'woocommerce_merchant_email_notifications';
```
- Run the cron job `wc_admin_daily` (this tool can help [WP Crontrol](https://wordpress.org/plugins/wp-crontrol/)).
- - Go to **Tools > Cron Events** and scroll down to the `wc_admin_daily`.
- - Hover over the item and click `Edit` change the **Next Run** to `Now` and click `Update Event`.
- - It will redirect you to the cron event list, and `wc_admin_daily` should be near the top, if you wait 10 seconds and refresh the page the `wc_admin_daily` should be near the bottom again, this means it has been run, and scheduled again to run tomorrow.
+ - Go to **Tools > Cron Events** and scroll down to the `wc_admin_daily`.
+ - Hover over the item and click `Edit` change the **Next Run** to `Now` and click `Update Event`.
+ - It will redirect you to the cron event list, and `wc_admin_daily` should be near the top, if you wait 10 seconds and refresh the page the `wc_admin_daily` should be near the bottom again, this means it has been run, and scheduled again to run tomorrow.
- You should have not received an email note.
- Verify the note `wc-admin-add-first-product-note` was added in the DB and its `status` is `unactioned`. You can use a statement like this:
diff --git a/plugins/woocommerce-admin/client/header/index.js b/plugins/woocommerce-admin/client/header/index.js
index d2065772f6a..f5280eefd90 100644
--- a/plugins/woocommerce-admin/client/header/index.js
+++ b/plugins/woocommerce-admin/client/header/index.js
@@ -3,11 +3,16 @@
*/
import { __, sprintf } from '@wordpress/i18n';
import { useEffect, useLayoutEffect, useRef } from '@wordpress/element';
+import { Tooltip } from '@wordpress/components';
import classnames from 'classnames';
import { decodeEntities } from '@wordpress/html-entities';
import { useUserPreferences } from '@woocommerce/data';
import { getSetting } from '@woocommerce/wc-admin-settings';
import { Text } from '@woocommerce/experimental';
+import { Icon, chevronLeft } from '@wordpress/icons';
+import { getHistory, updateQueryString } from '@woocommerce/navigation';
+import { ENTER, SPACE } from '@wordpress/keycodes';
+import { recordEvent } from '@woocommerce/tracks';
/**
* Internal dependencies
@@ -18,6 +23,59 @@ import { MobileAppBanner } from '../mobile-banner';
import useIsScrolled from '../hooks/useIsScrolled';
import Navigation from '../navigation';
+const renderTaskListBackButton = () => {
+ const currentUrl = new URL( window.location.href );
+ const task = currentUrl.searchParams.get( 'task' );
+
+ if ( task ) {
+ const homeText = __( 'WooCommerce Home', 'woocommerce-admin' );
+
+ const navigateHome = () => {
+ recordEvent( 'topbar_back_button', {
+ page_name: getPageTitle( window.title ),
+ } );
+ updateQueryString( {}, getHistory().location.pathname, {} );
+ };
+
+ // if it's a task list page, render a back button to the homescreen
+ return (
+