From 3803e90fb40a90d62e1a62b434030c15bd80c054 Mon Sep 17 00:00:00 2001
From: Kader Ibrahim Shaik Dawood <ibrahim@transvelo.com>
Date: Mon, 17 Oct 2022 14:08:03 +0530
Subject: [PATCH 01/41] Adds local dev configurations to gitignore

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 7d1531631..94f900efa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,4 +34,5 @@ codeception.yml
 
 # local dev configurations
 .wp-env.json
-php.ini
\ No newline at end of file
+php.ini
+wp-config.php
\ No newline at end of file

From af5a2d7cccfc83e6e7d0d0700f48557709ced284 Mon Sep 17 00:00:00 2001
From: Kader Ibrahim Shaik Dawood <ibrahim@transvelo.com>
Date: Mon, 17 Oct 2022 14:47:28 +0530
Subject: [PATCH 02/41] Rename all mentions of FB Product Set to Facebook
 Product Set

---
 class-wc-facebookcommerce.php   | 15 ++++++++-------
 facebook-commerce.php           |  2 +-
 includes/Admin/Product_Sets.php |  6 +++---
 includes/ProductSets/Sync.php   |  2 +-
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/class-wc-facebookcommerce.php b/class-wc-facebookcommerce.php
index 05801bb7a..c786895ed 100644
--- a/class-wc-facebookcommerce.php
+++ b/class-wc-facebookcommerce.php
@@ -470,14 +470,14 @@ public function remove_product_fb_product_set_metabox() {
 		}
 
 		/**
-		 * Register FB Product Set Taxonomy
+		 * Register Facebook Product Set Taxonomy
 		 *
 		 * @since 2.3.0
 		 */
 		public function register_custom_taxonomy() {
 
-			$plural   = esc_html__( 'FB Product Sets', 'facebook-for-woocommerce' );
-			$singular = esc_html__( 'FB Product Set', 'facebook-for-woocommerce' );
+			$plural   = esc_html__( 'Facebook Product Sets', 'facebook-for-woocommerce' );
+			$singular = esc_html__( 'Facebook Product Set', 'facebook-for-woocommerce' );
 
 			$args = array(
 				'labels'            => array(
@@ -502,6 +502,7 @@ public function register_custom_taxonomy() {
 				'public'            => true,
 				'show_in_nav_menus' => false,
 				'show_tagcloud'     => false,
+				'show_in_menu'      => false,
 			);
 
 			register_taxonomy( 'fb_product_set', array( 'product' ), $args );
@@ -509,7 +510,7 @@ public function register_custom_taxonomy() {
 
 
 		/**
-		 * Filter FB Product Set Taxonomy table links
+		 * Filter Facebook Product Set Taxonomy table links
 		 *
 		 * @since 2.3.0
 		 *
@@ -525,7 +526,7 @@ public function product_set_links( $actions ) {
 
 
 		/**
-		 * Remove posts count column from FB Product Set custom taxonomy
+		 * Remove posts count column from Facebook Product Set custom taxonomy
 		 *
 		 * @since 2.3.0
 		 *
@@ -540,7 +541,7 @@ public function manage_fb_product_set_columns( $columns ) {
 
 
 		/**
-		 * Filter WC Breadcrumbs when the page is FB Product Sets
+		 * Filter WC Breadcrumbs when the page is Facebook Product Sets
 		 *
 		 * @since 2.3.0
 		 *
@@ -572,7 +573,7 @@ public function wc_page_breadcrumbs_filter( $breadcrumbs ) {
 
 
 		/**
-		 * Return that FB Product Set page is a WC Conected Page
+		 * Return that Facebook Product Set page is a WC Conected Page
 		 *
 		 * @since 2.3.0
 		 *
diff --git a/facebook-commerce.php b/facebook-commerce.php
index 9a8c03405..8a6b99e53 100644
--- a/facebook-commerce.php
+++ b/facebook-commerce.php
@@ -1667,7 +1667,7 @@ public function create_or_update_product_set_item( $product_set_data, $product_s
 			)
 		);
 
-		// update product set to set FB Product Set ID
+		// update product set to set Facebook Product Set ID
 		if ( $result && empty( $fb_product_set_id ) ) {
 
 			// decode and get ID from result body
diff --git a/includes/Admin/Product_Sets.php b/includes/Admin/Product_Sets.php
index 00381443b..3b277af64 100644
--- a/includes/Admin/Product_Sets.php
+++ b/includes/Admin/Product_Sets.php
@@ -75,7 +75,7 @@ public function __construct() {
 
 
 	/**
-	 * Add field to FB Product Set new term
+	 * Add field to Facebook Product Set new term
 	 *
 	 * @since 2.3.0
 	 */
@@ -90,7 +90,7 @@ public function category_field_on_new() {
 
 
 	/**
-	 * Add field to FB Product Set new term
+	 * Add field to Facebook Product Set new term
 	 *
 	 * @since 2.3.0
 	 *
@@ -179,7 +179,7 @@ class="select2 wc-facebook product_cats"
 			<option value="<?php echo esc_attr( $product_cat->term_id ); ?>" <?php echo esc_attr( $selected ); ?>><?php echo esc_attr( $product_cat->name ); ?></option>
 		<?php endforeach; ?>
 		<select>
-		<p class="description"><?php echo esc_html__( 'Map FB Product Set to WC Product Categories', 'facebook-for-woocommerce' ); ?>.</p>
+		<p class="description"><?php echo esc_html__( 'Map Facebook Product Set to WC Product Categories', 'facebook-for-woocommerce' ); ?>.</p>
 		<?php
 	}
 }
diff --git a/includes/ProductSets/Sync.php b/includes/ProductSets/Sync.php
index 97281b214..3a6b238a2 100644
--- a/includes/ProductSets/Sync.php
+++ b/includes/ProductSets/Sync.php
@@ -309,7 +309,7 @@ public function sync_remove_product_set( $product_set_term_id, $taxonomy ) {
 	 *
 	 * @since 2.3.0
 	 *
-	 * @param int $product_set_id FB Product Set Term ID.
+	 * @param int $product_set_id Facebook Product Set Term ID.
 	 */
 	public function maybe_sync_product_set( $product_set_id ) {
 

From 37bb44fcb3bb143e6799a9e637833539a4fac97d Mon Sep 17 00:00:00 2001
From: Kader Ibrahim Shaik Dawood <ibrahim@transvelo.com>
Date: Mon, 17 Oct 2022 17:41:37 +0530
Subject: [PATCH 03/41] Check for connection and add Facebook Product Sets to
 Marketing Menu

---
 includes/Admin/Settings.php | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/includes/Admin/Settings.php b/includes/Admin/Settings.php
index 43b62a4e0..6a67ac0e9 100644
--- a/includes/Admin/Settings.php
+++ b/includes/Admin/Settings.php
@@ -101,8 +101,36 @@ public function add_menu_item() {
 
 		$this->connect_to_enhanced_admin( $is_marketing_enabled ? 'marketing_page_wc-facebook' : 'woocommerce_page_wc-facebook' );
 		$this->register_woo_nav_menu_items();
+
+		if ( $is_marketing_enabled ) {
+			$this->add_fb_product_sets_to_marketing_menu();
+		}
 	}
 
+	/**
+	 * Checks for connection and if established adds Facebook Product Sets taxonomy page to the Marketing menu.
+	 *
+	 * @since x.x.x
+	 */
+	private function add_fb_product_sets_to_marketing_menu() {
+		$is_connected = facebook_for_woocommerce()->get_connection_handler()->is_connected();
+		
+		// If a connection is not established, do not add Facebook Product Sets to Marketing menu.
+		if ( ! $is_connected ) {
+			return;
+		}
+
+		$product_sets_url = admin_url( 'edit-tags.php?taxonomy=fb_product_set&post_type=product' );
+		add_submenu_page(
+			'woocommerce-marketing',
+			esc_html__( 'Facebook Product Sets', 'facebook-for-woocommerce' ),
+			esc_html__( 'Facebook Product Sets', 'facebook-for-woocommerce' ),
+			'manage_woocommerce',
+			$product_sets_url,
+			'',
+			10
+		);
+	}
 
 	/**
 	 * Enables enhanced admin support for the main Facebook settings page.

From 16cfaf0a12df5983b2c3547dc05b1ca1bea4cb6c Mon Sep 17 00:00:00 2001
From: Kader Ibrahim Shaik Dawood <ibrahim@transvelo.com>
Date: Thu, 20 Oct 2022 17:49:20 +0530
Subject: [PATCH 04/41] Adds IDE files to gitignore

---
 .gitignore | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 94f900efa..0ed2159dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,4 +35,7 @@ codeception.yml
 # local dev configurations
 .wp-env.json
 php.ini
-wp-config.php
\ No newline at end of file
+wp-config.php
+
+# IDE files
+.vscode/*
\ No newline at end of file

From e6c055914f21ba4b7aa5cf64f3b0e4c0eb517621 Mon Sep 17 00:00:00 2001
From: Kader Ibrahim Shaik Dawood <ibrahim@transvelo.com>
Date: Fri, 21 Oct 2022 12:45:13 +0530
Subject: [PATCH 05/41] Adds a setup task

* Removes the admin notice that asked the user to connect to Facebook
* Adds a setup task that asks the user to set up facebook
---
 class-wc-facebookcommerce.php  | 42 +++++++++----------
 includes/Admin/Tasks/Setup.php | 73 ++++++++++++++++++++++++++++++++++
 2 files changed, 91 insertions(+), 24 deletions(-)
 create mode 100644 includes/Admin/Tasks/Setup.php

diff --git a/class-wc-facebookcommerce.php b/class-wc-facebookcommerce.php
index 05801bb7a..d76442f14 100644
--- a/class-wc-facebookcommerce.php
+++ b/class-wc-facebookcommerce.php
@@ -18,6 +18,8 @@
 use SkyVerge\WooCommerce\Facebook\ProductSync\ProductValidator as ProductSyncValidator;
 use SkyVerge\WooCommerce\Facebook\Utilities\Heartbeat;
 use Automattic\WooCommerce\Admin\Features\Features as WooAdminFeatures;
+use Automattic\WooCommerce\Admin\Features\OnboardingTasks\TaskLists;
+use SkyVerge\WooCommerce\Facebook\Admin\Tasks\Setup;
 
 if ( ! class_exists( 'WC_Facebookcommerce' ) ) :
 
@@ -133,6 +135,9 @@ public function init() {
 			add_filter( 'fb_product_set_row_actions', array( $this, 'product_set_links' ) );
 			add_filter( 'manage_edit-fb_product_set_columns', array( $this, 'manage_fb_product_set_columns' ) );
 
+			// Hook the setup task.
+			add_action( 'init', array( $this, 'add_setup_task' ), 20 );
+
 			// Product Set breadcrumb filters
 			add_filter( 'woocommerce_navigation_is_connected_page', array( $this, 'is_current_page_conected_filter' ), 99, 2 );
 			add_filter( 'woocommerce_navigation_get_breadcrumbs', array( $this, 'wc_page_breadcrumbs_filter' ), 99 );
@@ -250,6 +255,19 @@ protected function get_deprecated_hooks() {
 			);
 		}
 
+		/**
+		 * Adds the setup task to the Tasklists.
+		 *
+		 * @since x.x.x
+		 */
+		public function add_setup_task() {
+			TaskLists::add_task(
+				'extended',
+				new Setup(
+					TaskLists::get_list( 'extended' )
+				)
+			);
+		}
 
 		/**
 		 * Adds the plugin admin notices.
@@ -303,30 +321,6 @@ public function add_admin_notices() {
 							)
 						);
 					}
-
-					// otherwise, a general getting started message
-				} elseif ( ! $this->is_plugin_settings() ) {
-
-					$message = sprintf(
-						/* translators: Placeholders %1$s - opening strong HTML tag, %2$s - closing strong HTML tag, %3$s - opening link HTML tag, %4$s - closing link HTML tag */
-						esc_html__(
-							'%1$sFacebook for WooCommerce is almost ready.%2$s To complete your configuration, %3$scomplete the setup steps%4$s.',
-							'facebook-for-woocommerce'
-						),
-						'<strong>',
-						'</strong>',
-						'<a href="' . esc_url( facebook_for_woocommerce()->get_settings_url() ) . '">',
-						'</a>'
-					);
-
-					$this->get_admin_notice_handler()->add_admin_notice(
-						$message,
-						self::PLUGIN_ID . '_get_started',
-						array(
-							'dismissible'  => true,
-							'notice_class' => 'notice-info',
-						)
-					);
 				}
 
 				// notices for those connected to FBE 2
diff --git a/includes/Admin/Tasks/Setup.php b/includes/Admin/Tasks/Setup.php
new file mode 100644
index 000000000..426d3b059
--- /dev/null
+++ b/includes/Admin/Tasks/Setup.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Set up Facebook task.
+ *
+ * Adds a set up facebook task to the task list.
+ */
+
+namespace SkyVerge\WooCommerce\Facebook\Admin\Tasks;
+
+defined( 'ABSPATH' ) || exit;
+
+use Automattic\WooCommerce\Admin\Features\OnboardingTasks\TaskLists;
+use Automattic\WooCommerce\Admin\Features\OnboardingTasks\Task;
+
+/**
+ * Setup Task class.
+ */
+class Setup extends Task {
+    
+    /**
+	 * Get the ID of the task.
+	 *
+	 * @return string
+	 */
+    public function get_id() {
+		return 'setup-facebook';
+	}
+    
+    /**
+	 * Get the title for the task.
+	 *
+	 * @return string
+	 */
+    public function get_title() {
+        return esc_html__( 'Set up Facebook for WooCommerce', 'facebook-for-woocommerce' );
+    } 
+
+    /**
+	 * Get the content for the task.
+	 *
+	 * @return string
+	 */
+    public function get_content() {
+		return esc_html__( 'Sync your products and reach customers across Facebook, Instagram, Messenger and WhatsApp.', 'facebook-for-woocommerce' );
+	}
+
+    /**
+	 * Get the time required to perform the task.
+	 *
+	 * @return string
+	 */
+    public function get_time() {
+		return esc_html__( '5 minutes', 'facebook-for-woocommerce');
+	}
+
+    /**
+	 * Get the action URL for the task.
+	 *
+	 * @return string
+	 */
+    public function get_action_url() {
+        return \facebook_for_woocommerce()->get_settings_url();
+    }
+
+    /**
+	 * Check if the task is complete.
+	 *
+	 * @return bool
+	 */
+    public function is_complete() {
+        return \facebook_for_woocommerce()->get_connection_handler()->is_connected();
+    }
+}
\ No newline at end of file

From a9b3472ddeef162be2fab3bf3570c2ef34501b58 Mon Sep 17 00:00:00 2001
From: Kader Ibrahim Shaik Dawood <ibrahim@transvelo.com>
Date: Fri, 21 Oct 2022 13:06:36 +0530
Subject: [PATCH 06/41] Fix phplint issues

---
 includes/Admin/Tasks/Setup.php | 46 ++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/includes/Admin/Tasks/Setup.php b/includes/Admin/Tasks/Setup.php
index 426d3b059..44524b275 100644
--- a/includes/Admin/Tasks/Setup.php
+++ b/includes/Admin/Tasks/Setup.php
@@ -3,6 +3,8 @@
  * Set up Facebook task.
  *
  * Adds a set up facebook task to the task list.
+ *
+ * @package FacebookCommerce
  */
 
 namespace SkyVerge\WooCommerce\Facebook\Admin\Tasks;
@@ -16,58 +18,58 @@
  * Setup Task class.
  */
 class Setup extends Task {
-    
-    /**
+
+	/**
 	 * Get the ID of the task.
 	 *
 	 * @return string
 	 */
-    public function get_id() {
+	public function get_id() {
 		return 'setup-facebook';
 	}
-    
-    /**
+
+	/**
 	 * Get the title for the task.
 	 *
 	 * @return string
 	 */
-    public function get_title() {
-        return esc_html__( 'Set up Facebook for WooCommerce', 'facebook-for-woocommerce' );
-    } 
+	public function get_title() {
+		return esc_html__( 'Set up Facebook for WooCommerce', 'facebook-for-woocommerce' );
+	}
 
-    /**
+	/**
 	 * Get the content for the task.
 	 *
 	 * @return string
 	 */
-    public function get_content() {
+	public function get_content() {
 		return esc_html__( 'Sync your products and reach customers across Facebook, Instagram, Messenger and WhatsApp.', 'facebook-for-woocommerce' );
 	}
 
-    /**
+	/**
 	 * Get the time required to perform the task.
 	 *
 	 * @return string
 	 */
-    public function get_time() {
-		return esc_html__( '5 minutes', 'facebook-for-woocommerce');
+	public function get_time() {
+		return esc_html__( '5 minutes', 'facebook-for-woocommerce' );
 	}
 
-    /**
+	/**
 	 * Get the action URL for the task.
 	 *
 	 * @return string
 	 */
-    public function get_action_url() {
-        return \facebook_for_woocommerce()->get_settings_url();
-    }
+	public function get_action_url() {
+		return \facebook_for_woocommerce()->get_settings_url();
+	}
 
-    /**
+	/**
 	 * Check if the task is complete.
 	 *
 	 * @return bool
 	 */
-    public function is_complete() {
-        return \facebook_for_woocommerce()->get_connection_handler()->is_connected();
-    }
-}
\ No newline at end of file
+	public function is_complete() {
+		return \facebook_for_woocommerce()->get_connection_handler()->is_connected();
+	}
+}

From 972da161c8bbee2f8f47acd08d5bbf5af578ae78 Mon Sep 17 00:00:00 2001
From: Kader Ibrahim Shaik Dawood <ibrahim@transvelo.com>
Date: Fri, 21 Oct 2022 18:21:32 +0530
Subject: [PATCH 07/41] Sets the correct parent menu and submenu for Facebook
 Product Sets taxonomy page.

---
 includes/Admin/Settings.php | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/includes/Admin/Settings.php b/includes/Admin/Settings.php
index 6a67ac0e9..87b0b5177 100644
--- a/includes/Admin/Settings.php
+++ b/includes/Admin/Settings.php
@@ -29,6 +29,12 @@ class Settings {
 	/** @var string base settings page ID */
 	const PAGE_ID = 'wc-facebook';
 
+	/**
+	 * Submenu page ID
+	 *
+	 * @var string
+	 */
+	const SUBMENU_PAGE_ID = 'edit-tags.php?taxonomy=fb_product_set&post_type=product';
 
 	/** @var Abstract_Settings_Screen[] */
 	private $screens;
@@ -60,9 +66,9 @@ public function __construct() {
 
 		add_action( 'wp_loaded', array( $this, 'save' ) );
 
+		add_filter( 'parent_file', array( $this, 'set_parent_and_submenu_file' ) );
 	}
 
-
 	/**
 	 * Adds the Facebook menu item.
 	 *
@@ -120,18 +126,35 @@ private function add_fb_product_sets_to_marketing_menu() {
 			return;
 		}
 
-		$product_sets_url = admin_url( 'edit-tags.php?taxonomy=fb_product_set&post_type=product' );
 		add_submenu_page(
 			'woocommerce-marketing',
 			esc_html__( 'Facebook Product Sets', 'facebook-for-woocommerce' ),
 			esc_html__( 'Facebook Product Sets', 'facebook-for-woocommerce' ),
 			'manage_woocommerce',
-			$product_sets_url,
+			admin_url( self::SUBMENU_PAGE_ID ),
 			'',
 			10
 		);
 	}
 
+	/**
+	 * Set the parent and submenu file while accessing Facebook Product Sets in the marketing menu.
+	 *
+	 * @since x.x.x
+	 * @param string $parent_file The parent file.
+	 * @return string
+	 */
+	public function set_parent_and_submenu_file( $parent_file ){
+		global $submenu_file, $current_screen;
+
+		if ( isset( $current_screen->taxonomy ) && 'fb_product_set' === $current_screen->taxonomy ) {
+			$parent_file  = 'woocommerce-marketing';
+			$submenu_file = admin_url( self::SUBMENU_PAGE_ID );
+		}
+
+		return $parent_file;
+	}
+
 	/**
 	 * Enables enhanced admin support for the main Facebook settings page.
 	 *

From 716cd751fb85fe11e080c21bdeac710488edb202 Mon Sep 17 00:00:00 2001
From: Kader Ibrahim Shaik Dawood <ibrahim@transvelo.com>
Date: Fri, 21 Oct 2022 21:34:13 +0530
Subject: [PATCH 08/41] Adds a method to get the last upgrade from version

---
 class-wc-facebookcommerce.php | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/class-wc-facebookcommerce.php b/class-wc-facebookcommerce.php
index 05801bb7a..64f3b20d0 100644
--- a/class-wc-facebookcommerce.php
+++ b/class-wc-facebookcommerce.php
@@ -18,6 +18,7 @@
 use SkyVerge\WooCommerce\Facebook\ProductSync\ProductValidator as ProductSyncValidator;
 use SkyVerge\WooCommerce\Facebook\Utilities\Heartbeat;
 use Automattic\WooCommerce\Admin\Features\Features as WooAdminFeatures;
+use SkyVerge\WooCommerce\Facebook\Admin\Notes\SettingsMoved;
 
 if ( ! class_exists( 'WC_Facebookcommerce' ) ) :
 
@@ -390,25 +391,28 @@ public function add_admin_notices() {
 				}
 
 				if ( $is_marketing_enabled ) {
-
-					$this->get_admin_notice_handler()->add_admin_notice(
-						sprintf(
-							/* translators: Placeholders: %1$s - opening <a> HTML link tag, %2$s - closing </a> HTML link tag */
-							esc_html__( 'Heads up! The Facebook menu is now located under the %1$sMarketing%2$s menu.', 'facebook-for-woocommerce' ),
-							'<a href="' . esc_url( $this->get_settings_url() ) . '">',
-							'</a>'
-						),
-						'settings_moved_to_marketing',
-						array(
-							'dismissible'             => true,
-							'always_show_on_settings' => false,
-							'notice_class'            => 'notice-info',
-						)
-					);
+					SettingsMoved::possibly_add_note();
 				}
 			}
 		}
 
+		/**
+		 * Get the version last upgraded from or return the current version.
+		 *
+		 * @since x.x.x
+		 * @return string
+		 */
+		public function get_last_upgrade_from_version() {
+			$from_version   = self::PLUGIN_VERSION;
+			$history_events = $this->lifecycle_handler->get_event_history();
+			foreach ( $history_events as $event ) {
+				if ( 'upgrade' === $event['name'] ) {
+					$from_version = $event['data']['from_version'];
+					break;
+				}
+			}
+			return $from_version;
+		}
 
 		public function add_wordpress_integration() {
 			new WP_Facebook_Integration();

From fe539fa6c853cd01abee016ec72ede0dccf42069 Mon Sep 17 00:00:00 2001
From: Kader Ibrahim Shaik Dawood <ibrahim@transvelo.com>
Date: Fri, 21 Oct 2022 21:34:48 +0530
Subject: [PATCH 09/41] Adds SettingsMoved note class

---
 includes/Admin/Notes/SettingsMoved.php | 74 ++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 includes/Admin/Notes/SettingsMoved.php

diff --git a/includes/Admin/Notes/SettingsMoved.php b/includes/Admin/Notes/SettingsMoved.php
new file mode 100644
index 000000000..e9dda0687
--- /dev/null
+++ b/includes/Admin/Notes/SettingsMoved.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Facebook Menu Settings moved note.
+ *
+ * Adds a note to merchant's inbox about Facebook Menu being moved to Marketing menu.
+ */
+
+namespace SkyVerge\WooCommerce\Facebook\Admin\Notes;
+
+defined( 'ABSPATH' ) || exit;
+
+use \Automattic\WooCommerce\Admin\Notes\Note;
+use \Automattic\WooCommerce\Admin\Notes\NoteTraits;
+
+/**
+ * SettingsMoved class.
+ */
+class SettingsMoved {
+    /**
+	 * Note traits.
+	 */
+	use NoteTraits;
+
+    /**
+	 * Name of the note for use in the database.
+	 */
+	const NOTE_NAME = 'facebook-for-woocommerce-settings-moved-to-marketing';
+
+	/**
+	 * Checks if this note should be displayed.
+	 *
+	 * @return bool
+	 */
+	public static function should_display() {
+		/**
+		 * The Facebook menu was moved under Marketing menu in v2.2.0. Display this note
+		 * only to users updating from a version prior to v2.2.0.
+		 */
+		$last_version = \facebook_for_woocommerce()->get_last_upgrade_from_version();
+		if ( version_compare( $last_version, '2.2.0', '<' ) ) {
+			$should_display = true;
+		} else {
+			$should_display = false;
+		}
+
+		return $should_display;
+	}
+
+	/**
+	 * Get the note.
+	 *
+	 * @return Note
+	 */
+	public static function get_note() {
+
+		// Verify the conditions to display the note.
+		if ( ! self::should_display() ) {
+			return;
+		}
+
+		$settings_url = facebook_for_woocommerce()->get_settings_url();
+		$content      = esc_html__( 'Sync your products and reach customers across Facebook, Instagram, Messenger and WhatsApp through your Facebook plugin, which can be found at Marketing > Facebook.', 'facebook-for-woocommerce' );
+
+		$note = new Note();
+		$note->set_title( esc_html__( 'Facebook is now found under Marketing', 'facebook-for-woocommerce' ) );
+		$note->set_content( $content );
+		$note->set_content_data( (object) array() );
+		$note->set_type( Note::E_WC_ADMIN_NOTE_INFORMATIONAL );
+		$note->set_name( self::NOTE_NAME );
+		$note->set_source( 'facebook-for-woocommerce' );
+		$note->add_action( 'settings', esc_html__( 'Go to Facebook', 'facebook-for-woocommerce' ), $settings_url );
+		return $note;
+	}
+}
\ No newline at end of file

From 63b62fd67eb3c862c44b0184269a295c5a4e8642 Mon Sep 17 00:00:00 2001
From: Kader Ibrahim Shaik Dawood <ibrahim@transvelo.com>
Date: Fri, 21 Oct 2022 21:44:25 +0530
Subject: [PATCH 10/41] Rename lowercase FB product set to Facebook Product Set

---
 facebook-commerce.php | 2 +-
 includes/Admin.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/facebook-commerce.php b/facebook-commerce.php
index 8a6b99e53..b058917c8 100644
--- a/facebook-commerce.php
+++ b/facebook-commerce.php
@@ -113,7 +113,7 @@ class WC_Facebookcommerce_Integration extends WC_Integration {
 	/** @var string the short product description mode name */
 	const PRODUCT_DESCRIPTION_MODE_SHORT = 'short';
 
-	/** @var string custom taxonomy FB product set ID */
+	/** @var string custom taxonomy Facebook Product Set ID */
 	const FB_PRODUCT_SET_ID = 'fb_product_set_id';
 
 	/** @var string|null the configured product catalog ID */
diff --git a/includes/Admin.php b/includes/Admin.php
index 42e9a67d2..6a26ecce1 100644
--- a/includes/Admin.php
+++ b/includes/Admin.php
@@ -180,7 +180,7 @@ public function enqueue_scripts() {
 					array(
 
 						'excluded_category_ids'             => facebook_for_woocommerce()->get_integration()->get_excluded_product_category_ids(),
-						'excluded_category_warning_message' => __( 'You have selected one or more categories currently excluded from the Facebook sync. Products belonging to the excluded categories will not be added to your FB product set.', 'facebook-for-woocommerce' ),
+						'excluded_category_warning_message' => __( 'You have selected one or more categories currently excluded from the Facebook sync. Products belonging to the excluded categories will not be added to your Facebook Product Set.', 'facebook-for-woocommerce' ),
 					)
 				);
 			}

From a97a6a5e86b3fa70337ac824ec804ddd166bbe57 Mon Sep 17 00:00:00 2001
From: Kader Ibrahim Shaik Dawood <ibrahim@transvelo.com>
Date: Wed, 26 Oct 2022 10:44:49 +0530
Subject: [PATCH 11/41] Refactors settings moved not add logic

---
 class-wc-facebookcommerce.php          | 20 +++++++++----------
 includes/Admin/Notes/SettingsMoved.php | 27 ++++++++++++++++----------
 2 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/class-wc-facebookcommerce.php b/class-wc-facebookcommerce.php
index 64f3b20d0..855e2fd06 100644
--- a/class-wc-facebookcommerce.php
+++ b/class-wc-facebookcommerce.php
@@ -391,27 +391,25 @@ public function add_admin_notices() {
 				}
 
 				if ( $is_marketing_enabled ) {
-					SettingsMoved::possibly_add_note();
+					SettingsMoved::possibly_add_or_delete_note();
 				}
 			}
 		}
 
 		/**
-		 * Get the version last upgraded from or return the current version.
+		 * Get the last event from the plugin lifecycle.
 		 *
 		 * @since x.x.x
-		 * @return string
+		 * @return array
 		 */
-		public function get_last_upgrade_from_version() {
-			$from_version   = self::PLUGIN_VERSION;
+		public function get_last_event_from_history() {
+			$last_event     = array();
 			$history_events = $this->lifecycle_handler->get_event_history();
-			foreach ( $history_events as $event ) {
-				if ( 'upgrade' === $event['name'] ) {
-					$from_version = $event['data']['from_version'];
-					break;
-				}
+
+			if ( isset( $history_events[0] ) ) {
+				$last_event = $history_events[0];
 			}
-			return $from_version;
+			return $last_event;
 		}
 
 		public function add_wordpress_integration() {
diff --git a/includes/Admin/Notes/SettingsMoved.php b/includes/Admin/Notes/SettingsMoved.php
index e9dda0687..0d07c9124 100644
--- a/includes/Admin/Notes/SettingsMoved.php
+++ b/includes/Admin/Notes/SettingsMoved.php
@@ -36,16 +36,28 @@ public static function should_display() {
 		 * The Facebook menu was moved under Marketing menu in v2.2.0. Display this note
 		 * only to users updating from a version prior to v2.2.0.
 		 */
-		$last_version = \facebook_for_woocommerce()->get_last_upgrade_from_version();
-		if ( version_compare( $last_version, '2.2.0', '<' ) ) {
-			$should_display = true;
-		} else {
-			$should_display = false;
+		$should_display = false;
+		$last_event     = \facebook_for_woocommerce()->get_last_event_from_history();
+
+		if ( isset( $last_event['name'] ) && 'upgrade' === $last_event['name'] ) {
+			$last_version = $last_event['data']['from_version'];
+			if ( version_compare( $last_version, '2.2.0', '<' ) ) {
+				$should_display = true;
+			}
 		}
 
 		return $should_display;
 	}
 
+	public static function possibly_add_or_delete_note() {
+		// Verify the conditions to display the note.
+		if ( self::should_display() ) {
+			self::possibly_add_note();
+		} elseif ( self::note_exists() ) {
+			self::possibly_delete_note();
+		}
+	}
+
 	/**
 	 * Get the note.
 	 *
@@ -53,11 +65,6 @@ public static function should_display() {
 	 */
 	public static function get_note() {
 
-		// Verify the conditions to display the note.
-		if ( ! self::should_display() ) {
-			return;
-		}
-
 		$settings_url = facebook_for_woocommerce()->get_settings_url();
 		$content      = esc_html__( 'Sync your products and reach customers across Facebook, Instagram, Messenger and WhatsApp through your Facebook plugin, which can be found at Marketing > Facebook.', 'facebook-for-woocommerce' );
 

From de3fa1b6acd96a2c35bd854329a6321f1e2193f9 Mon Sep 17 00:00:00 2001
From: Kader Ibrahim Shaik Dawood <ibrahim@transvelo.com>
Date: Wed, 26 Oct 2022 10:51:12 +0530
Subject: [PATCH 12/41] Fix php lint issues

---
 includes/Admin/Notes/SettingsMoved.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/includes/Admin/Notes/SettingsMoved.php b/includes/Admin/Notes/SettingsMoved.php
index 0d07c9124..0170a2f85 100644
--- a/includes/Admin/Notes/SettingsMoved.php
+++ b/includes/Admin/Notes/SettingsMoved.php
@@ -3,6 +3,8 @@
  * Facebook Menu Settings moved note.
  *
  * Adds a note to merchant's inbox about Facebook Menu being moved to Marketing menu.
+ *
+ * @package FacebookCommerce
  */
 
 namespace SkyVerge\WooCommerce\Facebook\Admin\Notes;
@@ -16,12 +18,12 @@
  * SettingsMoved class.
  */
 class SettingsMoved {
-    /**
+	/**
 	 * Note traits.
 	 */
 	use NoteTraits;
 
-    /**
+	/**
 	 * Name of the note for use in the database.
 	 */
 	const NOTE_NAME = 'facebook-for-woocommerce-settings-moved-to-marketing';
@@ -49,6 +51,11 @@ public static function should_display() {
 		return $should_display;
 	}
 
+	/**
+	 * Add or delete note depending on the conditions to display the note.
+	 *
+	 * @throws NotesUnavailableException Throws exception when notes are unavailable.
+	 */
 	public static function possibly_add_or_delete_note() {
 		// Verify the conditions to display the note.
 		if ( self::should_display() ) {
@@ -78,4 +85,4 @@ public static function get_note() {
 		$note->add_action( 'settings', esc_html__( 'Go to Facebook', 'facebook-for-woocommerce' ), $settings_url );
 		return $note;
 	}
-}
\ No newline at end of file
+}

From 5c379625d5e4ff5fc3d03b6b07f106edc060823b Mon Sep 17 00:00:00 2001
From: Kader Ibrahim Shaik Dawood <ibrahim@transvelo.com>
Date: Thu, 27 Oct 2022 14:33:26 +0530
Subject: [PATCH 13/41] Change task time from 5 minutes to 20 mins (#2298)

---
 includes/Admin/Tasks/Setup.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/Admin/Tasks/Setup.php b/includes/Admin/Tasks/Setup.php
index 44524b275..07e075474 100644
--- a/includes/Admin/Tasks/Setup.php
+++ b/includes/Admin/Tasks/Setup.php
@@ -52,7 +52,7 @@ public function get_content() {
 	 * @return string
 	 */
 	public function get_time() {
-		return esc_html__( '5 minutes', 'facebook-for-woocommerce' );
+		return esc_html__( '20 minutes', 'facebook-for-woocommerce' );
 	}
 
 	/**

From ac0c3569dae94f1afc3c477eb00d2c230efd03fa Mon Sep 17 00:00:00 2001
From: Kader Ibrahim S <kader.ibrahim.s@a8c.com>
Date: Thu, 27 Oct 2022 17:28:36 +0530
Subject: [PATCH 14/41] Update includes/Admin/Notes/SettingsMoved.php

Co-authored-by: Rodrigue <rodrigue.tusse@automattic.com>
---
 includes/Admin/Notes/SettingsMoved.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/Admin/Notes/SettingsMoved.php b/includes/Admin/Notes/SettingsMoved.php
index 0170a2f85..85319e4a4 100644
--- a/includes/Admin/Notes/SettingsMoved.php
+++ b/includes/Admin/Notes/SettingsMoved.php
@@ -39,7 +39,7 @@ public static function should_display() {
 		 * only to users updating from a version prior to v2.2.0.
 		 */
 		$should_display = false;
-		$last_event     = \facebook_for_woocommerce()->get_last_event_from_history();
+		$last_event     = facebook_for_woocommerce()->get_last_event_from_history();
 
 		if ( isset( $last_event['name'] ) && 'upgrade' === $last_event['name'] ) {
 			$last_version = $last_event['data']['from_version'];

From 39554f0f7c8009c4225de4f3ad96132266fcccf0 Mon Sep 17 00:00:00 2001
From: Kader Ibrahim S <kader.ibrahim.s@a8c.com>
Date: Thu, 27 Oct 2022 17:32:01 +0530
Subject: [PATCH 15/41] Run the setup task to admin init from init

Co-authored-by: Rodrigue <rodrigue.tusse@automattic.com>
---
 class-wc-facebookcommerce.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/class-wc-facebookcommerce.php b/class-wc-facebookcommerce.php
index d76442f14..65a4d0de1 100644
--- a/class-wc-facebookcommerce.php
+++ b/class-wc-facebookcommerce.php
@@ -136,7 +136,7 @@ public function init() {
 			add_filter( 'manage_edit-fb_product_set_columns', array( $this, 'manage_fb_product_set_columns' ) );
 
 			// Hook the setup task.
-			add_action( 'init', array( $this, 'add_setup_task' ), 20 );
+			add_action( 'admin_init', array( $this, 'add_setup_task' ), 20 );
 
 			// Product Set breadcrumb filters
 			add_filter( 'woocommerce_navigation_is_connected_page', array( $this, 'is_current_page_conected_filter' ), 99, 2 );

From 05856938c2e6b15d830c9ce43dbec1bb16430fb1 Mon Sep 17 00:00:00 2001
From: Kader Ibrahim Shaik Dawood <ibrahim@transvelo.com>
Date: Thu, 27 Oct 2022 17:36:51 +0530
Subject: [PATCH 16/41] Removed leading namespace separator from
 facebook_for_woocommerce()

---
 includes/Admin/Tasks/Setup.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/includes/Admin/Tasks/Setup.php b/includes/Admin/Tasks/Setup.php
index 07e075474..a9a20edd9 100644
--- a/includes/Admin/Tasks/Setup.php
+++ b/includes/Admin/Tasks/Setup.php
@@ -61,7 +61,7 @@ public function get_time() {
 	 * @return string
 	 */
 	public function get_action_url() {
-		return \facebook_for_woocommerce()->get_settings_url();
+		return facebook_for_woocommerce()->get_settings_url();
 	}
 
 	/**
@@ -70,6 +70,6 @@ public function get_action_url() {
 	 * @return bool
 	 */
 	public function is_complete() {
-		return \facebook_for_woocommerce()->get_connection_handler()->is_connected();
+		return facebook_for_woocommerce()->get_connection_handler()->is_connected();
 	}
 }

From 2b4b58f2f788fd390df74b86c45dbf750b5b1e5d Mon Sep 17 00:00:00 2001
From: Kader Ibrahim S <kader.ibrahim.s@a8c.com>
Date: Fri, 28 Oct 2022 19:22:46 +0530
Subject: [PATCH 17/41] Sets the screen ID according to the orders data store

---
 includes/Admin.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/includes/Admin.php b/includes/Admin.php
index a9d40e503..8e095ce6e 100644
--- a/includes/Admin.php
+++ b/includes/Admin.php
@@ -12,6 +12,7 @@
 namespace SkyVerge\WooCommerce\Facebook;
 
 use SkyVerge\WooCommerce\PluginFramework\v5_10_0\SV_WC_Helper;
+use Automattic\WooCommerce\Internal\DataStores\Orders\CustomOrdersTableController;
 
 defined( 'ABSPATH' ) or exit;
 
@@ -46,13 +47,17 @@ class Admin {
 	 */
 	public function __construct() {
 
+		$screen_order = wc_get_container()->get( CustomOrdersTableController::class )->custom_orders_table_usage_is_enabled()
+		? wc_get_page_screen_id( 'shop-order' )
+		: 'shop_order';
+
 		$this->screen_ids = [
 			'product',
 			'edit-product',
 			'woocommerce_page_wc-facebook',
 			'marketing_page_wc-facebook',
 			'edit-product_cat',
-			'shop_order',
+			$screen_order,
 		];
 
 		// enqueue admin scripts

From 62c3033b801766b4b62a51290761aa14da1db92d Mon Sep 17 00:00:00 2001
From: Kader Ibrahim S <kader.ibrahim.s@a8c.com>
Date: Fri, 28 Oct 2022 19:23:33 +0530
Subject: [PATCH 18/41] Sets the correct orders and order page according to
 data store used

---
 tests/_support/AcceptanceTester.php | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/tests/_support/AcceptanceTester.php b/tests/_support/AcceptanceTester.php
index 9c675b6a6..12bdb1d93 100644
--- a/tests/_support/AcceptanceTester.php
+++ b/tests/_support/AcceptanceTester.php
@@ -1,6 +1,7 @@
 <?php
 
 use SkyVerge\WooCommerce\Facebook;
+use Automattic\WooCommerce\Internal\DataStores\Orders\CustomOrdersTableController;
 
 /**
  * Inherited Methods
@@ -197,7 +198,13 @@ public function amOnProductPage( $product_id ) {
 	 */
 	public function amOnOrdersPage() {
 
-		$this->amOnAdminPage('edit.php?post_type=shop_order' );
+		if ( wc_get_container()->get( CustomOrdersTableController::class )->custom_orders_table_usage_is_enabled() ) {
+			$orders_page = 'admin.php?page=wc-orders';
+		} else {
+			$orders_page = 'edit.php?post_type=shop_order';
+		}
+
+		$this->amOnAdminPage( $orders_page );
 	}
 
 
@@ -208,7 +215,13 @@ public function amOnOrdersPage() {
 	 */
 	public function amOnOrderPage( $order_id ) {
 
-		$this->amOnAdminPage( "post.php?post={$order_id}&action=edit" );
+		if ( wc_get_container()->get( CustomOrdersTableController::class )->custom_orders_table_usage_is_enabled() ) {
+			$order_page = "admin.php?page=wc-orders&id={$order_id}&action=edit";
+		} else {
+			$order_page = "post.php?post={$order_id}&action=edit";
+		}
+
+		$this->amOnAdminPage( $order_page );
 	}
 
 

From 13989e71474f2c82d1f434012c109a2fbed2046c Mon Sep 17 00:00:00 2001
From: Kader Ibrahim S <kader.ibrahim.s@a8c.com>
Date: Fri, 28 Oct 2022 19:24:09 +0530
Subject: [PATCH 19/41] Sets HPOS compatibility to true

---
 facebook-for-woocommerce.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/facebook-for-woocommerce.php b/facebook-for-woocommerce.php
index 95ef78b69..f268f8e15 100644
--- a/facebook-for-woocommerce.php
+++ b/facebook-for-woocommerce.php
@@ -21,8 +21,19 @@
  * @package FacebookCommerce
  */
 
+use Automattic\WooCommerce\Utilities\FeaturesUtil;
+
 defined( 'ABSPATH' ) || exit;
 
+// HPOS compatibility declaration.
+add_action(
+	'before_woocommerce_init',
+	function() {
+		if ( class_exists( FeaturesUtil::class ) ) {
+			FeaturesUtil::declare_compatibility( 'custom_order_tables', plugin_basename( __FILE__ ), true );
+		}
+	}
+);
 /**
  * The plugin loader class.
  *

From 44f995d5f644e38cd990e55359316e5d91ddb811 Mon Sep 17 00:00:00 2001
From: Kader Ibrahim S <kader.ibrahim.s@a8c.com>
Date: Fri, 28 Oct 2022 20:04:02 +0530
Subject: [PATCH 20/41] Rename  to  to resolve ambiguity

---
 includes/Admin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/includes/Admin.php b/includes/Admin.php
index 8e095ce6e..4120ed27f 100644
--- a/includes/Admin.php
+++ b/includes/Admin.php
@@ -47,7 +47,7 @@ class Admin {
 	 */
 	public function __construct() {
 
-		$screen_order = wc_get_container()->get( CustomOrdersTableController::class )->custom_orders_table_usage_is_enabled()
+		$order_screen_id = wc_get_container()->get( CustomOrdersTableController::class )->custom_orders_table_usage_is_enabled()
 		? wc_get_page_screen_id( 'shop-order' )
 		: 'shop_order';
 
@@ -57,7 +57,7 @@ public function __construct() {
 			'woocommerce_page_wc-facebook',
 			'marketing_page_wc-facebook',
 			'edit-product_cat',
-			$screen_order,
+			$order_screen_id,
 		];
 
 		// enqueue admin scripts

From 81a33daef6acac86f72a7483b9c836a6ba5e6622 Mon Sep 17 00:00:00 2001
From: Kader Ibrahim S <kader.ibrahim.s@a8c.com>
Date: Fri, 28 Oct 2022 20:04:02 +0530
Subject: [PATCH 21/41] Rename variable screen_order to order_screen_id to
 resolve ambiguity

---
 includes/Admin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/includes/Admin.php b/includes/Admin.php
index 8e095ce6e..4120ed27f 100644
--- a/includes/Admin.php
+++ b/includes/Admin.php
@@ -47,7 +47,7 @@ class Admin {
 	 */
 	public function __construct() {
 
-		$screen_order = wc_get_container()->get( CustomOrdersTableController::class )->custom_orders_table_usage_is_enabled()
+		$order_screen_id = wc_get_container()->get( CustomOrdersTableController::class )->custom_orders_table_usage_is_enabled()
 		? wc_get_page_screen_id( 'shop-order' )
 		: 'shop_order';
 
@@ -57,7 +57,7 @@ public function __construct() {
 			'woocommerce_page_wc-facebook',
 			'marketing_page_wc-facebook',
 			'edit-product_cat',
-			$screen_order,
+			$order_screen_id,
 		];
 
 		// enqueue admin scripts

From 6533caf0b60c8d929821052ba664e61dab52a7be Mon Sep 17 00:00:00 2001
From: Kader Ibrahim S <kader.ibrahim.s@a8c.com>
Date: Mon, 31 Oct 2022 17:00:55 +0530
Subject: [PATCH 22/41] Change setup task hook from admin_init to init

The hook admin_init is not triggered when the WC fetches the
tasks endpoint and hence hooking into init.
---
 class-wc-facebookcommerce.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/class-wc-facebookcommerce.php b/class-wc-facebookcommerce.php
index f376e0ee3..05c579df3 100644
--- a/class-wc-facebookcommerce.php
+++ b/class-wc-facebookcommerce.php
@@ -136,8 +136,8 @@ public function init() {
 			add_filter( 'fb_product_set_row_actions', array( $this, 'product_set_links' ) );
 			add_filter( 'manage_edit-fb_product_set_columns', array( $this, 'manage_fb_product_set_columns' ) );
 
-			// Hook the setup task.
-			add_action( 'admin_init', array( $this, 'add_setup_task' ), 20 );
+			// Hook the setup task. The hook admin_init is not triggered when the WC fetches the tasks using the endpoint: wp-json/wc-admin/onboarding/tasks and hence hooking into init.
+			add_action( 'init', array( $this, 'add_setup_task' ), 20 );
 
 			// Product Set breadcrumb filters
 			add_filter( 'woocommerce_navigation_is_connected_page', array( $this, 'is_current_page_conected_filter' ), 99, 2 );

From f1d906e19c2286217ff494c8632895112162cd6c Mon Sep 17 00:00:00 2001
From: Kader Ibrahim S <kader.ibrahim.s@a8c.com>
Date: Mon, 31 Oct 2022 20:39:55 +0530
Subject: [PATCH 23/41] Replaces custom_orders_table_usage_is_enabled method
 from Internal class namesspace

The Internal namespace class CustomOrdersTableController should not be used. The method custom_orders_table_usage_is_enabled
is replaced by a static method from OrderUtil public class which mirrors the Internal class method
---
 includes/Admin.php                  | 9 +++++----
 tests/_support/AcceptanceTester.php | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/includes/Admin.php b/includes/Admin.php
index 4120ed27f..0602e1bdf 100644
--- a/includes/Admin.php
+++ b/includes/Admin.php
@@ -12,7 +12,7 @@
 namespace SkyVerge\WooCommerce\Facebook;
 
 use SkyVerge\WooCommerce\PluginFramework\v5_10_0\SV_WC_Helper;
-use Automattic\WooCommerce\Internal\DataStores\Orders\CustomOrdersTableController;
+use Automattic\WooCommerce\Utilities\OrderUtil;
 
 defined( 'ABSPATH' ) or exit;
 
@@ -47,9 +47,10 @@ class Admin {
 	 */
 	public function __construct() {
 
-		$order_screen_id = wc_get_container()->get( CustomOrdersTableController::class )->custom_orders_table_usage_is_enabled()
-		? wc_get_page_screen_id( 'shop-order' )
-		: 'shop_order';
+		$order_screen_id = 'shop_order';
+		if ( class_exists( OrderUtil::class ) && OrderUtil::custom_orders_table_usage_is_enabled() ) {
+			$order_screen_id = wc_get_page_screen_id( 'shop-order' );
+		}
 
 		$this->screen_ids = [
 			'product',
diff --git a/tests/_support/AcceptanceTester.php b/tests/_support/AcceptanceTester.php
index 12bdb1d93..20d9ac315 100644
--- a/tests/_support/AcceptanceTester.php
+++ b/tests/_support/AcceptanceTester.php
@@ -1,7 +1,7 @@
 <?php
 
 use SkyVerge\WooCommerce\Facebook;
-use Automattic\WooCommerce\Internal\DataStores\Orders\CustomOrdersTableController;
+use Automattic\WooCommerce\Utilities\OrderUtil;
 
 /**
  * Inherited Methods
@@ -198,7 +198,7 @@ public function amOnProductPage( $product_id ) {
 	 */
 	public function amOnOrdersPage() {
 
-		if ( wc_get_container()->get( CustomOrdersTableController::class )->custom_orders_table_usage_is_enabled() ) {
+		if ( class_exists( OrderUtil::class ) && OrderUtil::custom_orders_table_usage_is_enabled() ) {
 			$orders_page = 'admin.php?page=wc-orders';
 		} else {
 			$orders_page = 'edit.php?post_type=shop_order';
@@ -215,7 +215,7 @@ public function amOnOrdersPage() {
 	 */
 	public function amOnOrderPage( $order_id ) {
 
-		if ( wc_get_container()->get( CustomOrdersTableController::class )->custom_orders_table_usage_is_enabled() ) {
+		if ( class_exists( OrderUtil::class ) && OrderUtil::custom_orders_table_usage_is_enabled() ) {
 			$order_page = "admin.php?page=wc-orders&id={$order_id}&action=edit";
 		} else {
 			$order_page = "post.php?post={$order_id}&action=edit";

From aaf604352928c670429d2daa4eae63584904b862 Mon Sep 17 00:00:00 2001
From: Rodrigue Tusse <rodrigue.tusse@automattic.com>
Date: Tue, 1 Nov 2022 13:39:07 +0200
Subject: [PATCH 24/41] Fix duplicate InitiateCheckout when using checkout
 block.

---
 facebook-commerce-events-tracker.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/facebook-commerce-events-tracker.php b/facebook-commerce-events-tracker.php
index 6773c1507..bb252eb0a 100644
--- a/facebook-commerce-events-tracker.php
+++ b/facebook-commerce-events-tracker.php
@@ -850,7 +850,7 @@ public function inject_add_to_cart_redirect_event() {
 		 */
 		public function inject_initiate_checkout_event() {
 
-			if ( ! $this->is_pixel_enabled() || $this->pixel->is_last_event( 'InitiateCheckout' ) ) {
+			if ( ! $this->is_pixel_enabled() || WC()->cart->get_cart_contents_count() === 0 || $this->pixel->is_last_event( 'InitiateCheckout' ) ) {
 				return;
 			}
 

From 40b446633a3de4e2e86179caa4b0aae5fbf9ae1c Mon Sep 17 00:00:00 2001
From: Kader Ibrahim S <kader.ibrahim.s@a8c.com>
Date: Tue, 1 Nov 2022 18:56:21 +0530
Subject: [PATCH 25/41] Removes unused class TaskLists from the namespace
 import

---
 includes/Admin/Tasks/Setup.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/includes/Admin/Tasks/Setup.php b/includes/Admin/Tasks/Setup.php
index a9a20edd9..f7d91b871 100644
--- a/includes/Admin/Tasks/Setup.php
+++ b/includes/Admin/Tasks/Setup.php
@@ -11,7 +11,6 @@
 
 defined( 'ABSPATH' ) || exit;
 
-use Automattic\WooCommerce\Admin\Features\OnboardingTasks\TaskLists;
 use Automattic\WooCommerce\Admin\Features\OnboardingTasks\Task;
 
 /**

From f30206d9b0e05677fc91047489b38dbbdf8e803f Mon Sep 17 00:00:00 2001
From: Kader Ibrahim S <kader.ibrahim.s@a8c.com>
Date: Wed, 2 Nov 2022 11:41:59 +0530
Subject: [PATCH 26/41] Update includes/Admin.php

Thank you.

Co-authored-by: Jeremy Pry <JPry@users.noreply.github.com>
---
 includes/Admin.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/includes/Admin.php b/includes/Admin.php
index 0602e1bdf..c1262310b 100644
--- a/includes/Admin.php
+++ b/includes/Admin.php
@@ -47,10 +47,7 @@ class Admin {
 	 */
 	public function __construct() {
 
-		$order_screen_id = 'shop_order';
-		if ( class_exists( OrderUtil::class ) && OrderUtil::custom_orders_table_usage_is_enabled() ) {
-			$order_screen_id = wc_get_page_screen_id( 'shop-order' );
-		}
+		$order_screen_id = class_exists( OrderUtil::class ) ? OrderUtil::get_order_admin_screen() : 'shop_order';
 
 		$this->screen_ids = [
 			'product',

From 168a89c151fa283f3305e7f46764cdcbfca838bb Mon Sep 17 00:00:00 2001
From: Rodrigue Tusse <rodrigue.tusse@automattic.com>
Date: Fri, 4 Nov 2022 12:00:30 +0200
Subject: [PATCH 27/41] Ensure the posted value is unslashed before saving in
 the post_meta table.

---
 includes/Products.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/Products.php b/includes/Products.php
index fe1cb7a79..128d47f97 100644
--- a/includes/Products.php
+++ b/includes/Products.php
@@ -1120,7 +1120,7 @@ public static function update_product_enhanced_catalog_attribute( \WC_Product $p
 		if ( self::get_enhanced_catalog_attribute( $attribute_key, $product ) === $value ) {
 			return;
 		}
-		$product->update_meta_data( self::ENHANCED_CATALOG_ATTRIBUTES_META_KEY_PREFIX . $attribute_key, $value );
+		$product->update_meta_data( self::ENHANCED_CATALOG_ATTRIBUTES_META_KEY_PREFIX . $attribute_key, wp_unslash( $value ) );
 		$product->save_meta_data();
 	}
 

From ac30019bcb9b173bd760aab8068200f591bd91fd Mon Sep 17 00:00:00 2001
From: Rodrigue Tusse <rodrigue.tusse@automattic.com>
Date: Fri, 4 Nov 2022 13:28:54 +0200
Subject: [PATCH 28/41] Sync product set when the term name changes.

---
 includes/ProductSets/Sync.php | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/includes/ProductSets/Sync.php b/includes/ProductSets/Sync.php
index 3a6b238a2..e6acb733a 100644
--- a/includes/ProductSets/Sync.php
+++ b/includes/ProductSets/Sync.php
@@ -71,6 +71,15 @@ class Sync {
 	 */
 	protected static $prev_product_set = array();
 
+	/**
+	 * Product's Product Set Previous Name
+	 *
+	 * @since x.x.x
+	 *
+	 * @var string
+	 */
+	protected static $prev_product_name = "";
+
 	/**
 	 * Product's Product Set New List
 	 *
@@ -80,6 +89,15 @@ class Sync {
 	 */
 	protected static $new_product_set = array();
 
+	/**
+	 * Product's Product Set Previous Name
+	 *
+	 * @since x.x.x
+	 *
+	 * @var string
+	 */
+	protected static $new_product_name = "";
+
 	/**
 	 * Categories field name
 	 *
@@ -122,7 +140,7 @@ public function add_hooks() {
 		// product set hooks, compare taxonomies the lists before and after saving product to see if must sync
 		add_action( 'created_fb_product_set', array( $this, 'fb_product_set_hook_before' ), 1 );
 		add_action( 'created_fb_product_set', array( $this, 'fb_product_set_hook_after' ), 99 );
-		add_action( 'edited_fb_product_set', array( $this, 'fb_product_set_hook_before' ), 1 );
+		add_action( 'edit_fb_product_set', array( $this, 'fb_product_set_hook_before' ), 1 );
 		add_action( 'edited_fb_product_set', array( $this, 'fb_product_set_hook_after' ), 99 );
 
 		// product cat and product set delete hooks, remove or check if must remove any product set
@@ -240,6 +258,7 @@ public function maybe_sync_product_sets( $product_cats, $product_sets ) {
 	 */
 	public function fb_product_set_hook_before( $term_id ) {
 		self::$prev_product_cat = get_term_meta( $term_id, $this->categories_field, true );
+		self::$prev_product_name = get_term( $term_id )->name;
 	}
 
 
@@ -252,7 +271,8 @@ public function fb_product_set_hook_before( $term_id ) {
 	 */
 	public function fb_product_set_hook_after( $term_id ) {
 		self::$new_product_cat = get_term_meta( $term_id, $this->categories_field, true );
-		if ( ! empty( $this->get_all_diff( 'product_cat' ) ) ) {
+		self::$new_product_name = get_term( $term_id )->name;
+		if ( ! empty( $this->get_all_diff( 'product_cat' ) ) || self::$prev_product_name !== self::$new_product_name ) {
 			$this->maybe_sync_product_set( $term_id );
 		}
 	}

From 2c4b71d60f94c783ae3c3ddf308822c08da88ca9 Mon Sep 17 00:00:00 2001
From: Rodrigue <rodrigue.tusse@automattic.com>
Date: Fri, 4 Nov 2022 13:35:28 +0200
Subject: [PATCH 29/41] Update doc bloc description

---
 includes/ProductSets/Sync.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/ProductSets/Sync.php b/includes/ProductSets/Sync.php
index e6acb733a..ae16c72df 100644
--- a/includes/ProductSets/Sync.php
+++ b/includes/ProductSets/Sync.php
@@ -90,7 +90,7 @@ class Sync {
 	protected static $new_product_set = array();
 
 	/**
-	 * Product's Product Set Previous Name
+	 * Product's Product Set New Name
 	 *
 	 * @since x.x.x
 	 *

From 4ebc7dfef6371c22a6f55055683f695fbf588cb7 Mon Sep 17 00:00:00 2001
From: Rahul Maddineni <rahulmaddineni@fb.com>
Date: Fri, 4 Nov 2022 11:30:27 -0700
Subject: [PATCH 30/41] Redirect the users to advertise tab of the plugin when
 FBE is installed

---
 class-wc-facebookcommerce.php    | 13 +++++++++++++
 includes/Handlers/Connection.php |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/class-wc-facebookcommerce.php b/class-wc-facebookcommerce.php
index 05c579df3..6a650abc2 100644
--- a/class-wc-facebookcommerce.php
+++ b/class-wc-facebookcommerce.php
@@ -1013,6 +1013,19 @@ public function get_settings_url( $plugin_id = null ) {
 
 			return admin_url( 'admin.php?page=wc-facebook' );
 		}
+		
+		/**
+         * Gets the advertise tab page URL.
+         *
+         * @since x.x.x
+         *
+         * @return string
+         */
+        public function get_advertise_tab_url() {
+			
+			return admin_url( 'admin.php?page=wc-facebook&tab=advertise' );
+        }
+
 
 
 		/**
diff --git a/includes/Handlers/Connection.php b/includes/Handlers/Connection.php
index 4b2e37101..300a966a2 100644
--- a/includes/Handlers/Connection.php
+++ b/includes/Handlers/Connection.php
@@ -310,7 +310,7 @@ public function handle_connect() {
 			set_transient( 'wc_facebook_connection_failed', time(), 30 );
 		}
 
-		wp_safe_redirect( facebook_for_woocommerce()->get_settings_url() );
+		wp_safe_redirect( facebook_for_woocommerce()->get_advertise_tab_url() );
 		exit;
 	}
 

From 0bd395072a76fd009fcfd3431c354e82b54feb88 Mon Sep 17 00:00:00 2001
From: Rodrigue Tusse <rodrigue.tusse@automattic.com>
Date: Mon, 7 Nov 2022 13:46:32 +0200
Subject: [PATCH 31/41] Redirect to connection tab if connection fails.

---
 includes/Handlers/Connection.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/includes/Handlers/Connection.php b/includes/Handlers/Connection.php
index 300a966a2..39b7eec2b 100644
--- a/includes/Handlers/Connection.php
+++ b/includes/Handlers/Connection.php
@@ -302,12 +302,18 @@ public function handle_connect() {
 			facebook_for_woocommerce()->log( sprintf( 'Connection failed: %s', $exception->getMessage() ) );
 
 			set_transient( 'wc_facebook_connection_failed', time(), 30 );
+
+			wp_safe_redirect( facebook_for_woocommerce()->get_settings_url() );
+
 		} catch ( Connect_WC_API_Exception $exception ) {
 			$message = $this->prepare_connect_server_message_for_user_display( $exception->getMessage() );
 
 			facebook_for_woocommerce()->log( sprintf( 'Failed to connect to Facebook. Reason: %s', $message ), 'facebook_for_woocommerce_connect' );
 
 			set_transient( 'wc_facebook_connection_failed', time(), 30 );
+
+			wp_safe_redirect( facebook_for_woocommerce()->get_settings_url() );
+
 		}
 
 		wp_safe_redirect( facebook_for_woocommerce()->get_advertise_tab_url() );

From f487f64a55e5714123fb98b3c0f61f00becf17e1 Mon Sep 17 00:00:00 2001
From: Rodrigue Tusse <rodrigue.tusse@automattic.com>
Date: Mon, 7 Nov 2022 13:51:54 +0200
Subject: [PATCH 32/41] Add exit statements after redirect.

---
 includes/Handlers/Connection.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/includes/Handlers/Connection.php b/includes/Handlers/Connection.php
index 39b7eec2b..0e87d0b27 100644
--- a/includes/Handlers/Connection.php
+++ b/includes/Handlers/Connection.php
@@ -304,6 +304,7 @@ public function handle_connect() {
 			set_transient( 'wc_facebook_connection_failed', time(), 30 );
 
 			wp_safe_redirect( facebook_for_woocommerce()->get_settings_url() );
+			exit;
 
 		} catch ( Connect_WC_API_Exception $exception ) {
 			$message = $this->prepare_connect_server_message_for_user_display( $exception->getMessage() );
@@ -313,6 +314,7 @@ public function handle_connect() {
 			set_transient( 'wc_facebook_connection_failed', time(), 30 );
 
 			wp_safe_redirect( facebook_for_woocommerce()->get_settings_url() );
+			exit;
 
 		}
 

From cea02c79195f271a709c19208ac91758c5f1d00d Mon Sep 17 00:00:00 2001
From: Kader Ibrahim S <kader.ibrahim.s@a8c.com>
Date: Mon, 7 Nov 2022 18:52:28 +0530
Subject: [PATCH 33/41] Adds backward compatibility for Notes and TaskLists
 classes (#2357)

---
 class-wc-facebookcommerce.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/class-wc-facebookcommerce.php b/class-wc-facebookcommerce.php
index 05c579df3..4811289ff 100644
--- a/class-wc-facebookcommerce.php
+++ b/class-wc-facebookcommerce.php
@@ -262,12 +262,14 @@ protected function get_deprecated_hooks() {
 		 * @since x.x.x
 		 */
 		public function add_setup_task() {
-			TaskLists::add_task(
-				'extended',
-				new Setup(
-					TaskLists::get_list( 'extended' )
-				)
-			);
+			if ( class_exists( 'TaskLists' ) ) { // This is added for backward compatibility.
+				TaskLists::add_task(
+					'extended',
+					new Setup(
+						TaskLists::get_list( 'extended' )
+					)
+				);
+			}
 		}
 
 		/**
@@ -384,7 +386,7 @@ public function add_admin_notices() {
 						&& \Automattic\WooCommerce\Admin\Loader::is_feature_enabled( 'marketing' );
 				}
 
-				if ( $is_marketing_enabled ) {
+				if ( $is_marketing_enabled && class_exists( '\Automattic\WooCommerce\Admin\Notes\Note' ) ) { // Checking for Note class is for backward compatibility.
 					SettingsMoved::possibly_add_or_delete_note();
 				}
 			}

From c1cee2dd8462d92f4efcdb4561cf844e3209a9b9 Mon Sep 17 00:00:00 2001
From: Kader Ibrahim S <kader.ibrahim.s@a8c.com>
Date: Mon, 7 Nov 2022 18:52:49 +0530
Subject: [PATCH 34/41] Bumps minimum WC to 5.3 (#2357)

---
 facebook-for-woocommerce.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/facebook-for-woocommerce.php b/facebook-for-woocommerce.php
index f268f8e15..9ceb5f140 100644
--- a/facebook-for-woocommerce.php
+++ b/facebook-for-woocommerce.php
@@ -14,7 +14,7 @@
  * Version: 2.6.28
  * Text Domain: facebook-for-woocommerce
  * Tested up to: 6.0
- * WC requires at least: 3.5.0
+ * WC requires at least: 5.3
  * WC tested up to: 7.0
  * Requires PHP: 7.0
  *
@@ -53,7 +53,7 @@ class WC_Facebook_Loader {
 	const MINIMUM_WP_VERSION = '4.4';
 
 	// Minimum WooCommerce version required by this plugin.
-	const MINIMUM_WC_VERSION = '3.5.0';
+	const MINIMUM_WC_VERSION = '5.3';
 
 	// SkyVerge plugin framework version used by this plugin.
 	const FRAMEWORK_VERSION = '5.10.0';

From a2cab051715bedfb83c267258dbc942b8663f869 Mon Sep 17 00:00:00 2001
From: Kader Ibrahim S <kader.ibrahim.s@a8c.com>
Date: Mon, 7 Nov 2022 20:01:14 +0530
Subject: [PATCH 35/41] Use ::class for classname resolution (#2357)

---
 class-wc-facebookcommerce.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/class-wc-facebookcommerce.php b/class-wc-facebookcommerce.php
index bdf0841e7..383b6b4c2 100644
--- a/class-wc-facebookcommerce.php
+++ b/class-wc-facebookcommerce.php
@@ -19,6 +19,7 @@
 use SkyVerge\WooCommerce\Facebook\Utilities\Heartbeat;
 use Automattic\WooCommerce\Admin\Features\Features as WooAdminFeatures;
 use Automattic\WooCommerce\Admin\Features\OnboardingTasks\TaskLists;
+use Automattic\WooCommerce\Admin\Notes\Note;
 use SkyVerge\WooCommerce\Facebook\Admin\Tasks\Setup;
 use SkyVerge\WooCommerce\Facebook\Admin\Notes\SettingsMoved;
 
@@ -262,7 +263,7 @@ protected function get_deprecated_hooks() {
 		 * @since x.x.x
 		 */
 		public function add_setup_task() {
-			if ( class_exists( 'TaskLists' ) ) { // This is added for backward compatibility.
+			if ( class_exists( TaskLists::class ) ) { // This is added for backward compatibility.
 				TaskLists::add_task(
 					'extended',
 					new Setup(
@@ -386,7 +387,7 @@ public function add_admin_notices() {
 						&& \Automattic\WooCommerce\Admin\Loader::is_feature_enabled( 'marketing' );
 				}
 
-				if ( $is_marketing_enabled && class_exists( '\Automattic\WooCommerce\Admin\Notes\Note' ) ) { // Checking for Note class is for backward compatibility.
+				if ( $is_marketing_enabled && class_exists( Note::class ) ) { // Checking for Note class is for backward compatibility.
 					SettingsMoved::possibly_add_or_delete_note();
 				}
 			}

From 180b83060da89301b4b0567dcdba6aafa0c80492 Mon Sep 17 00:00:00 2001
From: Kader Ibrahim S <kader.ibrahim.s@a8c.com>
Date: Tue, 8 Nov 2022 09:21:35 +0530
Subject: [PATCH 36/41] Product version bump update

---
 class-wc-facebookcommerce.php | 6 +++---
 facebook-for-woocommerce.php  | 8 ++++----
 includes/Admin/Settings.php   | 4 ++--
 package-lock.json             | 2 +-
 package.json                  | 2 +-
 readme.txt                    | 4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/class-wc-facebookcommerce.php b/class-wc-facebookcommerce.php
index 383b6b4c2..9226f9ad2 100644
--- a/class-wc-facebookcommerce.php
+++ b/class-wc-facebookcommerce.php
@@ -260,7 +260,7 @@ protected function get_deprecated_hooks() {
 		/**
 		 * Adds the setup task to the Tasklists.
 		 *
-		 * @since x.x.x
+		 * @since 2.6.29
 		 */
 		public function add_setup_task() {
 			if ( class_exists( TaskLists::class ) ) { // This is added for backward compatibility.
@@ -396,7 +396,7 @@ public function add_admin_notices() {
 		/**
 		 * Get the last event from the plugin lifecycle.
 		 *
-		 * @since x.x.x
+		 * @since 2.6.29
 		 * @return array
 		 */
 		public function get_last_event_from_history() {
@@ -1020,7 +1020,7 @@ public function get_settings_url( $plugin_id = null ) {
 		/**
          * Gets the advertise tab page URL.
          *
-         * @since x.x.x
+         * @since 2.6.29
          *
          * @return string
          */
diff --git a/facebook-for-woocommerce.php b/facebook-for-woocommerce.php
index 9ceb5f140..3dcbf1b78 100644
--- a/facebook-for-woocommerce.php
+++ b/facebook-for-woocommerce.php
@@ -11,11 +11,11 @@
  * Description: Grow your business on Facebook! Use this official plugin to help sell more of your products using Facebook. After completing the setup, you'll be ready to create ads that promote your products and you can also create a shop section on your Page where customers can browse your products on Facebook.
  * Author: Facebook
  * Author URI: https://www.facebook.com/
- * Version: 2.6.28
+ * Version: 2.6.29
  * Text Domain: facebook-for-woocommerce
- * Tested up to: 6.0
+ * Tested up to: 6.1
  * WC requires at least: 5.3
- * WC tested up to: 7.0
+ * WC tested up to: 7.1
  * Requires PHP: 7.0
  *
  * @package FacebookCommerce
@@ -44,7 +44,7 @@ class WC_Facebook_Loader {
 	/**
 	 * @var string the plugin version. This must be in the main plugin file to be automatically bumped by Woorelease.
 	 */
-	const PLUGIN_VERSION = '2.6.28'; // WRCS: DEFINED_VERSION.
+	const PLUGIN_VERSION = '2.6.29'; // WRCS: DEFINED_VERSION.
 
 	// Minimum PHP version required by this plugin.
 	const MINIMUM_PHP_VERSION = '7.0.0';
diff --git a/includes/Admin/Settings.php b/includes/Admin/Settings.php
index 87b0b5177..87bb71bc6 100644
--- a/includes/Admin/Settings.php
+++ b/includes/Admin/Settings.php
@@ -116,7 +116,7 @@ public function add_menu_item() {
 	/**
 	 * Checks for connection and if established adds Facebook Product Sets taxonomy page to the Marketing menu.
 	 *
-	 * @since x.x.x
+	 * @since 2.6.29
 	 */
 	private function add_fb_product_sets_to_marketing_menu() {
 		$is_connected = facebook_for_woocommerce()->get_connection_handler()->is_connected();
@@ -140,7 +140,7 @@ private function add_fb_product_sets_to_marketing_menu() {
 	/**
 	 * Set the parent and submenu file while accessing Facebook Product Sets in the marketing menu.
 	 *
-	 * @since x.x.x
+	 * @since 2.6.29
 	 * @param string $parent_file The parent file.
 	 * @return string
 	 */
diff --git a/package-lock.json b/package-lock.json
index 69b4ab7d2..1da0cbc63 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "facebook-for-woocommerce",
-  "version": "2.6.28",
+  "version": "2.6.29",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 423b0eb74..697541c7d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "facebook-for-woocommerce",
-  "version": "2.6.28",
+  "version": "2.6.29",
   "author": "Facebook",
   "homepage": "https://woocommerce.com/products/facebook/",
   "license": "GPL-2.0",
diff --git a/readme.txt b/readme.txt
index 932183662..0eaa31508 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,8 +2,8 @@
 Contributors: facebook, automattic, woothemes
 Tags: facebook, shop, catalog, advertise, pixel, product
 Requires at least: 4.4
-Tested up to: 6.0
-Stable tag: 2.6.28
+Tested up to: 6.1
+Stable tag: 2.6.29
 Requires PHP: 5.6 or greater
 MySQL: 5.6 or greater
 License: GPLv2 or later

From 692d89137099fb53086453f94f7ded67c69a1806 Mon Sep 17 00:00:00 2001
From: Kader Ibrahim S <kader.ibrahim.s@a8c.com>
Date: Tue, 8 Nov 2022 09:21:49 +0530
Subject: [PATCH 37/41] Changelog update

---
 changelog.txt | 15 +++++++++++++++
 readme.txt    | 15 +++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/changelog.txt b/changelog.txt
index b079e8658..47d4235e2 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,20 @@
 *** Facebook for WooCommerce Changelog ***
 
+= 2.6.29 - 2022-11-08 =
+* Add - Facebook Product Set under the Marketing menu.
+* Add - HPOS Compatibility.
+* Add - Inbox note about Facebook menu moved under the Marketing menu.
+* Add - Set up Facebook task to the WooCommerce admin tasks.
+* Dev - Replaced methods from classes in the `Internal` namespace.
+* Fix - Ensure the enhanced product enhance catalog attributes value is unslashed before saving in the post_meta table.
+* Fix - Hosted Woo Updates.
+* Fix - Release/2.6.28.
+* Fix - duplicate InitiateCheckout when using checkout block.
+* Tweak - WC 7.1 compatibility.
+* Tweak - WP 6.1 compatibility.
+* Update - FB Product Set name changed to Facebook Product Set.
+* Update - On successful FBE install users will be redirected to Advertise tab of the plugin.
+
 = 2.6.28 - 2022-10-25 =
 * Fix - Ensure bundles are not treated as virtual products on product_sync.
 * Fix - Ensure google-product-category-fields-loads.js loads only on the product category screens.
diff --git a/readme.txt b/readme.txt
index 0eaa31508..568177387 100644
--- a/readme.txt
+++ b/readme.txt
@@ -39,6 +39,21 @@ When opening a bug on GitHub, please give us as many details as possible.
 
 == Changelog ==
 
+= 2.6.29 - 2022-11-08 =
+* Add - Facebook Product Set under the Marketing menu.
+* Add - HPOS Compatibility.
+* Add - Inbox note about Facebook menu moved under the Marketing menu.
+* Add - Set up Facebook task to the WooCommerce admin tasks.
+* Dev - Replaced methods from classes in the `Internal` namespace.
+* Fix - Ensure the enhanced product enhance catalog attributes value is unslashed before saving in the post_meta table.
+* Fix - Hosted Woo Updates.
+* Fix - Release/2.6.28.
+* Fix - duplicate InitiateCheckout when using checkout block.
+* Tweak - WC 7.1 compatibility.
+* Tweak - WP 6.1 compatibility.
+* Update - FB Product Set name changed to Facebook Product Set.
+* Update - On successful FBE install users will be redirected to Advertise tab of the plugin.
+
 = 2.6.28 - 2022-10-25 =
 * Fix - Ensure bundles are not treated as virtual products on product_sync.
 * Fix - Ensure google-product-category-fields-loads.js loads only on the product category screens.

From 47b54c356b6de8defe6ecd0d2a4da45c983b6cce Mon Sep 17 00:00:00 2001
From: Kader Ibrahim S <kader.ibrahim.s@a8c.com>
Date: Tue, 8 Nov 2022 22:51:59 +0530
Subject: [PATCH 38/41] Adds backward compatibility for WC 6.1, 6.2, 6.3.
 (#2362)

---
 includes/Admin/Tasks/Setup.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/includes/Admin/Tasks/Setup.php b/includes/Admin/Tasks/Setup.php
index f7d91b871..342311ce2 100644
--- a/includes/Admin/Tasks/Setup.php
+++ b/includes/Admin/Tasks/Setup.php
@@ -71,4 +71,20 @@ public function get_action_url() {
 	public function is_complete() {
 		return facebook_for_woocommerce()->get_connection_handler()->is_connected();
 	}
+
+	/**
+	 * Parent ID. This method is abstract in WooCommerce 6.1.x, 6.2.x and 6.3.x. This implementation is for backward compatibility for these versions.
+	 *
+	 * @return string
+	 */
+	public function get_parent_id() {
+		if ( is_callable( 'parent::get_parent_id' ) ) {
+			return parent::get_parent_id();
+		}
+
+		if ( ! $this->task_list ) {
+			return '';
+		}
+		return $this->task_list->get_list_id();
+	}
 }

From f73c4653689d3e0f341f76beff55c2f0d9891d17 Mon Sep 17 00:00:00 2001
From: Kader Ibrahim S <kader.ibrahim.s@a8c.com>
Date: Wed, 9 Nov 2022 08:59:05 +0530
Subject: [PATCH 39/41] Return parent task id string instead of undefined
 property. (#2362)

---
 includes/Admin/Tasks/Setup.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/includes/Admin/Tasks/Setup.php b/includes/Admin/Tasks/Setup.php
index 342311ce2..a0fdb1949 100644
--- a/includes/Admin/Tasks/Setup.php
+++ b/includes/Admin/Tasks/Setup.php
@@ -82,9 +82,6 @@ public function get_parent_id() {
 			return parent::get_parent_id();
 		}
 
-		if ( ! $this->task_list ) {
-			return '';
-		}
-		return $this->task_list->get_list_id();
+		return 'extended'; // The parent task list id.
 	}
 }

From 5a761eb2dfc607a8d6e841113ad2b592d8dfca69 Mon Sep 17 00:00:00 2001
From: Kader Ibrahim S <kader.ibrahim.s@a8c.com>
Date: Wed, 9 Nov 2022 09:50:00 +0530
Subject: [PATCH 40/41] Product version bump update

---
 facebook-for-woocommerce.php  | 4 ++--
 includes/ProductSets/Sync.php | 4 ++--
 package-lock.json             | 2 +-
 package.json                  | 2 +-
 readme.txt                    | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/facebook-for-woocommerce.php b/facebook-for-woocommerce.php
index 3dcbf1b78..a77a648e0 100644
--- a/facebook-for-woocommerce.php
+++ b/facebook-for-woocommerce.php
@@ -11,7 +11,7 @@
  * Description: Grow your business on Facebook! Use this official plugin to help sell more of your products using Facebook. After completing the setup, you'll be ready to create ads that promote your products and you can also create a shop section on your Page where customers can browse your products on Facebook.
  * Author: Facebook
  * Author URI: https://www.facebook.com/
- * Version: 2.6.29
+ * Version: 2.6.30
  * Text Domain: facebook-for-woocommerce
  * Tested up to: 6.1
  * WC requires at least: 5.3
@@ -44,7 +44,7 @@ class WC_Facebook_Loader {
 	/**
 	 * @var string the plugin version. This must be in the main plugin file to be automatically bumped by Woorelease.
 	 */
-	const PLUGIN_VERSION = '2.6.29'; // WRCS: DEFINED_VERSION.
+	const PLUGIN_VERSION = '2.6.30'; // WRCS: DEFINED_VERSION.
 
 	// Minimum PHP version required by this plugin.
 	const MINIMUM_PHP_VERSION = '7.0.0';
diff --git a/includes/ProductSets/Sync.php b/includes/ProductSets/Sync.php
index ae16c72df..8ff7cd891 100644
--- a/includes/ProductSets/Sync.php
+++ b/includes/ProductSets/Sync.php
@@ -74,7 +74,7 @@ class Sync {
 	/**
 	 * Product's Product Set Previous Name
 	 *
-	 * @since x.x.x
+	 * @since 2.6.30
 	 *
 	 * @var string
 	 */
@@ -92,7 +92,7 @@ class Sync {
 	/**
 	 * Product's Product Set New Name
 	 *
-	 * @since x.x.x
+	 * @since 2.6.30
 	 *
 	 * @var string
 	 */
diff --git a/package-lock.json b/package-lock.json
index 1da0cbc63..059d71b19 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "facebook-for-woocommerce",
-  "version": "2.6.29",
+  "version": "2.6.30",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 697541c7d..4794203f2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "facebook-for-woocommerce",
-  "version": "2.6.29",
+  "version": "2.6.30",
   "author": "Facebook",
   "homepage": "https://woocommerce.com/products/facebook/",
   "license": "GPL-2.0",
diff --git a/readme.txt b/readme.txt
index 568177387..ddf41c397 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,7 +3,7 @@ Contributors: facebook, automattic, woothemes
 Tags: facebook, shop, catalog, advertise, pixel, product
 Requires at least: 4.4
 Tested up to: 6.1
-Stable tag: 2.6.29
+Stable tag: 2.6.30
 Requires PHP: 5.6 or greater
 MySQL: 5.6 or greater
 License: GPLv2 or later

From 26ee0f8590597b20893f64d839a65f11ebc64b45 Mon Sep 17 00:00:00 2001
From: Kader Ibrahim S <kader.ibrahim.s@a8c.com>
Date: Wed, 9 Nov 2022 09:50:11 +0530
Subject: [PATCH 41/41] Changelog update

---
 changelog.txt | 4 ++++
 readme.txt    | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/changelog.txt b/changelog.txt
index 47d4235e2..474b68c7d 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,9 @@
 *** Facebook for WooCommerce Changelog ***
 
+= 2.6.30 - 2022-11-09 =
+* Fix - Add backward compatibility for WC 6.1, 6.2, and 6.3 versions.
+* Fix - Sync product set when the term name changes.
+
 = 2.6.29 - 2022-11-08 =
 * Add - Facebook Product Set under the Marketing menu.
 * Add - HPOS Compatibility.
diff --git a/readme.txt b/readme.txt
index ddf41c397..082c39cb3 100644
--- a/readme.txt
+++ b/readme.txt
@@ -39,6 +39,10 @@ When opening a bug on GitHub, please give us as many details as possible.
 
 == Changelog ==
 
+= 2.6.30 - 2022-11-09 =
+* Fix - Add backward compatibility for WC 6.1, 6.2, and 6.3 versions.
+* Fix - Sync product set when the term name changes.
+
 = 2.6.29 - 2022-11-08 =
 * Add - Facebook Product Set under the Marketing menu.
 * Add - HPOS Compatibility.