diff --git a/assets/src/dashboard/parts/connected/Sidebar.js b/assets/src/dashboard/parts/connected/Sidebar.js
index fb6242452..ea7bb8b57 100644
--- a/assets/src/dashboard/parts/connected/Sidebar.js
+++ b/assets/src/dashboard/parts/connected/Sidebar.js
@@ -103,7 +103,7 @@ const Sidebar = ({ settings, setSettings, setCanSave, setTab }) => {
 						<Button
 							variant="link"
 							className="optml__button flex w-full justify-center font-bold min-h-40 !no-underline !text-white !bg-opaque-black !rounded"
-							href={ optimoleDashboardApp.optimoleHome +  'pricing' }
+							href={ optimoleDashboardApp?.bf_notices?.sidebar?.cta_link ?? optimoleDashboardApp.upgrade_url }
 							target="_blank"
 						>
 							{ optimoleDashboardApp.strings.upgrade.cta }
diff --git a/assets/src/dashboard/parts/connected/dashboard/index.js b/assets/src/dashboard/parts/connected/dashboard/index.js
index 968d6c88a..cf784cc26 100644
--- a/assets/src/dashboard/parts/connected/dashboard/index.js
+++ b/assets/src/dashboard/parts/connected/dashboard/index.js
@@ -172,14 +172,7 @@ const Dashboard = () => {
 	const visitorsLimitPercent = ( ( userData.visitors / userData.visitors_limit ) * 100 ).toFixed( 0 );
 
 	const renewalDate = useMemo( () => {
-		const timestamp = userData.renews_on;
-
-		if ( ! timestamp ) {
-			return 'N/A';
-		}
-
-		const date = new Date( timestamp * 1000 );
-		return date.toLocaleDateString( undefined, { year: 'numeric', month: 'short', day: 'numeric' });
+		return userData.renews_on_formatted;
 	}, [ userData.renews_on ]);
 
 	const formatMetric = ( type, value ) => {
diff --git a/assets/src/dashboard/parts/connected/index.js b/assets/src/dashboard/parts/connected/index.js
index bdb8df092..2842db112 100644
--- a/assets/src/dashboard/parts/connected/index.js
+++ b/assets/src/dashboard/parts/connected/index.js
@@ -93,7 +93,7 @@ const ConnectedLayout = ({
 		}
 	}, [ canSave ]);
 
-	const showBFBanner = 'free' === plan && optimoleDashboardApp?.bf_notices?.banner;
+	const showBFBanner = Boolean( optimoleDashboardApp?.bf_notices?.banner );
 
 	return (
 		<div className="optml-connected 2xl:max-w-screen-xl max-w-screen px-4 mx-auto">
diff --git a/assets/src/dashboard/parts/connected/settings/FilterControl.js b/assets/src/dashboard/parts/connected/settings/FilterControl.js
index c3bcc6c5e..afad28be6 100644
--- a/assets/src/dashboard/parts/connected/settings/FilterControl.js
+++ b/assets/src/dashboard/parts/connected/settings/FilterControl.js
@@ -275,7 +275,7 @@ const FilterControl = ({
 						) : (
 							<TextControl
 								value={ filterValue }
-								placeholder={ 'matches' === filterMatchType ? 'path' : 'word' }
+								placeholder={ 'matches' === filterMatchType ? optimoleDashboardApp.strings.path : optimoleDashboardApp.strings.word }
 								onChange={ updateFilterValue }
 								className="optml__input"
 							/>
diff --git a/assets/src/global.d.ts b/assets/src/global.d.ts
index 4ddd9111d..df811f82d 100644
--- a/assets/src/global.d.ts
+++ b/assets/src/global.d.ts
@@ -528,7 +528,6 @@ export interface AvailableApp {
 export interface Routes {
   update_option: string
   request_update: string
-  check_redirects: string
   connect: string
   select_application: string
   register_service: string
@@ -577,6 +576,7 @@ export interface UserData {
   is_cname_assigned: string
   extra_visits: boolean
   renews_on: number
+  renews_on_formatted: string
   can_use_offloading: boolean
   domain_dns: string
 }
diff --git a/composer.lock b/composer.lock
index b8b2f0c56..ce4c43467 100644
--- a/composer.lock
+++ b/composer.lock
@@ -634,16 +634,16 @@
         },
         {
             "name": "php-stubs/wordpress-stubs",
-            "version": "v6.8.1",
+            "version": "v6.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-stubs/wordpress-stubs.git",
-                "reference": "92e444847d94f7c30f88c60004648f507688acd5"
+                "reference": "9c8e22e437463197c1ec0d5eaa9ddd4a0eb6d7f8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-stubs/wordpress-stubs/zipball/92e444847d94f7c30f88c60004648f507688acd5",
-                "reference": "92e444847d94f7c30f88c60004648f507688acd5",
+                "url": "https://api.github.com/repos/php-stubs/wordpress-stubs/zipball/9c8e22e437463197c1ec0d5eaa9ddd4a0eb6d7f8",
+                "reference": "9c8e22e437463197c1ec0d5eaa9ddd4a0eb6d7f8",
                 "shasum": ""
             },
             "conflict": {
@@ -651,7 +651,7 @@
             },
             "require-dev": {
                 "dealerdirect/phpcodesniffer-composer-installer": "^1.0",
-                "nikic/php-parser": "^5.4",
+                "nikic/php-parser": "^5.5",
                 "php": "^7.4 || ^8.0",
                 "php-stubs/generator": "^0.8.3",
                 "phpdocumentor/reflection-docblock": "^5.4.1",
@@ -679,9 +679,9 @@
             ],
             "support": {
                 "issues": "https://github.com/php-stubs/wordpress-stubs/issues",
-                "source": "https://github.com/php-stubs/wordpress-stubs/tree/v6.8.1"
+                "source": "https://github.com/php-stubs/wordpress-stubs/tree/v6.8.2"
             },
-            "time": "2025-05-02T12:33:34+00:00"
+            "time": "2025-07-16T06:41:00+00:00"
         },
         {
             "name": "php-stubs/wp-cli-stubs",
@@ -904,11 +904,11 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "2.1.30",
+            "version": "2.1.31",
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/a4a7f159927983dd4f7c8020ed227d80b7f39d7d",
-                "reference": "a4a7f159927983dd4f7c8020ed227d80b7f39d7d",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/ead89849d879fe203ce9292c6ef5e7e76f867b96",
+                "reference": "ead89849d879fe203ce9292c6ef5e7e76f867b96",
                 "shasum": ""
             },
             "require": {
@@ -953,7 +953,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-10-02T16:07:52+00:00"
+            "time": "2025-10-10T14:14:11+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -2342,16 +2342,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.13.2",
+            "version": "3.13.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "5b5e3821314f947dd040c70f7992a64eac89025c"
+                "reference": "ad545ea9c1b7d270ce0fc9cbfb884161cd706119"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/5b5e3821314f947dd040c70f7992a64eac89025c",
-                "reference": "5b5e3821314f947dd040c70f7992a64eac89025c",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/ad545ea9c1b7d270ce0fc9cbfb884161cd706119",
+                "reference": "ad545ea9c1b7d270ce0fc9cbfb884161cd706119",
                 "shasum": ""
             },
             "require": {
@@ -2422,20 +2422,20 @@
                     "type": "thanks_dev"
                 }
             ],
-            "time": "2025-06-17T22:17:01+00:00"
+            "time": "2025-09-05T05:47:09+00:00"
         },
         {
             "name": "szepeviktor/phpstan-wordpress",
-            "version": "v2.0.2",
+            "version": "v2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/szepeviktor/phpstan-wordpress.git",
-                "reference": "963887b04c21fe7ac78e61c1351f8b00fff9f8f8"
+                "reference": "aa722f037b2d034828cd6c55ebe9e5c74961927e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/szepeviktor/phpstan-wordpress/zipball/963887b04c21fe7ac78e61c1351f8b00fff9f8f8",
-                "reference": "963887b04c21fe7ac78e61c1351f8b00fff9f8f8",
+                "url": "https://api.github.com/repos/szepeviktor/phpstan-wordpress/zipball/aa722f037b2d034828cd6c55ebe9e5c74961927e",
+                "reference": "aa722f037b2d034828cd6c55ebe9e5c74961927e",
                 "shasum": ""
             },
             "require": {
@@ -2445,6 +2445,7 @@
             },
             "require-dev": {
                 "composer/composer": "^2.1.14",
+                "composer/semver": "^3.4",
                 "dealerdirect/phpcodesniffer-composer-installer": "^1.0",
                 "php-parallel-lint/php-parallel-lint": "^1.1",
                 "phpstan/phpstan-strict-rules": "^2.0",
@@ -2482,9 +2483,9 @@
             ],
             "support": {
                 "issues": "https://github.com/szepeviktor/phpstan-wordpress/issues",
-                "source": "https://github.com/szepeviktor/phpstan-wordpress/tree/v2.0.2"
+                "source": "https://github.com/szepeviktor/phpstan-wordpress/tree/v2.0.3"
             },
-            "time": "2025-02-12T18:43:37+00:00"
+            "time": "2025-09-14T02:58:22+00:00"
         },
         {
             "name": "theseer/tokenizer",
diff --git a/inc/admin.php b/inc/admin.php
index 807994b3e..6f9f88847 100755
--- a/inc/admin.php
+++ b/inc/admin.php
@@ -23,7 +23,7 @@ class Optml_Admin {
 
 	const IMAGE_DATA_COLLECTED_BATCH = 100;
 
-	const BF_PROMO_DISMISS_KEY = 'optml_bf24_notice_dismiss';
+	const BF_PROMO_DISMISS_KEY = 'optml_bf25_notice_dismiss';
 
 	const SPC_BANNER_DISMISS_KEY = 'optml_spc_banner_dismiss';
 
@@ -711,6 +711,7 @@ public function should_show_upgrade() {
 	 */
 	public static function get_upgrade_base_link() {
 		$base_url = 'https://optimole.com/upgrade';
+		$base_url = tsdk_translate_link( $base_url );
 		$email    = self::get_account_email();
 
 		if ( ! empty( $email ) ) {
@@ -720,6 +721,15 @@ public static function get_upgrade_base_link() {
 		return $base_url;
 	}
 
+	/**
+	 * Get contact URL.
+	 *
+	 * @return string Contact URL.
+	 */
+	public static function get_contact_base_link() {
+		return tsdk_translate_link( 'https://optimole.com/contact' );
+	}
+
 	/**
 	 * Retrieve Optimole account email.
 	 *
@@ -1392,6 +1402,13 @@ private function localize_dashboard_app() {
 		if ( ! empty( $service_data ) ) {
 			$service_data['domain_dns'] = $this->settings->get_cdn_url();
 		}
+		if ( isset( $service_data['renews_on'] ) ) {
+			$service_data['renews_on_formatted'] = date_i18n( get_option( 'date_format' ), $service_data['renews_on'] );
+
+		}
+
+		$user_plan = isset( $service_data['plan'] ) ? $service_data['plan'] : 'free';
+
 		return [
 			'strings'                    => $this->get_dashboard_strings(),
 			'assets_url'                 => OPTML_URL . 'assets/',
@@ -1428,7 +1445,7 @@ private function localize_dashboard_app() {
 					'hash' => '#settings',
 				],
 			],
-			'bf_notices'                 => $this->get_bf_notices(),
+			'bf_notices'                 => $this->get_bf_notices( $user_plan ),
 			'spc_banner'                 => $this->get_spc_banner(),
 			'show_exceed_plan_quota_notice' => $this->should_show_exceed_quota_warning(),
 			'show_free_user_with_offload_notice' => get_option( 'optml_has_offloading_enabled_on_upgrade', 'no' ),
@@ -1439,8 +1456,9 @@ private function localize_dashboard_app() {
 					'utm_campaign' => 'report_issue',
 					'contact_website' => home_url(),
 				],
-				tsdk_translate_link( 'https://optimole.com/contact/' )
+				self::get_contact_base_link()
 			),
+			'upgrade_url'                => esc_url( self::get_upgrade_base_link() ),
 		];
 	}
 
@@ -1531,53 +1549,86 @@ private function get_spc_status() {
 	/**
 	 * Get the black friday notices.
 	 *
-	 * @return array
+	 * @param non-empty-string $user_plan User plan.
+	 *
+	 * @return array<string, mixed> Notice data.
 	 */
-	public function get_bf_notices() {
-		$date = new DateTime();
+	public function get_bf_notices( $user_plan ) {
 
-		$now   = time();
-		$start = strtotime( '2024-11-25 00:00:00' );
-		$end   = strtotime( '2024-12-03 23:59:59' );
+		$notices = [];
+		$has_free_plan = 'free' === $user_plan;
 
-		if ( $now < $start || $now > $end ) {
-			return [];
+		if ( ! $has_free_plan ) {
+			return $notices;
 		}
 
-		$notices = [
-			'sidebar' => [
-				'title'    => sprintf(
-					'<span class="text-promo-orange">%1$s:</span> %2$s',
-					__( 'Private Sale', 'optimole-wp' ),
-					__( '25 Nov - 03 Dec', 'optimole-wp' )
-				),
-				'subtitle' => sprintf(
-				/* translators: 1 is the promo code, 2 is the discount amount ('25 off') */
-					__( 'Use code %1$s for %2$s on yearly plans.', 'optimole-wp' ),
-					'<span class="border-b border-0 border-white border-dashed text-promo-orange">BFCM2425</span>',
-					'<span class="text-promo-orange uppercase">' . __( '25% off', 'optimole-wp' ) . '</span>'
-				),
-				'cta_link' => esc_url_raw( tsdk_utmify( tsdk_translate_link( self::get_upgrade_base_link() ), 'bfcm24', 'sidebarnotice' ) ),
-			],
+		/**
+		 * The black friday sale period flag.
+		 *
+		 * @var bool $is_black_friday Whether is black friday sale period or not.
+		 */
+		$is_black_friday = apply_filters( 'themeisle_sdk_is_black_friday_sale', false );
+
+		if ( ! $is_black_friday ) {
+			return $notices;
+		}
+
+		/**
+		 * The current date.
+		 *
+		 * @var DateTime $now Current date.
+		 */
+		$now = apply_filters( 'themeisle_sdk_current_date', new \DateTime( 'now' ) );
+		$current_year = $now->format( 'Y' );
+
+		$black_friday_day = new \DateTime( "last Friday of November $current_year" );
+		$sale_start = clone $black_friday_day;
+		$sale_start->modify( 'monday this week' );
+		$sale_start->setTime( 0, 0 );
+
+		$end = clone $sale_start;
+		$end->modify( '+7 days' );
+		$end->setTime( 23, 59, 59 );
+
+		$promo_code = 'BFCM2525';
+
+		$notices['sidebar'] = [
+			'title'    => sprintf(
+				'<span class="text-promo-orange">%1$s:</span> %2$s - %3$s',
+				__( 'Private Sale', 'optimole-wp' ),
+				wp_date( 'j M', $sale_start->getTimestamp() ),
+				wp_date( 'j M', $end->getTimestamp() )
+			),
+			'subtitle' => sprintf(
+			/* translators: %1$s is the promo code, %2$s is the discount amount ('25 off') */
+				__( 'Use code %1$s for %2$s on yearly plans.', 'optimole-wp' ),
+				'<span class="border-b border-0 border-white border-dashed text-promo-orange">' . $promo_code . '</span>',
+				'<span class="text-promo-orange uppercase">' . __( '25% discount', 'optimole-wp' ) . '</span>'
+			),
+			'cta_link' => esc_url_raw( tsdk_utmify( tsdk_translate_link( self::get_upgrade_base_link() ), 'bfcm25', 'sidebarnotice' ) ),
 		];
 
 		if ( get_option( self::BF_PROMO_DISMISS_KEY ) === 'yes' ) {
 			return $notices;
 		}
 
+		$message = sprintf(
+			// translators: %1$s is the promo code, %2$s is the discount amount ('25% off')
+			__( 'Use coupon code %1$s for an instant %2$s on Optimole yearly plans', 'optimole-wp' ),
+			'<span class="border-b border-0 border-white border-dashed text-promo-orange">' . $promo_code . '</span>',
+			'<span class="text-promo-orange uppercase">' . __( '25% discount', 'optimole-wp' ) . '</span>'
+		);
+		$cta_link = esc_url_raw( tsdk_utmify( self::get_upgrade_base_link(), 'bfcm25', 'notice' ) );
+		$cta_text = __( 'Claim now', 'optimole-wp' );
+
 		$notices['banner'] = [
 			/* translators: number of days left */
-			'urgency'  => sprintf( __( 'Hurry up! only %s left', 'optimole-wp' ), human_time_diff( $end, $now ) ),
+			'urgency'  => sprintf( __( 'Hurry up! only %s left', 'optimole-wp' ), human_time_diff( $end->getTimestamp(), $now->getTimestamp() ) ),
 			/* translators: private sale */
-			'title'    => sprintf( __( 'Black Friday %s', 'optimole-wp' ), '<span class="text-promo-orange">' . __( 'private sale' ) . '</span>' ),
-			'subtitle' => sprintf(
-			/* translators: 1 is the promo code, 2 is the discount amount ('25 off') */
-				__( 'Use coupon code %1$s for an instant %2$s on Optimole yearly plans', 'optimole-wp' ),
-				'<span class="border-b border-0 border-white border-dashed text-promo-orange">BFCM2425</span>',
-				'<span class="text-promo-orange">' . __( '25% discount', 'optimole-wp' ) . '</span>'
-			),
-			'cta_text' => __( 'Claim now', 'optimole-wp' ),
-			'cta_link' => esc_url_raw( tsdk_utmify( tsdk_translate_link( self::get_upgrade_base_link() ), 'bfcm24', 'dismissiblenotice' ) ),
+			'title'    => sprintf( __( 'Black Friday %s', 'optimole-wp' ), '<span class="text-promo-orange">' . __( 'private sale', 'optimole-wp' ) . '</span>' ),
+			'subtitle' => $message,
+			'cta_text' => $cta_text,
+			'cta_link' => $cta_link,
 			'dismiss_key' => self::BF_PROMO_DISMISS_KEY,
 		];
 
@@ -1601,7 +1652,7 @@ private function get_dashboard_strings() {
 			'dashboard_title'                => __( 'Image Optimization Overview', 'optimole-wp' ),
 			'banner_title'                   => __( 'All images are automatically optimized!', 'optimole-wp' ),
 			'banner_description'             => __( 'Optimole is handling all your images in real-time with our CloudFront CDN (450+ locations worldwide)', 'optimole-wp' ),
-			'quick_action_title'             => __( 'Quick Actions' ),
+			'quick_action_title'             => __( 'Quick Actions', 'optimole-wp' ),
 			'connect_btn'                    => __( 'Connect to Optimole', 'optimole-wp' ),
 			'disconnect_btn'                 => __( 'Disconnect', 'optimole-wp' ),
 			'select'                         => __( 'Select', 'optimole-wp' ),
@@ -1621,6 +1672,8 @@ private function get_dashboard_strings() {
 			'keep_connected'                 => __( 'Ok, keep me connected', 'optimole-wp' ),
 			'cloud_library'                  => __( 'Cloud Library', 'optimole-wp' ),
 			'image_storage'                  => __( 'Image Storage', 'optimole-wp' ),
+			'word' => __( 'word', 'optimole-wp' ),
+			'path' => __( 'path', 'optimole-wp' ),
 			'disconnect_title'               => __( 'You are about to disconnect from the Optimole API', 'optimole-wp' ),
 			'disconnect_desc'                => __(
 				'Please note that disconnecting your site from the Optimole API will impact your website performance.
@@ -2265,9 +2318,9 @@ private function get_dashboard_strings() {
 			'contact_support' => [
 				// translators: %s is the email main subject.
 				'title_prefix'              => __( '[Lazy Load Issue] %s', 'optimole-wp' ),
-				'disable_lazy_load_scaling' => __( 'Disable Lazy Load & Scaling' ),
-				'disable_image_scaling'     => __( 'Disable Image Scaling' ),
-				'enable_native_lazy_load'   => __( 'Enable Native Lazy Load' ),
+				'disable_lazy_load_scaling' => __( 'Disable Lazy Load & Scaling', 'optimole-wp' ),
+				'disable_image_scaling'     => __( 'Disable Image Scaling', 'optimole-wp' ),
+				'enable_native_lazy_load'   => __( 'Enable Native Lazy Load', 'optimole-wp' ),
 			],
 			// translators: %s is the date of the renewal.
 			'renew_date'                   => __( 'Renews %s', 'optimole-wp' ),
diff --git a/inc/dashboard_widget.php b/inc/dashboard_widget.php
index 37c3739cd..d804717ae 100644
--- a/inc/dashboard_widget.php
+++ b/inc/dashboard_widget.php
@@ -35,7 +35,7 @@ public function add_dashboard_widget() {
 			return;
 		}
 
-		wp_add_dashboard_widget( $this->handle, sprintf( 'Optimole - %s', __( 'Image Optimization Stats', 'optimole' ) ), [ $this, 'render_widget' ] );
+		wp_add_dashboard_widget( $this->handle, sprintf( 'Optimole - %s', __( 'Image Optimization Stats', 'optimole-wp' ) ), [ $this, 'render_widget' ] );
 	}
 
 	/**
diff --git a/inc/rest.php b/inc/rest.php
index f2a24aaa1..fd5363d6c 100644
--- a/inc/rest.php
+++ b/inc/rest.php
@@ -43,7 +43,6 @@ class Optml_Rest {
 		'service_routes' => [
 			'update_option' => 'POST',
 			'request_update' => 'GET',
-			'check_redirects' => 'POST_PUT_PATCH',
 			'connect' => [
 				'POST',
 				'args'  => [
@@ -814,69 +813,6 @@ public function update_option( WP_REST_Request $request ) {
 		return $this->response( $sanitized );
 	}
 
-	/**
-	 * Update options method.
-	 *
-	 * @param WP_REST_Request $request option update rest request.
-	 * @phpstan-param WP_REST_Request<array{images?: array<string, array{src?: list<string>, ignoredUrls?: int}>}> $request
-	 *
-	 * @return WP_REST_Response
-	 */
-	public function check_redirects( WP_REST_Request $request ) {
-		if ( empty( $request->get_param( 'images' ) ) ) {
-			return $this->response( __( 'No images available on the current page.' ), 'noImagesFound' );
-		}
-		// 'ok' if no issues found, 'log' is there are issues we need to notify, 'deactivated' if the user's account is disabled
-		$status = 'ok';
-		$result = '';
-		foreach ( $request->get_param( 'images' ) as $domain => $value ) {
-			$args             = [
-				'method'      => 'GET',
-				'redirection' => 0,
-			];
-			$processed_images = 0;
-			if ( isset( $value['src'] ) ) {
-				$processed_images = count( $value['src'] );
-			}
-			if ( isset( $value['ignoredUrls'] ) && $value['ignoredUrls'] > $processed_images ) {
-				$result .= '<li>❌ ' . sprintf( /* translators: 1 is the domain name, 2 is starting anchor tag, 3 is the ending anchor tag. */__( 'The images from: %1$s are not optimized by Optimole. If you would like to do so, you can follow this: %2$sWhy Optimole does not optimize all the images from my site?%3$s.', 'optimole-wp' ), $domain, '<a target="_blank" href="https://docs.optimole.com/article/1290-how-to-optimize-images-using-optimole-from-my-domain">', '</a>' ) . '</li>';
-				$status = 'log';
-				continue;
-			}
-
-			if ( $processed_images > 0 ) {
-				$response = wp_remote_get( $value['src'][ rand( 0, $processed_images - 1 ) ], $args );
-				if ( ! is_wp_error( $response ) ) {
-					$headers     = $response['headers']; // array of http header lines
-					$status_code = $response['response']['code'];
-					if ( $status_code === 301 ) {
-						$status = 'deactivated';
-						$result = '<li>❌ ' . sprintf( /* translators: 1 is starting anchor tag, 2 is the ending anchor tag. */ __( 'Your account is currently disabled due to exceeding quota and Optimole is no longer able to optimize the images. In order to fix this you will need to %1$supgrade%2$s.', 'optimole-wp' ), '<a target="_blank" href="' . esc_url( tsdk_translate_link( Optml_Admin::get_upgrade_base_link() ) ) . '">', '</a>' ) . '</li>';
-						break;
-					}
-					if ( $status_code === 302 ) {
-						if ( isset( $headers['x-redirect-o'] ) ) {
-							$optimole_code = (int) $headers['x-redirect-o'];
-							if ( $optimole_code === 1 ) {
-								$status = 'log';
-								$result .= '<li>❌ ' . sprintf( /* translators: 1 is the domain, 2 is starting anchor tag, 3 is the ending anchor tag. */ __( 'The domain: %1$s is not allowed to optimize images using your Optimole account. You can add this to the allowed list %2$shere%3$s.', 'optimole-wp' ), '<b>' . $domain . '</b>', '<a target="_blank" href="' . esc_url( tsdk_translate_link( 'https://dashboard.optimole.com/whitelist', 'query' ) ) . '">', '</a>' ) . '</li>';
-							}
-							if ( $optimole_code === 4 ) {
-								$status = 'log';
-								$result .= '<li>❌ ' . sprintf( /* translators: 1 is the domain, 2 is starting anchor tag, 3 is the ending anchor tag. */ __( 'We are not able to download the images from %1$s. Please check %2$sthis%3$s document for a more advanced guide on how to solve this.', 'optimole-wp' ), '<b>' . $domain . '</b>', '<a target="_blank" href="https://docs.optimole.com/article/1291-why-optimole-is-not-able-to-download-the-images-from-my-site">', '</a>' ) . '<br />' . '</li>';
-							}
-						}
-					}
-				}
-			}
-		}
-		if ( $result === '' ) {
-			$result = __( 'No issues detected, everything is running smoothly.', 'optimole-wp' );
-		}
-
-		return $this->response( '<ul>' . $result . '</ul>', $status );
-	}
-
 	/**
 	 * Get total number of images.
 	 *
diff --git a/phpcs.xml b/phpcs.xml
index 1e0f080e5..8fd379d55 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -52,7 +52,15 @@
     <!-- Disallow long array syntax -->
     <rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
     <rule ref="WordPress-Docs">
+    </rule>
+    <rule ref="WordPress.WP.I18n.MissingTranslatorsComment"/>
 
+    <rule ref="WordPress.WP.I18n">
+        <properties>
+            <property name="text_domain" type="array">
+                <element value="optimole-wp"/>
+            </property>
+        </properties>
     </rule>
     <rule ref="Squiz.Commenting.FunctionComment.ScalarTypeHintMissing">
         <severity>0</severity>
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 9530f1e83..deb5805c5 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -168,12 +168,6 @@ parameters:
 			count: 1
 			path: inc/admin.php
 
-		-
-			message: '#^Method Optml_Admin\:\:get_bf_notices\(\) return type has no value type specified in iterable type array\.$#'
-			identifier: missingType.iterableValue
-			count: 1
-			path: inc/admin.php
-
 		-
 			message: '#^Method Optml_Admin\:\:get_dashboard_strings\(\) return type has no value type specified in iterable type array\.$#'
 			identifier: missingType.iterableValue
diff --git a/tests/test-admin.php b/tests/test-admin.php
new file mode 100644
index 000000000..965b1ad52
--- /dev/null
+++ b/tests/test-admin.php
@@ -0,0 +1,336 @@
+<?php
+/**
+ * WordPress unit test plugin.
+ *
+ * @package     Optimole-WP
+ * @subpackage  Tests
+ * @copyright   Copyright (c) 2017, ThemeIsle
+ * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
+ */
+
+/**
+ * Class Test_Admin.
+ *
+ * Tests for Optml_Admin class methods.
+ */
+class Test_Admin extends WP_UnitTestCase {
+
+	/**
+	 * Instance of Optml_Admin.
+	 *
+	 * @var Optml_Admin
+	 */
+	private $admin;
+
+	/**
+	 * Black Friday date for current year.
+	 *
+	 * @var DateTime
+	 */
+	private $black_friday;
+
+	/**
+	 * Sale start date.
+	 *
+	 * @var DateTime
+	 */
+	private $sale_start;
+
+	/**
+	 * Sale end date.
+	 *
+	 * @var DateTime
+	 */
+	private $sale_end;
+
+	/**
+	 * Set up test environment before each test.
+	 */
+	public function setUp(): void {
+		parent::setUp();
+		$this->admin = new Optml_Admin();
+		
+		// Calculate Black Friday dates dynamically
+		$now = new \DateTime( 'now' );
+		$current_year = $now->format( 'Y' );
+
+		$this->black_friday = new \DateTime( "last Friday of November $current_year" );
+		$this->sale_start = clone $this->black_friday;
+		$this->sale_start->modify( 'monday this week' );
+		$this->sale_start->setTime( 0, 0 );
+
+		$this->sale_end = clone $this->sale_start;
+		$this->sale_end->modify( '+7 days' );
+		$this->sale_end->setTime( 23, 59, 59 );
+		
+		// Clean up options before each test
+		delete_option( Optml_Admin::BF_PROMO_DISMISS_KEY );
+		
+		// Remove any filters that might be set
+		remove_all_filters( 'themeisle_sdk_is_black_friday_sale' );
+		remove_all_filters( 'themeisle_sdk_current_date' );
+	}
+
+	/**
+	 * Clean up after each test.
+	 */
+	public function tearDown(): void {
+		delete_option( Optml_Admin::BF_PROMO_DISMISS_KEY );
+		remove_all_filters( 'themeisle_sdk_is_black_friday_sale' );
+		remove_all_filters( 'themeisle_sdk_current_date' );
+		parent::tearDown();
+	}
+
+	/**
+	 * Helper to set up Black Friday sale period.
+	 */
+	private function setup_black_friday_sale_period(): void {
+		add_filter( 'themeisle_sdk_is_black_friday_sale', '__return_true' );
+	}
+
+	/**
+	 * Helper to mock current date.
+	 *
+	 * @param DateTime $date The date to mock.
+	 */
+	private function mock_date_to( DateTime $date ): void {
+		remove_all_filters( 'themeisle_sdk_current_date' );
+		add_filter( 'themeisle_sdk_current_date', static function() use ( $date ) {
+			return $date;
+		} );
+	}
+
+	/**
+	 * Test get_bf_notices returns empty array when not Black Friday period.
+	 */
+	public function test_get_bf_notices_returns_empty_when_not_black_friday() {
+		// Mock Black Friday status as false
+		add_filter( 'themeisle_sdk_is_black_friday_sale', '__return_false' );
+
+		$result = $this->admin->get_bf_notices( 'free' );
+		
+		$this->assertIsArray( $result );
+		$this->assertEmpty( $result );
+	}
+
+
+
+	/**
+	 * Test get_bf_notices returns empty array for non-free plans.
+	 */
+	public function test_get_bf_notices_returns_empty_for_non_free_plans() {
+		$this->setup_black_friday_sale_period();
+		$this->mock_date_to( clone $this->black_friday );
+		
+		// Test various non-free plans - all should return empty
+		$non_free_plans = [ 'starter', 'growth', 'business', 'agency', 'starter-yearly', 'invalid-plan' ];
+		
+		foreach ( $non_free_plans as $plan ) {
+			$result = $this->admin->get_bf_notices( $plan );
+			$this->assertIsArray( $result, "Failed for plan: $plan" );
+			$this->assertEmpty( $result, "Expected empty array for non-free plan: $plan" );
+		}
+	}
+
+	/**
+	 * Test get_bf_notices returns correct structure for free plan during Black Friday.
+	 */
+	public function test_get_bf_notices_structure_for_free_plan() {
+		$this->setup_black_friday_sale_period();
+		$this->mock_date_to( clone $this->black_friday );
+		
+		$result = $this->admin->get_bf_notices( 'free' );
+		
+		// Should return both sidebar and banner notices
+		$this->assertIsArray( $result );
+		$this->assertArrayHasKey( 'sidebar', $result );
+		$this->assertArrayHasKey( 'banner', $result );
+		
+		// Validate sidebar structure
+		$sidebar = $result['sidebar'];
+		$this->assertArrayHasKey( 'title', $sidebar );
+		$this->assertArrayHasKey( 'subtitle', $sidebar );
+		$this->assertArrayHasKey( 'cta_link', $sidebar );
+		
+		// Validate banner structure
+		$banner = $result['banner'];
+		$this->assertArrayHasKey( 'urgency', $banner );
+		$this->assertArrayHasKey( 'title', $banner );
+		$this->assertArrayHasKey( 'subtitle', $banner );
+		$this->assertArrayHasKey( 'cta_text', $banner );
+		$this->assertArrayHasKey( 'cta_link', $banner );
+		$this->assertArrayHasKey( 'dismiss_key', $banner );
+		
+		// Check subtitle contains discount information for free users
+		$this->assertStringContainsString( '25', $sidebar['subtitle'] );
+		$this->assertStringContainsString( 'BFCM2525', $sidebar['subtitle'] );
+		$this->assertStringContainsString( 'Use code', $sidebar['subtitle'] );
+		
+		// Check CTA link is not empty
+		$this->assertNotEmpty( $sidebar['cta_link'] );
+		
+		// Check banner CTA text and message
+		$this->assertNotEmpty( $banner['cta_text'] );
+		$this->assertStringContainsString( 'Use coupon code', $banner['subtitle'] );
+		$this->assertStringContainsString( 'BFCM2525', $banner['subtitle'] );
+		$this->assertStringContainsString( '25', $banner['subtitle'] );
+	}
+	
+
+
+	/**
+	 * Test get_bf_notices banner visibility based on dismissal status.
+	 */
+	public function test_get_bf_notices_banner_dismissal() {
+		$this->setup_black_friday_sale_period();
+		$this->mock_date_to( clone $this->black_friday );
+		
+		// Test banner is hidden when dismissed
+		update_option( Optml_Admin::BF_PROMO_DISMISS_KEY, 'yes' );
+		$result = $this->admin->get_bf_notices( 'free' );
+		$this->assertIsArray( $result );
+		$this->assertArrayHasKey( 'sidebar', $result );
+		$this->assertArrayNotHasKey( 'banner', $result );
+		
+		// Test banner appears when not dismissed
+		delete_option( Optml_Admin::BF_PROMO_DISMISS_KEY );
+		$result = $this->admin->get_bf_notices( 'free' );
+		$this->assertIsArray( $result );
+		$this->assertArrayHasKey( 'sidebar', $result );
+		$this->assertArrayHasKey( 'banner', $result );
+	}
+
+	/**
+	 * Test get_bf_notices contains correct dismiss key in banner.
+	 */
+	public function test_get_bf_notices_banner_has_correct_dismiss_key() {
+		$this->setup_black_friday_sale_period();
+		$this->mock_date_to( clone $this->black_friday );
+		
+		$result = $this->admin->get_bf_notices( 'free' );
+		
+		$this->assertArrayHasKey( 'banner', $result );
+		$this->assertArrayHasKey( 'dismiss_key', $result['banner'] );
+		$this->assertEquals( Optml_Admin::BF_PROMO_DISMISS_KEY, $result['banner']['dismiss_key'] );
+	}
+
+	/**
+	 * Test get_bf_notices banner contains time-sensitive information.
+	 */
+	public function test_get_bf_notices_contains_time_information() {
+		$this->setup_black_friday_sale_period();
+		$this->mock_date_to( clone $this->black_friday );
+		
+		$result = $this->admin->get_bf_notices( 'free' );
+		
+		$this->assertArrayHasKey( 'banner', $result );
+		$banner = $result['banner'];
+		
+		// Urgency message should contain time-related text
+		$this->assertArrayHasKey( 'urgency', $banner );
+		$this->assertStringContainsString( 'left', $banner['urgency'] );
+	}
+	/**
+	 * Test get_bf_notices sidebar has correct title format.
+	 */
+	public function test_get_bf_notices_has_correct_title_format() {
+		$this->setup_black_friday_sale_period();
+		$this->mock_date_to( clone $this->black_friday );
+		
+		$result = $this->admin->get_bf_notices( 'free' );
+		
+		$this->assertArrayHasKey( 'sidebar', $result );
+		$this->assertArrayHasKey( 'title', $result['sidebar'] );
+		$this->assertStringContainsString( 'Private Sale', $result['sidebar']['title'] );
+	}
+
+	/**
+	 * Test get_bf_notices banner has correct title format.
+	 */
+	public function test_get_bf_notices_banner_has_correct_title() {
+		$this->setup_black_friday_sale_period();
+		$this->mock_date_to( clone $this->black_friday );
+		
+		$result = $this->admin->get_bf_notices( 'free' );
+		
+		$this->assertArrayHasKey( 'banner', $result );
+		$this->assertArrayHasKey( 'title', $result['banner'] );
+		$this->assertStringContainsString( 'Black Friday', $result['banner']['title'] );
+		$this->assertStringContainsString( 'private sale', $result['banner']['title'] );
+	}
+
+
+
+	/**
+	 * Test get_bf_notices with different date scenarios.
+	 */
+	public function test_get_bf_notices_date_scenarios() {
+		$this->setup_black_friday_sale_period();
+		
+		// Test at start of sale period
+		$sale_start = clone $this->sale_start;
+		$this->mock_date_to( $sale_start );
+		
+		$result = $this->admin->get_bf_notices( 'free' );
+		$this->assertNotEmpty( $result );
+		$this->assertArrayHasKey( 'sidebar', $result );
+		
+		// Test during mid-sale
+		$black_friday_noon = clone $this->black_friday;
+		$black_friday_noon->setTime( 12, 0 );
+		$this->mock_date_to( $black_friday_noon );
+		
+		$result = $this->admin->get_bf_notices( 'free' );
+		$this->assertNotEmpty( $result );
+		$this->assertArrayHasKey( 'sidebar', $result );
+		
+		// Test near end of sale
+		$sale_end_evening = clone $this->sale_end;
+		$sale_end_evening->setTime( 23, 0 );
+		$this->mock_date_to( $sale_end_evening );
+		
+		$result = $this->admin->get_bf_notices( 'free' );
+		$this->assertNotEmpty( $result );
+		$this->assertArrayHasKey( 'sidebar', $result );
+	}
+
+	/**
+	 * Test get_bf_notices banner appears with non-'yes' dismissal values.
+	 */
+	public function test_get_bf_notices_banner_dismissal_values() {
+		$this->setup_black_friday_sale_period();
+		$this->mock_date_to( clone $this->black_friday );
+		
+		// Banner only hides when dismissal key is exactly 'yes'
+		$test_values = [ 'no', '0', '', 'dismissed' ];
+		
+		foreach ( $test_values as $value ) {
+			update_option( Optml_Admin::BF_PROMO_DISMISS_KEY, $value );
+			$result = $this->admin->get_bf_notices( 'free' );
+			$this->assertArrayHasKey( 'banner', $result, "Banner should appear when dismiss key is '$value'" );
+		}
+	}
+
+	/**
+	 * Test get_bf_notices at exact boundary conditions.
+	 */
+	public function test_get_bf_notices_date_boundaries() {
+		$this->setup_black_friday_sale_period();
+		
+		// Test exactly at midnight start
+		$exact_start = clone $this->sale_start;
+		$exact_start->setTime( 0, 0, 0 );
+		$this->mock_date_to( $exact_start );
+		
+		$result = $this->admin->get_bf_notices( 'free' );
+		$this->assertNotEmpty( $result, 'Should show notices at exact start time' );
+		
+		// Test exactly at end time
+		$exact_end = clone $this->sale_end;
+		$exact_end->setTime( 23, 59, 59 );
+		$this->mock_date_to( $exact_end );
+		
+		$result = $this->admin->get_bf_notices( 'free' );
+		$this->assertNotEmpty( $result, 'Should show notices at exact end time' );
+	}
+}
diff --git a/tests/test-rest.php b/tests/test-rest.php
deleted file mode 100644
index fd9d1794e..000000000
--- a/tests/test-rest.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-/**
- * WordPress unit test plugin.
- *
- * @package     Optimole-WP
- * @subpackage  Tests
- * @copyright   Copyright (c) 2017, ThemeIsle
- * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
- */
-
-/**
- * Class Test_Generic.
- */
-class Test_Rest extends WP_UnitTestCase
-{
-	private $server;
-
-	private $namespaced_route = '/' . OPTML_NAMESPACE . '/v1/check_redirects';
-
-	public function setUp() : void
-	{
-		parent::setUp();
-		global $wp_rest_server;
-		$this->server = $wp_rest_server = new \WP_REST_Server;
-		wp_set_current_user(  $this->factory->user->create( array( 'role' => 'administrator' ) ) );
-		Optml_Main::instance();
-		do_action( 'rest_api_init' );
-		
-	}
-	public function test_register_route() {
-		$routes = $this->server->get_routes();
-		$this->assertArrayHasKey( $this->namespaced_route, $routes );
-	}
-	public function test_endpoint_config() {
-		$the_route = $this->namespaced_route;
-		$routes = $this->server->get_routes();
-		foreach( $routes as $route => $route_config ) {
-			if( 0 === strpos( $the_route, $route ) ) {
-				$this->assertTrue( is_array( $route_config ) );
-				foreach( $route_config as  $endpoint ) {
-					$this->assertArrayHasKey( 'callback', $endpoint );
-					$this->assertArrayHasKey( 0, $endpoint[ 'callback' ] );
-					$this->assertArrayHasKey( 1, $endpoint[ 'callback' ] );
-					$this->assertTrue( is_callable( array( $endpoint[ 'callback' ][0], $endpoint[ 'callback' ][1] ) ) );
-				}
-			}
-		}
-	}
-	public function test_response_is_log () {
-		$request_body = array (
-			'images' =>
-				array (
-					'image.shutterstock.com' =>
-						array (
-							'ignoredUrls' => 1,
-						),
-					'images.pexels.com' =>
-						array (
-							'src' =>
-								array (
-									0 => 'https://mlj0r5i75kb0.i.optimole.com/w:auto/h:auto/q:mauto/f:best/https://images.pexels.com/photos/19118634/pexels-photo-19118634/free-photo-of-arhitect-arhitectura-turism-calatorie.jpeg?auto=compress&cs=tinysrgb&w=1260&h=750&dpr=1',
-									1 => 'https://mlj0r5i75kb0.i.optimole.com/w:auto/h:auto/q:mauto/f:best/https://images.pexels.com/photos/13644908/pexels-photo-13644908.jpeg?auto=compress&cs=tinysrgb&w=1260&h=750&dpr=1',
-								),
-						),
-					'odd-octopus-v7m5j.instawp.xyz' =>
-						array (
-							'ignoredUrls' => 2,
-							'src' =>
-								array (
-									0 => 'https://mlj0r5i75kb0.i.optimole.com/w:703/h:1024/q:mauto/f:best/https://odd-octopus-v7m5j.instawp.xyz/wp-content/uploads/2023/11/szm-4-b0o_zO9fkeI-unsplash.jpg',
-									1 => 'https://mlj0r5i75kb0.i.optimole.com/w:1024/h:683/q:mauto/f:best/https://odd-octopus-v7m5j.instawp.xyz/wp-content/uploads/2023/11/wesley-tingey-kVmc07SPm_A-unsplash.jpg',
-									2 => 'https://mlj0r5i75kb0.i.optimole.com/w:724/h:1024/q:mauto/f:best/https://odd-octopus-v7m5j.instawp.xyz/wp-content/uploads/2023/11/simone-hutsch-5oYbG-sEImY-unsplash.jpg'
-								),
-						),
-					'media.gettyimages.com' =>
-						array (
-							'ignoredUrls' => 1,
-						),
-				),
-		);
-
-		$request_body = json_encode($request_body);
-		$request = new WP_REST_Request( 'POST', $this->namespaced_route );
-		$request->set_header( 'X-WP-Nonce' , wp_create_nonce( 'wp_rest' ) );
-		$request->set_header( 'Content-Type' ,'application/json' );
-
-		$request->set_body( $request_body );
-
-		$response = $this->server->dispatch( $request );
-
-		$this->assertEquals( 200, $response->get_status() );
-		$data = $response->get_data();
-		$this->assertArrayHasKey( 'data', $data );
-		$this->assertArrayHasKey( 'code', $data );
-		$this->assertEquals( 'log', $data[ 'code' ] );
-		$this->assertMatchesRegularExpression( '/media.gettyimages.com/' , $data ['data'] );
-		$this->assertMatchesRegularExpression( '/image.shutterstock.com/', $data ['data'] );
-	}
-	public function test_response_is_ok () {
-		$request_body = array (
-			'images' =>
-				array (
-					'images.pexels.com' =>
-						array (
-							'src' =>
-								array (
-									0 => 'https://mlj0r5i75kb0.i.optimole.com/w:auto/h:auto/q:mauto/f:best/https://images.pexels.com/photos/19118634/pexels-photo-19118634/free-photo-of-arhitect-arhitectura-turism-calatorie.jpeg?auto=compress&cs=tinysrgb&w=1260&h=750&dpr=1',
-									1 => 'https://mlj0r5i75kb0.i.optimole.com/w:auto/h:auto/q:mauto/f:best/https://images.pexels.com/photos/13644908/pexels-photo-13644908.jpeg?auto=compress&cs=tinysrgb&w=1260&h=750&dpr=1',
-								),
-						),
-					'odd-octopus-v7m5j.instawp.xyz' =>
-						array (
-							'ignoredUrls' => 2,
-							'src' =>
-								array (
-									0 => 'https://mlj0r5i75kb0.i.optimole.com/w:703/h:1024/q:mauto/f:best/https://odd-octopus-v7m5j.instawp.xyz/wp-content/uploads/2023/11/szm-4-b0o_zO9fkeI-unsplash.jpg',
-									1 => 'https://mlj0r5i75kb0.i.optimole.com/w:1024/h:683/q:mauto/f:best/https://odd-octopus-v7m5j.instawp.xyz/wp-content/uploads/2023/11/wesley-tingey-kVmc07SPm_A-unsplash.jpg',
-									2 => 'https://mlj0r5i75kb0.i.optimole.com/w:724/h:1024/q:mauto/f:best/https://odd-octopus-v7m5j.instawp.xyz/wp-content/uploads/2023/11/simone-hutsch-5oYbG-sEImY-unsplash.jpg'
-								),
-						),
-				),
-		);
-		$request_body = json_encode($request_body);
-		$request = new WP_REST_Request( 'POST', $this->namespaced_route );
-		$request->set_header( 'X-WP-Nonce' , wp_create_nonce( 'wp_rest' ) );
-		$request->set_header( 'Content-Type' ,'application/json' );
-		$request->set_body( $request_body );
-
-		$response = $this->server->dispatch( $request );
-
-		$this->assertEquals( 200, $response->get_status() );
-		$data = $response->get_data();
-		$this->assertArrayHasKey( 'data', $data );
-		$this->assertArrayHasKey( 'code', $data );
-		$this->assertEquals( 'ok', $data[ 'code' ] );
-	}
-}