fix: reviewer feedback

Author: girishpanchal30

assets/src/dashboard/parts/components/Modal.js

@@ -4,7 +4,7 @@ import { close } from '@wordpress/icons';
 import { useViewportMatch } from '@wordpress/compose';
 import { Button, Icon, Modal as CoreModal } from '@wordpress/components';
 
-export default function Modal({	icon, labels = {}, onRequestClose = () => {}, onConfirm = () => {}, variant = 'default', onAction2 = () => {} }) {
+export default function Modal({	icon, labels = {}, onRequestClose = () => {}, onConfirm = () => {}, variant = 'default', onSecondaryAction = () => {} }) {
 
 	const isMobileViewport = useViewportMatch( 'small', '<' );
 
@@ -19,7 +19,7 @@ export default function Modal({	icon, labels = {}, onRequestClose = () => {}, on
 		{
 			'bg-mango-yellow': 'warning' === variant
 		},
-		'inline-flex optml__button flex justify-center px-5 py-3 rounded font-bold min-h-40 basis-1/5'
+		'optml__button flex justify-center px-5 py-3 rounded font-bold min-h-40 basis-1/5'
 	);
 
 	return (
@@ -57,9 +57,9 @@ export default function Modal({	icon, labels = {}, onRequestClose = () => {}, on
 					<Button variant="primary" className={ actionButtonClasses } onClick={ onConfirm }>
 						{ labels.action }
 					</Button>
-					{ labels.action2 && (
-						<Button variant="link" className={ actionButtonClasses } onClick={ onAction2 }>
-							{ labels.action2 }
+					{ labels.secondaryAction && (
+						<Button variant="link" className={ actionButtonClasses } onClick={ onSecondaryAction }>
+							{ labels.secondaryAction }
 						</Button>
 					) }
 				</div>

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

@@ -188,7 +188,7 @@ const OffloadMedia = ({ settings, canSave, setSettings, setCanSave }) => {
 			return;
 		}
 
-		setModal( show_exceed_plan_quota_notice ? MODAL_STATE_EXCEED_PLAN_QUOTA_NOTICE : MODAL_STATE_ROLLBACK );
+		setModal( MODAL_STATE_ROLLBACK );
 	};
 
 	const getModalProps = ( type ) => {
@@ -255,7 +255,7 @@ const OffloadMedia = ({ settings, canSave, setSettings, setCanSave }) => {
 					onOffloadMedia();
 					setModal( null );
 				},
-				onAction2: () => {
+				onSecondaryAction: () => {
 					setModal( null );
 					const options = settings;
 					options.offload_media = 'disabled';
@@ -268,7 +268,7 @@ const OffloadMedia = ({ settings, canSave, setSettings, setCanSave }) => {
 					title: options_strings.exceed_plan_quota_notice_title,
 					description: options_strings.exceed_plan_quota_notice_description,
 					action: options_strings.exceed_plan_quota_notice_start_action,
-					action2: options_strings.exceed_plan_quota_notice_start_action2
+					secondaryAction: options_strings.exceed_plan_quota_notice_secondary_action
 				}
 			}
 		};
@@ -299,7 +299,7 @@ const OffloadMedia = ({ settings, canSave, setSettings, setCanSave }) => {
 		}
 
 		if ( 'rollback' === radioBoxValue ) {
-			setModal( show_exceed_plan_quota_notice ? MODAL_STATE_EXCEED_PLAN_QUOTA_NOTICE : MODAL_STATE_ROLLBACK );
+			setModal( MODAL_STATE_ROLLBACK );
 		}
 	};
 

inc/admin.php

@@ -1982,7 +1982,7 @@ private function get_dashboard_strings() {
 				'exceed_plan_quota_notice_title'      => __( 'Your site has already reached over 50% of your monthly visits limit within just two weeks.', 'optimole-wp' ),
 				'exceed_plan_quota_notice_description' => __( 'Based on this trend, you are likely to exceed your free quota before the month ends. To avoid any disruption in service, we strongly recommend upgrading your plan or waiting until your traffic stabilizes before offloading your images. Do you still wish to proceed?', 'optimole-wp' ),
 				'exceed_plan_quota_notice_start_action' => __( 'Yes, Transfer to Optimole Cloud', 'optimole-wp' ),
-				'exceed_plan_quota_notice_start_action2' => __( 'No', 'optimole-wp' ),
+				'exceed_plan_quota_notice_secondary_action' => __( 'No', 'optimole-wp' ),
 			],
 			'help'                           => [
 				'section_one_title'           => __( 'Help and Support', 'optimole-wp' ),
@@ -2186,22 +2186,13 @@ public function survey_category( $value, $scale = 1 ) {
 	 * @return bool True if the exceed quota warning should be displayed, false otherwise.
 	 */
 	public function should_show_exceed_quota_warning() {
-		$current_screen = get_current_screen();
-		if ( ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ||
-			is_network_admin() ||
-			! current_user_can( 'manage_options' ) ||
-			! $this->settings->is_connected() ||
-			empty( $current_screen )
-		) {
+		if ( ! $this->settings->is_connected() ) {
 			return false;
 		}
 		if ( get_option( 'optml_notice_hide_upg', 'no' ) === 'yes' ) {
 			return false;
 		}
 
-		if ( ! str_contains( $current_screen->base, 'page_optimole' ) ) {
-			return false;
-		}
 		$service_data = $this->settings->get( 'service_data' );
 
 		if ( ! isset( $service_data['plan'] ) ) {
@@ -2214,8 +2205,14 @@ public function should_show_exceed_quota_warning() {
 		if ( $service_data['days_since_registration'] <= 14 ) {
 			return false;
 		}
-		$visitors_limit     = isset( $service_data['visitors_limit'] ) ? (int) $service_data['visitors_limit'] : 0;
-		$visitors_left      = isset( $service_data['visitors_left'] ) ? (int) $service_data['visitors_left'] : 0;
+
+		$visitors_limit = isset( $service_data['visitors_limit'] ) ? (int) $service_data['visitors_limit'] : 0;
+		$visitors_left  = isset( $service_data['visitors_left'] ) ? (int) $service_data['visitors_left'] : 0;
+
+		if ( ! $visitors_limit || ! $visitors_left ) {
+			return false;
+		}
+
 		$used_quota         = $visitors_limit - $visitors_left;
 		$is_50_percent_used = ( $used_quota / $visitors_limit ) >= 0.5;