Merge pull request #1149 from bluehost/release/3.12.2

Release 3.12.2

.wp-env.json

@@ -1,5 +1,5 @@
 {
-  "core": "WordPress/WordPress#tags/6.5.4",
+  "core": "WordPress/WordPress#tags/6.5.5",
   "config": {
     "WP_DEBUG": true,
     "WP_DEBUG_LOG": true,

bluehost-wordpress-plugin.php

@@ -12,10 +12,10 @@
  * Plugin URI:        https://bluehost.com
  * Update URI:        https://github.com/bluehost/bluehost-wordpress-plugin
  * Description:       WordPress plugin that integrates a WordPress site with the Bluehost control panel, including performance, security, and update features.
- * Version:           3.12.1
+ * Version:           3.12.2
  * Requires at least: 6.0
  * Requires PHP:      7.1
- * Tested up to:      6.5.4
+ * Tested up to:      6.5.5
  * Author:            Bluehost
  * Author URI:        https://bluehost.com
  * Text Domain:       wp-plugin-bluehost
@@ -32,7 +32,7 @@
 }
 
 // Define constants
-define( 'BLUEHOST_PLUGIN_VERSION', '3.12.1' );
+define( 'BLUEHOST_PLUGIN_VERSION', '3.12.2' );
 define( 'BLUEHOST_PLUGIN_FILE', __FILE__ );
 define( 'BLUEHOST_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
 define( 'BLUEHOST_PLUGIN_URL', plugin_dir_url( __FILE__ ) );

composer.json

@@ -79,10 +79,10 @@
     "newfold-labs/wp-module-context": "^1.0.1",
     "newfold-labs/wp-module-data": "^2.5.3",
     "newfold-labs/wp-module-deactivation": "^1.2.1",
-    "newfold-labs/wp-module-ecommerce": "^1.3.33",
+    "newfold-labs/wp-module-ecommerce": "1.3.31",
     "newfold-labs/wp-module-facebook": "^1.0.9",
     "newfold-labs/wp-module-features": "^1.4.2",
-    "newfold-labs/wp-module-global-ctb": "^1.0.12",
+    "newfold-labs/wp-module-global-ctb": "^1.0.13",
     "newfold-labs/wp-module-help-center": "^2.0.0",
     "newfold-labs/wp-module-loader": "^1.0.10",
     "newfold-labs/wp-module-marketplace": "^2.3.0",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "bluehost-wordpress-plugin",
-    "version": "3.12.1",
+    "version": "3.12.2",
     "description": "WordPress plugin that integrates your WordPress site with the Bluehost control panel, including performance, security, and update features.",
     "author": {
         "name": "Bluehost",
@@ -33,7 +33,7 @@
     },
     "dependencies": {
         "@heroicons/react": "^2.1.1",
-        "@newfold-labs/wp-module-ecommerce": "^1.3.33",
+        "@newfold-labs/wp-module-ecommerce": "1.3.31",
         "@newfold-labs/wp-module-facebook": "1.0.7",
         "@newfold-labs/wp-module-runtime": "^1.0.10",
         "@newfold/ui-component-library": "^1.1.0",

src/app/components/webinars-banner/index.js

@@ -114,7 +114,7 @@ const WebinarsBanner = () => {
 
 					<div className="nfd-flex nfd-flex-col nfd-gap-4 nfd-w-full">
 						<Title as="h2" className="nfd-text-base">
-							FREE Monthly Webinar: { upcomingWebinar.title }
+							{ upcomingWebinar.title }
 						</Title>
 
 						{ ( upcomingWebinar.hasDescription ||

src/app/pages/ecommerce/page.js

@@ -7,6 +7,7 @@ import '@newfold-labs/wp-module-ecommerce/bluehost.css';
 import AppStore from 'App/data/store';
 import { bluehostSettingsApiFetch } from 'App/util/helpers';
 import { useNotification } from 'App/components/notifications';
+import { comingSoonAdminbarToggle } from '../../util/helpers';
 
 const ECommerce = () => {
 	const { store, setStore } = useContext( AppStore );
@@ -33,6 +34,7 @@ const ECommerce = () => {
 						...store,
 						comingSoon: ! store.comingSoon,
 					} );
+					comingSoonAdminbarToggle( ! store.comingSoon );
 				}
 			),
 	};

src/app/pages/home/welcomeSection.js

@@ -1,8 +1,10 @@
 import { useContext } from '@wordpress/element';
+import { useUpdateEffect } from 'react-use';
 import { OnboardingScreen } from '@newfold-labs/wp-module-ecommerce';
 import AppStore from 'App/data/store';
 import { bluehostSettingsApiFetch } from 'App/util/helpers';
 import { useNotification } from 'App/components/notifications';
+import { comingSoonAdminbarToggle } from '../../util/helpers';
 
 const WelcomeSection = ( {} ) => {
 	const { store, setStore } = useContext( AppStore );
@@ -16,6 +18,10 @@ const WelcomeSection = ( {} ) => {
 			() => setStore( { ...store, comingSoon: ! store.comingSoon } )
 		);
 
+	useUpdateEffect( () => {
+		comingSoonAdminbarToggle( store.comingSoon );
+	}, [ store.comingSoon ] );
+
 	return (
 		<OnboardingScreen
 			comingSoon={ store.comingSoon }

tests/cypress/integration/home.cy.js

@@ -17,7 +17,7 @@ describe( 'Home Page', function () {
 
 	it( 'Site Info Exists', () => {
 		cy.get( '.wppbh-app-site-info' )
-			.contains( 'h3', NewfoldRuntime.site.title )
+			.contains( 'h3', NewfoldRuntime.siteTitle )
 			.scrollIntoView()
 			.should( 'be.visible' );
 	} );
@@ -62,21 +62,15 @@ describe( 'Home Page', function () {
 		);
 		cy.reload();
 		cy.get( '.wppbh-webinars-banner-section' )
-			.contains(
-				'h2',
-				'FREE Monthly Webinar: Build your brand with WordPress'
-			)
+			.contains( 'h2', 'Build your brand with WordPress' )
 			.scrollIntoView()
 			.should( 'be.visible' );
 	} );
 
 	it( 'Webinars Section Renders Correctly', () => {
 		// Title
 		cy.get( '.wppbh-webinars-banner-section' )
-			.contains(
-				'h2',
-				'FREE Monthly Webinar: Build your brand with WordPress'
-			)
+			.contains( 'h2', 'Build your brand with WordPress' )
 			.scrollIntoView()
 			.should( 'be.visible' );