Merge pull request #97 from omnisend/hide-notices

hide all notices except omnisend
omnisend · Apr 15, 2024 · 8397b41 · 8397b41
2 parents a91651e + 1677b73
commit 8397b41
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 18 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/omnisend/build/connection.asset.php b/omnisend/build/connection.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'wp-components', 'wp-element'), 'version' => '2aa75a7bb9ce04a8bf1d');
+<?php return array('dependencies' => array('react', 'wp-components', 'wp-element'), 'version' => '34e540b8ddfcf251c71f');
diff --git a/omnisend/build/connection.js b/omnisend/build/connection.js
diff --git a/omnisend/build/connection.js.map b/omnisend/build/connection.js.map
diff --git a/omnisend/build/notices.asset.php b/omnisend/build/notices.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'wp-element'), 'version' => 'a6babe65506454df0983');
+<?php return array('dependencies' => array('react', 'wp-element'), 'version' => '3821d14dadbfd56a6a55');
diff --git a/omnisend/build/notices.js b/omnisend/build/notices.js
diff --git a/omnisend/build/notices.js.map b/omnisend/build/notices.js.map
diff --git a/omnisend/class-omnisend-core-bootstrap.php b/omnisend/class-omnisend-core-bootstrap.php
@@ -213,7 +213,7 @@ public static function hide_notices(): void {
 		if ( isset( $_SERVER['REQUEST_URI'] ) ) {
 			$request_uri = esc_url_raw( wp_unslash( $_SERVER['REQUEST_URI'] ) );
 			if ( strpos( $request_uri, '/wp-admin/admin.php?page=omnisend' ) !== false ) {
-				echo '<style>.notice:not(.omnisend-notice) { display: none !important; }</style>';
+				echo '<style>[class*="notice"]:not([class*="components"], .omnisend-notice, .notice), .notice:not(.omnisend-notice) { display: none !important; }</style>';
 			}
 		}
 	}
@@ -300,6 +300,7 @@ function ( $suffix ) {
 							array(
 								'nonce'        => wp_create_nonce( 'wp_rest' ),
 								'action_nonce' => wp_create_nonce( 'connect' ),
+								'site_url'     => site_url(),
 							)
 						);
 					}

diff --git a/omnisend/src/connection/components/connection-page-layout.js b/omnisend/src/connection/components/connection-page-layout.js
@@ -16,7 +16,7 @@ const ConnectionPageLayout = () =>
 		formData.append( 'api_key', apiKey );
 		formData.append( 'action_nonce', omnisend_connection.action_nonce );
 
-		fetch( '/wp-json/omnisend/v1/connect', {
+		fetch( omnisend_connection.site_url + '/wp-json/omnisend/v1/connect', {
 			method: 'POST',
 			body: formData,
 			headers: {
@@ -59,7 +59,7 @@ const ConnectionPageLayout = () =>
 			<div className="omnisend-page-layout">
 				{error && (
 					<div className="omnisend-spacing-mb-8">
-						<Notice status="error">{error}</Notice>
+						<Notice className='omnisend-notice' status="error">{error}</Notice>
 					</div>
 				)}
 				<ConnectionLogos />

diff --git a/omnisend/src/notices/components/discount-notice.js b/omnisend/src/notices/components/discount-notice.js
@@ -1,7 +1,7 @@
 const DiscountNotice = () =>
 {
     return (
-        <div class="omnisend-custom-notice">
+        <div class="omnisend-custom-notice omnisend-notice">
             <img src="/wp-content/plugins/omnisend/assets/img/omnisend-notice-discount-icon.svg" />
 
             <div>Get 30% off Omnisend for 6 months with code <span class="omnisend-custom-notice-strong-text">ONLYHOSTINGER30</span></div>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<?php return array('dependencies' => array('react', 'wp-components', 'wp-element'), 'version' => '2aa75a7bb9ce04a8bf1d');
		<?php return array('dependencies' => array('react', 'wp-components', 'wp-element'), 'version' => '34e540b8ddfcf251c71f');