Merge branch 'develop' into feat/cimo-notice

Author: kaeizen

e2e/tests/admin.spec.ts

@@ -18,13 +18,15 @@ test( 'Activating Stackable should redirect to the Getting Started Page', async
 	await activate.click()
 
 	try {
-		await expect( page ).toHaveURL( /stackable-getting-started/ )
+		await expect( page ).toHaveURL( /stackable/ )
+		await expect( page.getByText( 'Welcome to Stackable' ) ).toBeVisible()
 	} catch {
 		await expect( page ).toHaveURL( /page=stackable/ )
 		await expect( page.getByRole( 'link', { name: 'Activate Free Version' } ) ).toBeVisible()
 		await page.getByRole( 'link', { name: 'Activate Free Version' } ).click()
 		await page.getByRole( 'link', { name: 'Skip', exact: true } ).click()
-		await expect( page ).toHaveURL( /stackable-getting-started/ )
+		await expect( page ).toHaveURL( /stackable/ )
+		await expect( page.getByText( 'Welcome to Stackable' ) ).toBeVisible()
 	}
 } )
 
@@ -36,7 +38,7 @@ test( 'Stackable settings should be saved', async ( {
 	// Start waiting for Stackable Settings JSON Response before visiting the page
 	let settings = stackable.waitForSettings()
 
-	await admin.visitAdminPage( 'options-general.php?page=stackable' )
+	await admin.visitAdminPage( 'admin.php?page=stackable-settings' )
 	// Make sure all Stackable settings are loaded
 	await settings
 

freemius.php

@@ -25,7 +25,7 @@ function sugb_fs() {
 			// Do not redirect to the getting started when in network activating
 			// in multisite or in the mainsite because it will redirect to a 404
 			// page.
-			$first_path = 'options-general.php?page=stackable-getting-started';
+			$first_path = 'admin.php?page=stackable';
 			if ( is_multisite() && is_main_site() ) {
 				$first_path = 'plugins.php';
 			}
@@ -34,7 +34,7 @@ function sugb_fs() {
 			// https://github.com/Freemius/wordpress-sdk/issues/674 If the menu
 			// slug is options-general, for a network activated plugin, all
 			// admin URLs will be broken. This is a temporary fix.
-			$menu_slug = 'options-general.php';
+			$menu_slug = 'stackable';
 			if ( is_multisite() && is_main_site() && is_plugin_active_for_network( plugin_basename( STACKABLE_FILE ) ) ) {
 				if ( ! empty( $_SERVER ) && isset( $_SERVER['REQUEST_URI'] ) && stripos( $_SERVER['REQUEST_URI'], '/admin.php' ) !== false ) {
 					$menu_slug = 'admin.php';
@@ -54,8 +54,8 @@ function sugb_fs() {
 				'menu'                => array(
 					'slug'       => 'stackable',
 					'first-path'  => $first_path,
-					'account'    => true,
-					'pricing'    => true,
+					'account'    => false,
+					'pricing'    => false,
 					'contact'    => true,
                     'support'    => false,
                     'affiliation' => false,