Resolve trunk branch conflicts

bootstrap.php

@@ -5,7 +5,7 @@
 
 use function NewfoldLabs\WP\ModuleLoader\register;
 
-define( 'NFD_ECOMMERCE_MODULE_VERSION', '1.3.33' );
+define( 'NFD_ECOMMERCE_MODULE_VERSION', '1.3.34' );
 
 if ( function_exists( 'is_admin' ) && is_admin() ) {
 	$old_woocommerce_module_version = get_option( 'nfd_ecommerce_module_version' );

includes/ECommerce.php

@@ -67,7 +67,7 @@ class ECommerce {
 		'woocommerce_cheque_settings',
 		'onboarding_experience_level',
 		'yoast_seo_signup_status',
-		'showMigrationSteps',
+		'nfd_show_migration_steps',
 		'update_site_server_clicked',
 	);
 
@@ -322,7 +322,7 @@ public function register_settings() {
 		);
 		\register_setting(
 			'general',
-			'showMigrationSteps',
+			'nfd_show_migration_steps',
 			array(
 				'show_in_rest' => true,
 				'type'         => 'boolean',
@@ -707,7 +707,7 @@ function check_url_match( $brand_name, $site_url ) {
 			}
 		}
 		if ( check_url_match( $brand, $site_url ) ) {
-			update_option( 'showMigrationSteps', false );
+			update_option( 'nfd_show_migration_steps', false );
 		}
 	}
 

package.json

@@ -2,7 +2,7 @@
   "name": "@newfold-labs/wp-module-ecommerce",
   "description": "Brand Agnostic eCommerce Experience",
   "license": "GPL-2.0-or-later",
-  "version": "1.3.33",
+  "version": "1.3.34",
   "main": "build/index.js",
   "files": [
     "build/",

src/components/OnboardingScreen.js

@@ -65,7 +65,7 @@ export function OnboardingScreen({
 
   useEffect(() => {
     WordPressSdk.settings.get().then((res) => {
-      setIsMigrationCompleted( res.showMigrationSteps || false );
+      setIsMigrationCompleted( res.nfd_show_migration_steps || false );
       setWebServersUpdated( res.update_site_server_clicked );
       if (res?.page_on_front && res?.show_on_front === "page") {
         setEditUrl(

src/components/SiteStatus.js

@@ -44,8 +44,14 @@ export function SiteStatus({ comingSoon, toggleComingSoon, notify }) {
       $statusText.style.setProperty("color", "var(--nfd-ecommerce-text-dark-success)");
     }
   });
+
+  if (!comingSoon) {
+    return null;
+  }
+
   return (
     <div
+      data-testid="siteStatus"
       className={classNames(
         "nfd-px-4 nfd-py-2 nfd-rounded-lg nfd-bg-canvas",
         "max-[1027px]:nfd-flex max-[1027px]:nfd-flex-col",

src/configs/OnboardingList.config.js

@@ -57,7 +57,7 @@ const updateMigrateViewGuide = () => {
 };
 
 const updateStoreSetup = (setIsMigrationCompleted) => {
-  WordPressSdk.settings.put({ showMigrationSteps: false }).then(() => {
+  WordPressSdk.settings.put({ nfd_show_migration_steps: false }).then(() => {
     WordPressSdk.settings.get();
     setIsMigrationCompleted(false);
   });
@@ -88,7 +88,7 @@ export function OnboardingListDefinition(props) {
         ),
         state: {
           isCompleted: (queries) => queries?.settings?.update_site_server_clicked || check_url_match(brandName),
-          isMigrated: (queries) => queries?.settings?.showMigrationSteps && props.isMigrationCompleted
+          isMigrated: (queries) => queries?.settings?.nfd_show_migration_steps && props.isMigrationCompleted
         },
         shouldRender: (state) => (state.isMigrated),
         actions: {
@@ -112,7 +112,7 @@ export function OnboardingListDefinition(props) {
         ),
         state: {
           isCompleted: () => check_url_match( brandName ),
-          isMigrated: (queries) => queries?.settings?.showMigrationSteps && props.isMigrationCompleted,
+          isMigrated: (queries) => queries?.settings?.nfd_show_migration_steps && props.isMigrationCompleted,
         },
 
         "data-nfdhelpcenterquery": __(
@@ -136,7 +136,7 @@ export function OnboardingListDefinition(props) {
         ),
         state: {
           isCompleted: (queries) => (queries?.settings?.update_site_server_clicked && check_url_match(brandName)) || check_url_match(brandName),
-          isMigrated: (queries) => queries?.settings?.showMigrationSteps,
+          isMigrated: (queries) => queries?.settings?.nfd_show_migration_steps,
           className: () => "nfd-bg-canvas",
           hideCheck: () => true,
           showText: () => <a className="nfd-underline" href={ VIEW_GUIDE_LINK[brandName] } target="_blank">View Guide</a>
@@ -158,7 +158,7 @@ export function OnboardingListDefinition(props) {
         ),
         state: {
           isCompleted: (queries) => !props.isMigrationCompleted,
-          isMigrated: (queries) => queries?.settings?.showMigrationSteps && (queries?.settings?.update_site_server_clicked || check_url_match(brandName)),
+          isMigrated: (queries) => queries?.settings?.nfd_show_migration_steps && (queries?.settings?.update_site_server_clicked || check_url_match(brandName)),
         },
         shouldRender: (state) => state.isMigrated && !state.isCompleted,
         actions: {

tests/cypress/integration/Home/ecommerce-coming-soon.cy.js

@@ -83,6 +83,7 @@ describe(
 			cy.url().should( 'eq', Cypress.config().baseUrl + '/' );
 			cy.go( 'back' );
 			cy.get( '.nfd-flex-none > .nfd-button--upsell' ).click();
+			cy.get('[data-testid="siteStatus"]').should('not.exist');
 			cy.get( '.nfd-notification--success' ).should( 'exist' );
 		} );
 	}

tests/cypress/integration/Home/migration.cy.js

@@ -19,7 +19,7 @@ describe(
 				this.skip();
 			}
 			cy.exec(
-				`npx wp-env run cli wp option set showMigrationSteps "true"`
+				`npx wp-env run cli wp option set nfd_show_migration_steps "true"`
 			);
 			cy.exec(
 				`npx wp-env run cli wp option delete _transient_nfd_site_capabilities`,