Addressed improvements feedback.

Author: iamdharmesh

includes/class-mailchimp-admin.php

@@ -206,7 +206,7 @@ public function admin_notices() {
 
 		// Display a notice if the access token is invalid/revoked.
 		?>
-		<div class="notice notice-warning is-dismissible">
+		<div class="notice notice-error is-dismissible">
 			<p>
 				<?php
 				$message = sprintf(

lib/mailchimp/mailchimp.php

@@ -122,6 +122,7 @@ public function get( $endpoint, $count = 10, $fields = array() ) {
 		}
 
 		if ( is_array( $request ) && 200 === $request['response']['code'] ) {
+			delete_option( 'mailchimp_sf_auth_error' );
 			return json_decode( $request['body'], true );
 		} elseif ( is_array( $request ) && $request['response']['code'] ) {
 			// Check if Access Token is invalid/revoked.
@@ -168,6 +169,7 @@ public function post( $endpoint, $body, $method = 'POST' ) {
 		$request = wp_remote_post( $url, $args );
 
 		if ( is_array( $request ) && 200 === $request['response']['code'] ) {
+			delete_option( 'mailchimp_sf_auth_error' );
 			return json_decode( $request['body'], true );
 		} else {
 			if ( is_wp_error( $request ) ) {

mailchimp.php

@@ -1395,3 +1395,13 @@ function mailchimp_sf_get_access_token() {
 
 	return $access_token;
 }
+
+/**
+ * Should display Mailchimp Signup form.
+ *
+ * @since x.x.x
+ * @return bool
+ */
+function mailchimp_sf_should_display_form() {
+	return mailchimp_sf_get_api() && ! get_option( 'mailchimp_sf_auth_error' );
+}

mailchimp_widget.php

@@ -12,6 +12,10 @@
  * @return void
  */
 function mailchimp_sf_signup_form( $args = array() ) {
+	// Check if we should display the form.
+	if ( ! mailchimp_sf_should_display_form() ) {
+		return;
+	}
 
 	$before_title  = isset( $args['before_title'] ) ? $args['before_title'] : '';
 	$after_title   = isset( $args['after_title'] ) ? $args['after_title'] : '';

views/setup_page.php

@@ -7,7 +7,7 @@
 
 ?>
 <div class="wrap">
-
+	<hr class="wp-header-end">
 	<div class="mailchimp-header">
 		<svg xmlns="http://www.w3.org/2000/svg" aria-label="<?php esc_attr_e( 'Mailchimp Freddie', 'mailchimp' ); ?>" width="40" height="40" fill="none" viewBox="0 0 40 40">
 			<title><?php esc_html_e( 'Mailchimp Freddie', 'mailchimp' ); ?></title>