diff --git a/assets/src/dashboard/parts/connected/Sidebar.js b/assets/src/dashboard/parts/connected/Sidebar.js
index fb624245..ea7bb8b5 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/index.js b/assets/src/dashboard/parts/connected/index.js
index bdb8df09..2842db11 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/inc/admin.php b/inc/admin.php
index 4b98437f..6f9f8884 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.
 	 *
@@ -1396,6 +1406,9 @@ private function localize_dashboard_app() {
 			$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/',
@@ -1432,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' ),
@@ -1443,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() ),
 		];
 	}
 
@@ -1535,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', 'optimole-wp' ) . '</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' ) ),
+			'subtitle' => $message,
+			'cta_text' => $cta_text,
+			'cta_link' => $cta_link,
 			'dismiss_key' => self::BF_PROMO_DISMISS_KEY,
 		];
 
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 9530f1e8..deb5805c 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 00000000..965b1ad5
--- /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' );
+	}
+}