Remove unwanted code.

Author: iamdharmesh

includes/blocks/class-mailchimp-list-subscribe-form-blocks.php

@@ -45,16 +45,6 @@ public function register_blocks() {
 			}
 		}
 
-		// Get the default visibility of interest groups.
-		$interest_groups_visibility = array();
-		$interest_groups            = get_option( 'mc_interest_groups', array() );
-		if ( ! empty( $interest_groups ) ) {
-			foreach ( $interest_groups as $group ) {
-				$visible                                    = 'on' === get_option( 'mc_show_interest_groups_' . $group['id'], 'on' ) && 'hidden' !== $group['type'];
-				$interest_groups_visibility[ $group['id'] ] = $visible ? 'on' : 'off';
-			}
-		}
-
 		// Register the Mailchimp List Subscribe Form blocks.
 		$blocks_dist_path = MCSF_DIR . 'dist/blocks/';
 

includes/blocks/mailchimp/edit.js

@@ -291,7 +291,7 @@ export const BlockEdit = (props) => {
 										<RichText
 											id="mc_signup_submit"
 											className="button"
-											tagName="a"
+											tagName="button"
 											placeholder={__('Enter a button text.', 'mailchimp')}
 											value={submit_text}
 											onChange={(submit_text) =>

includes/blocks/mailchimp/editor.css

@@ -79,6 +79,7 @@ div#mc_subheader:has(h3 span:empty) {
 select.mc_select {
 	max-width: 100%;
 	width: 100%;
+	padding: 10px 8px;
 }
 .mc_address_label {
 	margin-top: 1.0em;
@@ -87,6 +88,7 @@ select.mc_select {
 }
 .mc_address_label ~ select {
 	max-width: 100%;
+	padding: 10px 8px;
 	width: 100%;
 }
 .mc_list li {

includes/blocks/mailchimp/markup.php

@@ -5,13 +5,14 @@
  * @package Mailchimp
  */
 
+// Check if we should display the form.
+if ( ! mailchimp_sf_should_display_form() ) {
+	return;
+}
+
 ?>
 <div <?php echo get_block_wrapper_attributes(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>>
 	<?php
-	// Check if we should display the form.
-	if ( ! mailchimp_sf_should_display_form() ) {
-		return;
-	}
 
 	// Backwards compatibility for old block, which didn't have innerBlocks.
 	$block_instance = $block->parsed_block;

includes/class-mailchimp-block-form-submission.php

@@ -108,9 +108,6 @@ public function handle_form_submission() {
 			return false;
 		}
 
-		// TODO: If get_option( 'mc_update_existing' ) && 'unsubscribed' === $status then
-		// make an API request to fetch Mailchimp hosted sign up form and display to user
-
 		$request_body = mailchimp_sf_subscribe_body( $merge_fields_body, $groups, $email_type, $email, $status, 'yes' === $double_opt_in );
 		$response     = $api->post( $url, $request_body, 'PUT', $list_id );