Merge branch 'develop' into feat/getting-started-onboarding

# Conflicts:
#	package-lock.json

Author: kaeizen

languages/stackable-ultimate-gutenberg-blocks.pot

@@ -1,6 +1,6 @@
 {
 	"name": "stackable",
-	"version": "3.18.0",
+	"version": "3.18.1",
 	"private": true,
 	"description": "Blocks for everyone",
 	"author": "Benjamin Intal of Gambit",

package-lock.json

@@ -6,7 +6,7 @@
  * Author: Gambit Technologies, Inc
  * Author URI: http://gambit.ph
  * Text Domain: stackable-ultimate-gutenberg-blocks
- * Version: 3.18.0
+ * Version: 3.18.1
  *
  * @package Stackable
  * @fs_premium_only /freemius.php, /freemius/
@@ -46,7 +46,7 @@ function stackable_multiple_plugins_check() {
 
 defined( 'STACKABLE_SHOW_PRO_NOTICES' ) || define( 'STACKABLE_SHOW_PRO_NOTICES', true );
 defined( 'STACKABLE_BUILD' ) || define( 'STACKABLE_BUILD', 'free' );
-defined( 'STACKABLE_VERSION' ) || define( 'STACKABLE_VERSION', '3.18.0' );
+defined( 'STACKABLE_VERSION' ) || define( 'STACKABLE_VERSION', '3.18.1' );
 defined( 'STACKABLE_FILE' ) || define( 'STACKABLE_FILE', __FILE__ );
 defined( 'STACKABLE_I18N' ) || define( 'STACKABLE_I18N', 'stackable-ultimate-gutenberg-blocks' ); // Plugin slug.
 defined( 'STACKABLE_DESIGN_LIBRARY_URL' ) || define( 'STACKABLE_DESIGN_LIBRARY_URL', 'https://stackable-files.pages.dev' ); // Design Library CDN URL

package.json

@@ -4,7 +4,7 @@ Tags: blocks, gutenberg, gutenberg blocks, page builder, WordPress blocks
 Requires at least: 6.5.5
 Tested up to: 6.8.2
 Requires PHP: 7.3
-Stable tag: 3.18.0
+Stable tag: 3.18.1
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -305,6 +305,13 @@ Nope. Stackable only works with Gutenberg, the new WordPress editor.
 
 == Changelog ==
 
+= 3.18.1 =
+* Fixed: Block styles - error encountered when creating divider and icon button block styles #3583
+* Fixed: Role Manager settings doesn't display when changing the site language #3565
+* Fixed: Auto-deactivate free/premium when another is acitvated and show an admin notice #3574
+* Fixed: Block styles - show the correct block title when deleting a style #387
+* Fixed: PHP error on stackable_add_welcome_notification when doing some REST API calls #3579
+
 = 3.18.0 =
 
 [Introducing: Global Block Styles](https://wpstackable.com/blog/introducing-block-styles/?utm_source=wp-repo&utm_campaign=readme&utm_medium=link)

plugin.php

@@ -137,5 +137,5 @@ export default compose(
 	withBlockWrapperIsHovered,
 	withQueryLoopContext,
 	withBlockAttributeContext,
-	withBlockStyleContext( blockStyles ),
+	withBlockStyleContext( dividerStyles ),
 )( Edit )

readme.txt

@@ -121,5 +121,5 @@ export default compose(
 	withBlockWrapper,
 	withQueryLoopContext,
 	withBlockAttributeContext,
-	withBlockStyleContext( blockStyles ),
+	withBlockStyleContext( iconButtonStyles ),
 )( Edit )

src/block/divider/edit.js

@@ -556,7 +556,7 @@ body.toplevel_page_stk-custom-fields {
 			flex: 1 0 auto;
 			display: flex;
 			flex-direction: column;
-			justify-content: end;
+			justify-content: flex-end;
 		}
 		.s-save-changes-inner-wrapper {
 			bottom: 20px;
@@ -599,7 +599,7 @@ body.toplevel_page_stk-custom-fields {
 	}
 	.s-search-setting {
 		display: flex;
-		justify-content: end;
+		justify-content: flex-end;
 		position: absolute;
 		right: 30px;
 		.s-search-setting__input {