Remove badge setting option

Author: girishpanchal30

assets/src/dashboard/parts/connected/settings/General.js

@@ -16,6 +16,10 @@ import { useSelect } from '@wordpress/data';
 
 import { Icon, chevronDown, chevronUp } from '@wordpress/icons';
 
+import {
+	useState
+} from '@wordpress/element';
+
 /**
  * Internal dependencies.
  */
@@ -40,10 +44,11 @@ const General = ({
 	const isReportEnabled = 'disabled' !== settings[ 'report_script' ];
 	const isAssetsEnabled = 'disabled' !== settings.cdn;
 	const isBannerEnabled = 'disabled' !== settings[ 'banner_frontend'];
-	const isOpenBadgeSetting = 'disabled' !== settings[ 'badge_setting' ];
 	const isShowBadgeIcon = 'disabled' !== settings[ 'show_badge_icon' ];
 	const activeBadgePosition = settings[ 'badge_position' ] || 'right';
 
+	const [ showBadgeSettings, setBadgeSettings ] = useState( isBannerEnabled );
+
 	const updateOption = ( option, value ) => {
 		setCanSave( true );
 		const data = { ...settings };
@@ -112,7 +117,10 @@ const General = ({
 						'is-disabled': isLoading
 					}
 				) }
-				onChange={ value => updateOption( 'banner_frontend', value ) }
+				onChange={ (value) => {
+					updateOption( 'banner_frontend', value );
+					setBadgeSettings( value );
+				} }
 			/>
 
 			{ isBannerEnabled && (
@@ -124,16 +132,16 @@ const General = ({
 								'is-disabled': isLoading
 							}
 						) }
-						onClick={ () => updateOption( 'badge_setting', ! isOpenBadgeSetting ) }
+						onClick={ () => setBadgeSettings( ! showBadgeSettings ) }
 					>
 						<span>{ optimoleDashboardApp.strings.options_strings.enable_badge_settings }</span>
 						<Icon
-							icon={ ! isOpenBadgeSetting ? chevronUp : chevronDown }
+							icon={ showBadgeSettings ? chevronUp : chevronDown }
 							className="h-5 w-5"
 							style={{ fill: '#3b82f6' }}
 						/>
 					</Button>
-					{ ! isOpenBadgeSetting && (
+					{ showBadgeSettings && (
 						<div class="mt-4 space-y-4 pl-4 pt-2">
 							<div class="flex items-center justify-between mb-4">
 								<label class="text-gray-600 font-medium">{ optimoleDashboardApp.strings.options_strings.enable_badge_show_icon }</label>

inc/manager.php

@@ -177,14 +177,8 @@ public function banner() {
 			return;
 		}
 
-		$badge_setting = $this->settings->get( 'badge_setting' ) === 'enabled';
-
-		$position       = 'right';
-		$show_icon_only = false;
-		if ( ! $badge_setting ) {
-			$position       = $this->settings->get( 'badge_position' ) ?? 'right';
-			$show_icon_only = $this->settings->get( 'show_badge_icon' ) === 'enabled';
-		}
+		$position       = $this->settings->get( 'badge_position' ) ?? 'right';
+		$show_icon_only = $this->settings->get( 'show_badge_icon' ) === 'enabled';
 
 		$string    = __( 'Optimized by Optimole', 'optimole-wp' );
 		$div_style = [

inc/settings.php

@@ -101,7 +101,6 @@ class Optml_Settings {
 		'offload_limit'              => 50000,
 		'placeholder_color'          => '',
 		'show_offload_finish_notice' => '',
-		'badge_setting'              => 'disabled',
 		'show_badge_icon'            => 'disabled',
 		'badge_position'             => 'left',
 	];
@@ -270,7 +269,6 @@ public function parse_settings( $new_settings ) {
 				case 'best_format':
 				case 'offload_limit_reached':
 				case 'show_badge_icon':
-				case 'badge_setting':
 					$sanitized_value = $this->to_map_values( $value, [ 'enabled', 'disabled' ], 'enabled' );
 					break;
 				case 'offload_limit':
@@ -538,7 +536,6 @@ public function get_site_settings() {
 			'offload_limit_reached'      => $this->get( 'offload_limit_reached' ),
 			'placeholder_color'          => $this->get( 'placeholder_color' ),
 			'show_offload_finish_notice' => $this->get( 'show_offload_finish_notice' ),
-			'badge_setting'              => $this->get( 'badge_setting' ),
 			'show_badge_icon'            => $this->get( 'show_badge_icon' ),
 			'badge_position'             => $this->get( 'badge_position' ),
 		];