diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index e51fe08..4952da3 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       JAVA_VERSION: "17"
-      FLUTTER_VERSION: "3.32.5"
+      FLUTTER_VERSION: "3.38.5"
 
     steps:
       - uses: actions/checkout@v4
diff --git a/README.md b/README.md
index 6cd6244..1c0b827 100644
--- a/README.md
+++ b/README.md
@@ -8,67 +8,3 @@ Billion Sport Live brings you the thrill of live sports right to your fingertips
 - **Catch Up with Free Highlights** – Missed the match? No worries! Billion Sport Live offers free highlight videos, so you can relive every key moment.
 
 Stay connected to the sports you love, anytime, anywhere, with Billion Sport Live. Download now and never miss a game again!
-
-### Remote Config
-
-```json
-{
-  "live_match_list_page": "{     \"native\": true,     \"banner\": true,     \"interstitial\": true,     \"rewarded\": true }",
-  "live_match_detail_page": "{     \"native\": true,     \"banner\": true,     \"interstitial\": true,     \"rewarded\": true }",
-  "highlight_list_page": "{     \"native\": true,     \"banner\": true,     \"interstitial\": true,     \"rewarded\": true }",
-  "latest_build": "10",
-  "latest_version": "1.0.9",
-  "force_update": "true",
-  "banner_ad": "ca-app-pub-7567997114394639/8648546201",
-  "interstitial_ad": "ca-app-pub-7567997114394639/1475405831",
-  "native_ad": "ca-app-pub-7567997114394639/9425876604",
-  "rewarded_ad": "ca-app-pub-7567997114394639/8288226195",
-  "show_ads": "true",
-  "app_open_ad": "ca-app-pub-7567997114394639/7748304172",
-  "show_app_open_ad": "true",
-  "show_banner_ad": "true",
-  "show_native_ad": "true",
-  "show_interstitial_ad": "true",
-  "show_rewarded_ad": "true",
-  "show_ads_in_match_list": "true",
-  "show_ads_in_match_detail": "true",
-  "show_ads_in_highlight_list": "true"
-}
-```
-
-
-### Test Deep Links
-
-Test `bsl://open.bsl.app:`
-
-Use ADB to simulate the custom schema:
-
-```bash
-adb shell am start -a android.intent.action.VIEW -d "bsl://open.bsl.app" com.billion.sport_live
-```
-
-Test `bsl://kyawzayartun.com:`
-
-Use ADB for the HTTPS link:
-
-```bash
-adb shell am start -a android.intent.action.VIEW -d "bsl://kyawzayartun.com" com.billion.sport_live
-```
-
-```bash
-adb shell am start -a android.intent.action.VIEW -d "https://play.google.com/store/apps/details?id=com.billion.sport_live" com.billion.sport_live
-```
-
-### Test App Links
-
-**Test with ADB:**
-
-Run the following command to test:
-
-```bash
-adb shell am start -a android.intent.action.VIEW -d "https://www.kyawzayartun.com/bsl" com.billion.sport_live
-```
-
-```bash
-adb shell am start -a android.intent.action.VIEW -d "https://kyawzayartun.com/bsl" com.billion.sport_live
-```
diff --git a/analysis_options.yaml b/analysis_options.yaml
index 6367359..3771ab6 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -10,7 +10,10 @@ analyzer:
   errors:
     invalid_annotation_target: ignore
   plugins:
-    - custom_lint
+    - riverpod_lint
 
 linter:
   rules:
+
+plugins:
+  riverpod_lint: ^3.1.0
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 76b1829..b7da84a 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -18,16 +18,15 @@ if (keystorePropertiesFile.exists()) {
 android {
     namespace = "com.billion.sport_live"
     compileSdk = flutter.compileSdkVersion
-    ndkVersion = "27.0.12077973"
-    // ndkVersion = flutter.ndkVersion
+    ndkVersion = flutter.ndkVersion
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11
+        jvmTarget = JavaVersion.VERSION_17
     }
 
     defaultConfig {
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index e70ddcf..2755350 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -4,9 +4,6 @@
     <!-- permissions -->
     <uses-permission android:name="android.permission.INTERNET" />
 
-    <!-- Ads Permission for Android 12 or higher -->
-    <uses-permission android:name="com.google.android.gms.permission.AD_ID" />
-
     <application
         android:label="${appLabel}"
         android:name="${applicationName}"
@@ -34,82 +31,12 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-
-            <meta-data
-                android:name="flutter_deeplinking_enabled"
-                android:value="false" />
-
-            <!-- Deep Link -->
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:scheme="bsl"
-                    android:host="open.bsl.app" />
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:scheme="bsl"
-                    android:host="kyawzayartun.com" />
-            </intent-filter>
-
-            <!-- <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:scheme="https"
-                    android:host="play.google.com"
-                    android:pathPrefix="/store/apps/details" />
-            </intent-filter> -->
-            <!-- Deep Link -->
-
-            <!-- App Link -->
-            <intent-filter android:autoVerify="true">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="https" />
-                <data android:host="kyawzayartun.com" />
-                <data android:pathPrefix="/bsl" />
-            </intent-filter>
-
-            <intent-filter android:autoVerify="true">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="https" />
-                <data android:host="www.kyawzayartun.com" />
-                <data android:pathPrefix="/bsl" />
-            </intent-filter>
-            <!-- App Link -->
         </activity>
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />
-
-        <!-- <meta-data
-            android:name="com.onesignal.NotificationServiceExtension"
-            android:value="com.billion.sport_live.NotificationServiceExtension" /> -->
-
-        <meta-data
-            android:name="com.google.android.gms.ads.APPLICATION_ID"
-            android:value="ca-app-pub-7567997114394639~4616995952" />
     </application>
     <!-- Required to query activities that can process text, see:
          https://developer.android.com/training/package-visibility and
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index afa1e8e..e4ef43f 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip
diff --git a/android/settings.gradle b/android/settings.gradle
index b56f21f..999d15d 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -18,13 +18,13 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.7.1" apply false
+    id "com.android.application" version "8.11.1" apply false
     // START: FlutterFire Configuration
     id "com.google.gms.google-services" version "4.4.2" apply false
     id "com.google.firebase.crashlytics" version "2.8.1" apply false
     // id "com.google.gms.google-services" version "4.3.15" apply false
     // END: FlutterFire Configuration
-    id "org.jetbrains.kotlin.android" version "1.8.22" apply false
+    id "org.jetbrains.kotlin.android" version "2.2.20" apply false
 }
 
 include ":app"
diff --git a/lib/main.dart b/lib/main.dart
index b8b18ec..3392a8b 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -12,7 +12,6 @@ import 'package:shared_preferences/shared_preferences.dart';
 import 'package:vs_live/firebase_options.dart';
 import 'package:vs_live/src/errors/async_error_logger.dart';
 import 'package:vs_live/src/errors/error_logger.dart';
-import 'package:vs_live/src/utils/ads/ad_helper.dart';
 import 'package:vs_live/src/utils/localization/string_hardcoded.dart';
 
 import 'src/app.dart';
@@ -29,7 +28,6 @@ Future<void> main() async {
   await Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform);
 
   unawaited(AppRemoteConfig.initConfig());
-  unawaited(AdHelper.initAds());
 
   // turn off the # in the URLs on the web
   usePathUrlStrategy();
diff --git a/lib/src/app.dart b/lib/src/app.dart
index 6c05c7f..85d04d4 100644
--- a/lib/src/app.dart
+++ b/lib/src/app.dart
@@ -11,7 +11,6 @@ import 'package:vs_live/src/routing/app_router.dart';
 import 'package:vs_live/src/routing/app_startup.dart';
 import 'package:vs_live/src/update/presentation/force_update_widget.dart';
 import 'package:vs_live/src/update/utils/force_update_client.dart';
-import 'package:vs_live/src/utils/ads/app_open_ad_widget.dart';
 import 'package:vs_live/src/utils/remote_config/remote_config.dart';
 import 'package:vs_live/src/widgets/dialog/show_alert_dialog.dart';
 import 'package:wiredash/wiredash.dart';
@@ -83,7 +82,7 @@ class MyApp extends ConsumerWidget {
                     onException: (e, st) {
                       log(e.toString());
                     },
-                    child: AppOpenAdWidget(child: child!),
+                    child: child!,
                   ),
             ),
           );
diff --git a/lib/src/errors/async_error_logger.dart b/lib/src/errors/async_error_logger.dart
index 35f5a5c..92ab7c9 100644
--- a/lib/src/errors/async_error_logger.dart
+++ b/lib/src/errors/async_error_logger.dart
@@ -3,15 +3,14 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'error_logger.dart';
 import 'exceptions.dart';
 
-class AsyncErrorLogger extends ProviderObserver {
+final class AsyncErrorLogger extends ProviderObserver {
   @override
   void didUpdateProvider(
-    ProviderBase<Object?> provider,
+    ProviderObserverContext context,
     Object? previousValue,
     Object? newValue,
-    ProviderContainer container,
   ) {
-    final errorLogger = container.read(errorLoggerProvider);
+    final errorLogger = AppErrorLogger();
     final error = _findError(newValue);
     if (error != null) {
       if (error.error is AppException) {
diff --git a/lib/src/errors/error_logger.dart b/lib/src/errors/error_logger.dart
index 58c0044..73ae8b2 100644
--- a/lib/src/errors/error_logger.dart
+++ b/lib/src/errors/error_logger.dart
@@ -1,6 +1,5 @@
 import 'dart:developer' as developer;
 
-import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 import 'exceptions.dart';
diff --git a/lib/src/features/football_highlight/data/football_highlight_repository.dart b/lib/src/features/football_highlight/data/football_highlight_repository.dart
index 65b3eeb..71ea24a 100644
--- a/lib/src/features/football_highlight/data/football_highlight_repository.dart
+++ b/lib/src/features/football_highlight/data/football_highlight_repository.dart
@@ -1,7 +1,6 @@
 import 'dart:developer' as developer;
 
 import 'package:dio/dio.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:vs_live/src/errors/exceptions.dart';
 import 'package:vs_live/src/features/football_highlight/domain/football_highlight.dart';
@@ -10,9 +9,8 @@ import 'package:vs_live/src/utils/dio_client/highlight_client/highlight_dio_clie
 part 'football_highlight_repository.g.dart';
 
 class FootballHighlightRepository {
-  FootballHighlightRepository({
-    Dio? dioClient,
-  }) : _client = dioClient ??= HighlightDioClient().instance;
+  FootballHighlightRepository({Dio? dioClient})
+    : _client = dioClient ??= HighlightDioClient().instance;
 
   final Dio _client;
 
@@ -21,9 +19,10 @@ class FootballHighlightRepository {
       final response = await _client.get('/', cancelToken: cancelToken);
 
       final data = response.data as List<dynamic>;
-      final result = data
-          .map((e) => FootballHighlight.fromJson(e as Map<String, dynamic>))
-          .toList();
+      final result =
+          data
+              .map((e) => FootballHighlight.fromJson(e as Map<String, dynamic>))
+              .toList();
 
       return result;
     } on DioException catch (error) {
@@ -41,9 +40,6 @@ class FootballHighlightRepository {
 }
 
 @riverpod
-FootballHighlightRepository footballHighlightRepository(
-  Ref ref,
-  Dio? client,
-) {
+FootballHighlightRepository footballHighlightRepository(Ref ref, Dio? client) {
   return FootballHighlightRepository(dioClient: client);
 }
diff --git a/lib/src/features/football_highlight/presentation/feed/highlight_feed_screen.dart b/lib/src/features/football_highlight/presentation/feed/highlight_feed_screen.dart
index 380d96e..f8b7c49 100644
--- a/lib/src/features/football_highlight/presentation/feed/highlight_feed_screen.dart
+++ b/lib/src/features/football_highlight/presentation/feed/highlight_feed_screen.dart
@@ -1,19 +1,14 @@
-import 'dart:developer';
-
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
-import 'package:google_mobile_ads/google_mobile_ads.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:vs_live/src/config/constants/app_sizes.dart';
 import 'package:vs_live/src/features/football_highlight/domain/football_highlight.dart';
 import 'package:vs_live/src/features/football_highlight/presentation/feed/highlight_feed_providers.dart';
 import 'package:vs_live/src/features/football_highlight/presentation/feed/widgets/football_highlights_list.dart';
 import 'package:vs_live/src/routing/app_router.dart';
-import 'package:vs_live/src/utils/ads/ad_helper.dart';
 import 'package:vs_live/src/utils/analytics_util.dart';
 import 'package:vs_live/src/utils/localization/string_hardcoded.dart';
-import 'package:vs_live/src/utils/remote_config/remote_config.dart';
 import 'package:vs_live/src/widgets/theme/theme_mode_switch_button.dart';
 import 'package:wiredash/wiredash.dart';
 
@@ -27,60 +22,11 @@ class HighlightFeedScreen extends StatefulWidget {
 class _HighlightFeedScreenState extends State<HighlightFeedScreen> {
   int _selectedView = 0;
 
-  BannerAd? _bannerAd;
-  bool _isBannerAdLoaded = false;
-
-  NativeAd? _nativeAd;
-  bool _isNativeAdLoaded = false;
-
   @override
   void initState() {
     // Record a visit to this page.
-    AnalyticsUtil.logScreenView(
-      screenName: 'HighlightFeedScreen',
-    );
+    AnalyticsUtil.logScreenView(screenName: 'HighlightFeedScreen');
     super.initState();
-
-    if (!AppRemoteConfig.hideAdsInHighlightList) {
-      final pageAdsInfo = AppRemoteConfig.highlightListAdsInfo;
-      if (pageAdsInfo.native) {
-        loadNativeAd();
-      }
-
-      if (pageAdsInfo.banner) {
-        loadBannerAd();
-      }
-    }
-  }
-
-  Future<void> loadBannerAd() async {
-    final ad = AdHelper.loadBannerAd(onLoaded: () {
-      log("banner ad loaded");
-      setState(() {
-        _isBannerAdLoaded = true;
-      });
-    });
-    setState(() {
-      _bannerAd = ad;
-    });
-  }
-
-  void loadNativeAd() {
-    final ad = AdHelper.loadNativeAd(onLoaded: () {
-      setState(() {
-        _isNativeAdLoaded = true;
-      });
-    });
-    setState(() {
-      _nativeAd = ad;
-    });
-  }
-
-  @override
-  void dispose() {
-    _bannerAd?.dispose();
-    _nativeAd?.dispose();
-    super.dispose();
   }
 
   @override
@@ -89,6 +35,7 @@ class _HighlightFeedScreenState extends State<HighlightFeedScreen> {
 
     return Scaffold(
       floatingActionButton: FloatingActionButton(
+        heroTag: 'highlight-feed-fab',
         onPressed: () {
           Wiredash.of(context).show(inheritMaterialTheme: true);
         },
@@ -117,9 +64,7 @@ class _HighlightFeedScreenState extends State<HighlightFeedScreen> {
               automaticallyImplyLeading: false,
               title: Row(
                 children: [
-                  const Expanded(
-                    child: HighlightsSearchField(),
-                  ),
+                  const Expanded(child: HighlightsSearchField()),
                   const SizedBox(width: 10),
                   Padding(
                     padding: const EdgeInsets.only(right: Sizes.p8),
@@ -138,10 +83,7 @@ class _HighlightFeedScreenState extends State<HighlightFeedScreen> {
                       children: [
                         Tooltip(
                           message: "Grid".hardcoded,
-                          child: const Icon(
-                            Icons.grid_view_outlined,
-                            size: 20,
-                          ),
+                          child: const Icon(Icons.grid_view_outlined, size: 20),
                         ),
                         Tooltip(
                           message: "List".hardcoded,
@@ -157,38 +99,14 @@ class _HighlightFeedScreenState extends State<HighlightFeedScreen> {
           Consumer(
             builder: (context, ref, child) {
               return CupertinoSliverRefreshControl(
-                onRefresh: () =>
-                    ref.refresh(getAllHighlightsFeedProvider.future),
+                onRefresh:
+                    () => ref.refresh(getAllHighlightsFeedProvider.future),
               );
             },
           ),
-          SliverList.list(children: [
-            if (_bannerAd != null && _isBannerAdLoaded)
-              SizedBox(
-                width: double.infinity,
-                height: _bannerAd!.size.height.toDouble(),
-                child: AdWidget(ad: _bannerAd!),
-              ),
-            const SizedBox(height: 20),
-          ]),
           FootballHighlightsList(
             viewType: isGridView ? ViewType.grid : ViewType.list,
           ),
-          if (_nativeAd != null && _isNativeAdLoaded)
-            SliverList.list(
-              children: [
-                Padding(
-                  padding: const EdgeInsets.symmetric(
-                    horizontal: Sizes.p16,
-                    vertical: Sizes.p16,
-                  ),
-                  child: SizedBox(
-                    height: 400,
-                    child: AdWidget(ad: _nativeAd!),
-                  ),
-                ),
-              ],
-            ),
         ],
       ),
     );
@@ -196,9 +114,7 @@ class _HighlightFeedScreenState extends State<HighlightFeedScreen> {
 }
 
 class HighlightsSearchField extends ConsumerStatefulWidget {
-  const HighlightsSearchField({
-    super.key,
-  });
+  const HighlightsSearchField({super.key});
 
   @override
   ConsumerState<HighlightsSearchField> createState() =>
@@ -211,8 +127,10 @@ class _CustomSearchFieldState extends ConsumerState<HighlightsSearchField> {
   @override
   Widget build(BuildContext context) {
     final state = ref.watch(getAllHighlightsFeedProvider);
-    final List<FootballHighlight> data =
-        state.maybeWhen(orElse: () => [], data: (data) => data);
+    final List<FootballHighlight> data = state.maybeWhen(
+      orElse: () => [],
+      data: (data) => data,
+    );
 
     return CupertinoSearchTextField(
       controller: _searchController,
diff --git a/lib/src/features/football_highlight/presentation/feed/widgets/football_highlights_list.dart b/lib/src/features/football_highlight/presentation/feed/widgets/football_highlights_list.dart
index dd59db4..c568d50 100644
--- a/lib/src/features/football_highlight/presentation/feed/widgets/football_highlights_list.dart
+++ b/lib/src/features/football_highlight/presentation/feed/widgets/football_highlights_list.dart
@@ -10,16 +10,10 @@ import 'package:vs_live/src/widgets/error_status_icon_widget.dart';
 import 'highlight_grid_view.dart';
 import 'highlight_list_view.dart';
 
-enum ViewType {
-  list,
-  grid,
-}
+enum ViewType { list, grid }
 
 class FootballHighlightsList extends ConsumerStatefulWidget {
-  const FootballHighlightsList({
-    super.key,
-    this.viewType = ViewType.grid,
-  });
+  const FootballHighlightsList({super.key, this.viewType = ViewType.grid});
 
   final ViewType viewType;
 
@@ -34,19 +28,16 @@ class _FootballHighlightsListState
 
   @override
   Widget build(BuildContext context) {
-    ref.listen(
-      getAllHighlightsFeedProvider,
-      (prev, state) {
-        // state.showAlertDialogOnError(context);
+    ref.listen(getAllHighlightsFeedProvider, (prev, state) {
+      // state.showAlertDialogOnError(context);
 
-        setState(() {
-          _highlights = state.maybeWhen(
-            orElse: () => prev?.valueOrNull ?? [],
-            data: (data) => data,
-          );
-        });
-      },
-    );
+      setState(() {
+        _highlights = state.maybeWhen(
+          orElse: () => prev?.value ?? [],
+          data: (data) => data,
+        );
+      });
+    });
 
     final state = ref.watch(getAllHighlightsFeedProvider);
     final searchState = ref.watch(searchHighlightsProvider);
@@ -55,23 +46,23 @@ class _FootballHighlightsListState
       AsyncData(:final value) when value.isNotEmpty =>
         widget.viewType == ViewType.grid
             ? HighlightGridView(
-                highlights: searchState.isNotEmpty ? searchState : _highlights)
+              highlights: searchState.isNotEmpty ? searchState : _highlights,
+            )
             : HighlightListView(
-                highlights: searchState.isNotEmpty ? searchState : _highlights),
-      AsyncLoading() => _highlights.isEmpty
-          ? SliverList.list(
-              children: const [CupertinoActivityIndicator()],
+              highlights: searchState.isNotEmpty ? searchState : _highlights,
+            ),
+      AsyncLoading() =>
+        _highlights.isEmpty
+            ? SliverList.list(children: const [CupertinoActivityIndicator()])
+            : widget.viewType == ViewType.grid
+            ? HighlightGridView(
+              highlights: searchState.isNotEmpty ? searchState : _highlights,
             )
-          : widget.viewType == ViewType.grid
-              ? HighlightGridView(
-                  highlights:
-                      searchState.isNotEmpty ? searchState : _highlights,
-                )
-              : HighlightListView(
-                  highlights:
-                      searchState.isNotEmpty ? searchState : _highlights,
-                ),
-      AsyncError(:final error, stackTrace: var _) => SliverList.list(children: [
+            : HighlightListView(
+              highlights: searchState.isNotEmpty ? searchState : _highlights,
+            ),
+      AsyncError(:final error, stackTrace: var _) => SliverList.list(
+        children: [
           Padding(
             padding: const EdgeInsets.all(Sizes.p16),
             child: Column(
@@ -86,51 +77,50 @@ class _FootballHighlightsListState
                 ),
                 const SizedBox(height: Sizes.p16),
                 FilledButton(
-                  onPressed: () =>
-                      ref.refresh(getAllHighlightsFeedProvider.future),
+                  onPressed:
+                      () => ref.refresh(getAllHighlightsFeedProvider.future),
                   child: Text("Try again".hardcoded),
                 ),
               ],
             ),
           ),
-        ]),
+        ],
+      ),
       _ => SliverList.list(
-          children: [
-            Padding(
-              padding: const EdgeInsets.all(Sizes.p16),
-              child: Column(
-                mainAxisAlignment: MainAxisAlignment.center,
-                children: [
-                  const ErrorStatusIconWidget(
-                    icon: Icons.sports_soccer_outlined,
-                  ),
-                  const SizedBox(height: Sizes.p16),
-                  Text(
-                    "No highlights available from the server".hardcoded,
-                    textAlign: TextAlign.center,
-                    style: Theme.of(context).textTheme.bodyLarge,
-                  ),
-                  const SizedBox(height: Sizes.p4),
-                  Text(
-                    "Please come back later".hardcoded,
-                    textAlign: TextAlign.center,
-                    style: Theme.of(context).textTheme.labelLarge?.copyWith(
-                        color: Theme.of(context)
-                            .colorScheme
-                            .onSurface
-                            .withValues(alpha: 0.7)),
-                  ),
-                  const SizedBox(height: Sizes.p16),
-                  FilledButton(
-                    onPressed: () =>
-                        ref.refresh(getAllHighlightsFeedProvider.future),
-                    child: Text("Refresh".hardcoded),
+        children: [
+          Padding(
+            padding: const EdgeInsets.all(Sizes.p16),
+            child: Column(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                const ErrorStatusIconWidget(icon: Icons.sports_soccer_outlined),
+                const SizedBox(height: Sizes.p16),
+                Text(
+                  "No highlights available from the server".hardcoded,
+                  textAlign: TextAlign.center,
+                  style: Theme.of(context).textTheme.bodyLarge,
+                ),
+                const SizedBox(height: Sizes.p4),
+                Text(
+                  "Please come back later".hardcoded,
+                  textAlign: TextAlign.center,
+                  style: Theme.of(context).textTheme.labelLarge?.copyWith(
+                    color: Theme.of(
+                      context,
+                    ).colorScheme.onSurface.withValues(alpha: 0.7),
                   ),
-                ],
-              ),
+                ),
+                const SizedBox(height: Sizes.p16),
+                FilledButton(
+                  onPressed:
+                      () => ref.refresh(getAllHighlightsFeedProvider.future),
+                  child: Text("Refresh".hardcoded),
+                ),
+              ],
             ),
-          ],
-        ),
+          ),
+        ],
+      ),
     };
   }
 }
diff --git a/lib/src/features/football_highlight/presentation/feed/widgets/highlight_grid_view.dart b/lib/src/features/football_highlight/presentation/feed/widgets/highlight_grid_view.dart
index 471fb11..f6ceea6 100644
--- a/lib/src/features/football_highlight/presentation/feed/widgets/highlight_grid_view.dart
+++ b/lib/src/features/football_highlight/presentation/feed/widgets/highlight_grid_view.dart
@@ -19,113 +19,8 @@ class HighlightGridView extends ConsumerStatefulWidget {
 }
 
 class _HighlightGridViewState extends ConsumerState<HighlightGridView> {
-  // final Map<int, NativeAd> _nativeAds = {}; // Map to hold NativeAd instances
-  // final Set<int> _adIndices = {}; // Positions to insert ads
-  // final Map<int, bool> _isAdLoaded = {}; // Tracks ad load states
-
-  // final Map<int, BannerAd> _bannerAds = {};
-  // final Map<int, bool> _isBannerAdLoaded = {};
-
-  // @override
-  // void initState() {
-  //   super.initState();
-
-  //   for (int i = 0; i < widget.highlights.length; i++) {
-  //     if ((i + 1) % 5 == 0) {
-  //       _adIndices.add(i + 1);
-  //     }
-  //   }
-
-  //   // Load ads at specified positions
-  //   for (int index in _adIndices) {
-  //     // _loadNativeAd(index);
-  //     _loadBannerAd(index);
-  //   }
-  // }
-
-  // void _loadNativeAd(int index) {
-  //   NativeAd nativeAd = NativeAd(
-  //     adUnitId: AppRemoteConfig.nativeId,
-  //     request: const AdRequest(),
-  //     listener: NativeAdListener(
-  //       onAdLoaded: (_) {
-  //         setState(() {
-  //           _isAdLoaded[index] = true;
-  //         });
-  //       },
-  //       onAdFailedToLoad: (ad, error) {
-  //         ad.dispose();
-  //         setState(() {
-  //           _isAdLoaded[index] = false;
-  //         });
-  //         log('Native Ad failed to load at index $index: $error');
-  //       },
-  //     ),
-  //     nativeTemplateStyle: NativeTemplateStyle(
-  //       templateType: TemplateType.medium,
-  //     ),
-  //   );
-  //   nativeAd.load();
-
-  //   setState(() {
-  //     _nativeAds[index] = nativeAd;
-  //   });
-  // }
-
-  // void _loadBannerAd(int index) {
-  //   final bannerAd = BannerAd(
-  //     adUnitId: AppRemoteConfig.bannerId,
-  //     request: const AdRequest(),
-  //     size: AdSize.banner,
-  //     listener: BannerAdListener(
-  //       // Called when an ad is successfully received.
-  //       onAdLoaded: (ad) {
-  //         debugPrint('$ad loaded.');
-  //         setState(() {
-  //           _isBannerAdLoaded[index] = true;
-  //         });
-  //       },
-  //       // Called when an ad request failed.
-  //       onAdFailedToLoad: (ad, err) {
-  //         debugPrint('BannerAd failed to load: $err');
-  //         setState(() {
-  //           _isBannerAdLoaded[index] = false;
-  //         });
-  //         // Dispose the ad here to free resources.
-  //         ad.dispose();
-  //       },
-  //     ),
-  //   )..load();
-
-  //   setState(() {
-  //     _bannerAds[index] = bannerAd;
-  //   });
-  // }
-
-  @override
-  void dispose() {
-    // Dispose all ads
-    // for (var ad in _nativeAds.values) {
-    //   ad.dispose();
-    // }
-    // for (var ad in _bannerAds.values) {
-    //   ad.dispose();
-    // }
-    super.dispose();
-  }
-
   @override
   Widget build(BuildContext context) {
-    // Create a mixed list of items and ads
-    // final List<dynamic> gridItems = [];
-    // for (int i = 0; i < widget.highlights.length; i++) {
-    //   gridItems.add(HighlightGridItem(highlight: widget.highlights[i]));
-
-    //   if (_adIndices.contains(i)) {
-    //     gridItems.add("ad-$i"); // Ad placeholder for position tracking
-    //   }
-    // }
-
     return SliverGrid.builder(
       gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
         crossAxisCount: 2,
@@ -144,17 +39,6 @@ class _HighlightGridViewState extends ConsumerState<HighlightGridView> {
         );
       },
     );
-
-    // return SliverToBoxAdapter(
-    //   child: Padding(
-    //     padding: const EdgeInsets.symmetric(horizontal: 8),
-    //     child: StaggeredGridViewWithBannerAds(
-    //       gridItems: gridItems,
-    //       bannerAds: _bannerAds,
-    //       isAdLoaded: _isBannerAdLoaded,
-    //     ),
-    //   ),
-    // );
   }
 }
 
@@ -170,9 +54,7 @@ class HighlightGridItem extends ConsumerWidget {
       onTap: () {
         context.pushNamed(
           AppRoute.highlightPlayer.name,
-          queryParameters: {
-            "embedVideo": highlight.embed,
-          },
+          queryParameters: {"embedVideo": highlight.embed},
         );
       },
       child: GlassmorphicContainer(
@@ -201,10 +83,9 @@ class HighlightGridItem extends ConsumerWidget {
             // backgroundColor: Theme.of(context).cardColor,
             title: Text(
               highlight.competition.name,
-              style: Theme.of(context)
-                  .textTheme
-                  .labelLarge
-                  ?.copyWith(color: Theme.of(context).colorScheme.primary),
+              style: Theme.of(context).textTheme.labelLarge?.copyWith(
+                color: Theme.of(context).colorScheme.primary,
+              ),
             ),
           ),
           footer: GridTileBar(
@@ -220,24 +101,27 @@ class HighlightGridItem extends ConsumerWidget {
                 Text(
                   Format.format(DateTime.parse(highlight.date)),
                   style: Theme.of(context).textTheme.labelMedium?.copyWith(
-                      color: Theme.of(context).colorScheme.secondary),
+                    color: Theme.of(context).colorScheme.secondary,
+                  ),
                 ),
               ],
             ),
           ),
           child: CachedNetworkImage(
             imageUrl: highlight.thumbnail,
-            imageBuilder: (context, imageProvider) => Container(
-              decoration: BoxDecoration(
-                image: DecorationImage(
-                  image: imageProvider,
-                  fit: BoxFit.contain,
+            imageBuilder:
+                (context, imageProvider) => Container(
+                  decoration: BoxDecoration(
+                    image: DecorationImage(
+                      image: imageProvider,
+                      fit: BoxFit.contain,
+                    ),
+                  ),
                 ),
-              ),
-            ),
             placeholder: (context, url) => const CupertinoActivityIndicator(),
-            errorWidget: (context, url, error) =>
-                const Icon(Icons.broken_image_outlined),
+            errorWidget:
+                (context, url, error) =>
+                    const Icon(Icons.broken_image_outlined),
           ),
         ),
       ),
diff --git a/lib/src/features/live_match/data/live_match_repository.dart b/lib/src/features/live_match/data/live_match_repository.dart
index 5270f14..9fe3076 100644
--- a/lib/src/features/live_match/data/live_match_repository.dart
+++ b/lib/src/features/live_match/data/live_match_repository.dart
@@ -1,7 +1,6 @@
 import 'dart:developer' as developer;
 
 import 'package:dio/dio.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:vs_live/src/errors/exceptions.dart';
 import 'package:vs_live/src/features/live_match/domain/live_match.dart';
@@ -11,9 +10,8 @@ import 'package:vs_live/src/utils/dio_client/dio_client.dart';
 part 'live_match_repository.g.dart';
 
 class LiveMatchRepository {
-  LiveMatchRepository({
-    Dio? dioClient,
-  }) : _client = dioClient ??= DioClient().instance;
+  LiveMatchRepository({Dio? dioClient})
+    : _client = dioClient ??= DioClient().instance;
 
   final Dio _client;
 
@@ -26,21 +24,18 @@ class LiveMatchRepository {
     try {
       final response = await _client.get(
         '/api/matches',
-        queryParameters: presentQueryParams
-            ? {
-                "page": page,
-                "limit": limit,
-              }
-            : null,
+        queryParameters:
+            presentQueryParams ? {"page": page, "limit": limit} : null,
       );
 
       final result = AppResponse<List<LiveMatch>>.fromJson(
         response.data,
-        (dynamic json) => response.data["success"] && json != null
-            ? (json as List<dynamic>)
-                .map((e) => LiveMatch.fromJson(e as Map<String, dynamic>))
-                .toList()
-            : [],
+        (dynamic json) =>
+            response.data["success"] && json != null
+                ? (json as List<dynamic>)
+                    .map((e) => LiveMatch.fromJson(e as Map<String, dynamic>))
+                    .toList()
+                : [],
       );
 
       if (result.success) {
@@ -66,9 +61,6 @@ class LiveMatchRepository {
 }
 
 @riverpod
-LiveMatchRepository liveMatchRepository(
-  Ref ref,
-  Dio? client,
-) {
+LiveMatchRepository liveMatchRepository(Ref ref, Dio? client) {
   return LiveMatchRepository(dioClient: client);
 }
diff --git a/lib/src/features/live_match/presentation/live_match_detail/live_match_detail_screen.dart b/lib/src/features/live_match/presentation/live_match_detail/live_match_detail_screen.dart
index 0047387..f06afb3 100644
--- a/lib/src/features/live_match/presentation/live_match_detail/live_match_detail_screen.dart
+++ b/lib/src/features/live_match/presentation/live_match_detail/live_match_detail_screen.dart
@@ -2,25 +2,19 @@ import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
-import 'package:google_mobile_ads/google_mobile_ads.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:vs_live/src/config/constants/app_sizes.dart';
 import 'package:vs_live/src/features/live_match/domain/live_match.dart';
 import 'package:vs_live/src/features/live_match/presentation/widgets/match_info_widget.dart';
 import 'package:vs_live/src/routing/app_router.dart';
-import 'package:vs_live/src/utils/ads/ad_helper.dart';
 import 'package:vs_live/src/utils/analytics_util.dart';
 import 'package:vs_live/src/utils/format.dart';
 import 'package:vs_live/src/utils/localization/string_hardcoded.dart';
-import 'package:vs_live/src/utils/remote_config/remote_config.dart';
 import 'package:vs_live/src/widgets/error_status_icon_widget.dart';
 import 'package:vs_live/src/widgets/video_player/adaptive_video_player.dart';
 
 class LiveMatchDetailScreen extends ConsumerStatefulWidget {
-  const LiveMatchDetailScreen({
-    super.key,
-    required this.match,
-  });
+  const LiveMatchDetailScreen({super.key, required this.match});
 
   final LiveMatch match;
 
@@ -32,61 +26,11 @@ class LiveMatchDetailScreen extends ConsumerStatefulWidget {
 class _LiveMatchDetailScreenState extends ConsumerState<LiveMatchDetailScreen> {
   late Widget videoWidget;
 
-  NativeAd? _nativeAd;
-  bool _isNativeAdLoaded = false;
-
-  BannerAd? _bannerAd;
-  bool _isBannerAdLoaded = false;
-
   @override
   void initState() {
     // Record a visit to this page.
-    AnalyticsUtil.logScreenView(
-      screenName: 'LiveMatchDetailScreen',
-    );
+    AnalyticsUtil.logScreenView(screenName: 'LiveMatchDetailScreen');
     super.initState();
-
-    if (!AppRemoteConfig.hideAdsInMatchDetail) {
-      final pageAdsInfo = AppRemoteConfig.liveMatchDetailAdsInfo;
-      if (pageAdsInfo.native) {
-        loadNativeAd();
-      }
-
-      if (pageAdsInfo.banner) {
-        loadBannerAd();
-      }
-    }
-  }
-
-  void loadNativeAd() {
-    final ad = AdHelper.loadNativeAd(onLoaded: () {
-      setState(() {
-        _isNativeAdLoaded = true;
-      });
-    });
-
-    setState(() {
-      _nativeAd = ad;
-    });
-  }
-
-  void loadBannerAd() {
-    final ad = AdHelper.loadBannerAd(onLoaded: () {
-      setState(() {
-        _isBannerAdLoaded = true;
-      });
-    });
-
-    setState(() {
-      _bannerAd = ad;
-    });
-  }
-
-  @override
-  void dispose() {
-    _bannerAd?.dispose();
-    _nativeAd?.dispose();
-    super.dispose();
   }
 
   @override
@@ -104,9 +48,7 @@ class _LiveMatchDetailScreenState extends ConsumerState<LiveMatchDetailScreen> {
           child: Column(
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
-              const ErrorStatusIconWidget(
-                icon: Icons.sports_soccer_outlined,
-              ),
+              const ErrorStatusIconWidget(icon: Icons.sports_soccer_outlined),
               const SizedBox(height: Sizes.p16),
               Text(
                 "No available links found".hardcoded,
@@ -118,10 +60,10 @@ class _LiveMatchDetailScreenState extends ConsumerState<LiveMatchDetailScreen> {
                 "May be the match has not been started yet".hardcoded,
                 textAlign: TextAlign.center,
                 style: Theme.of(context).textTheme.labelLarge?.copyWith(
-                    color: Theme.of(context)
-                        .colorScheme
-                        .onSurface
-                        .withValues(alpha: 0.7)),
+                  color: Theme.of(
+                    context,
+                  ).colorScheme.onSurface.withValues(alpha: 0.7),
+                ),
               ),
             ],
           ),
@@ -149,46 +91,46 @@ class _LiveMatchDetailScreenState extends ConsumerState<LiveMatchDetailScreen> {
                     children: [
                       CachedNetworkImage(
                         imageUrl: widget.match.league.logo,
-                        imageBuilder: (context, imageProvider) => Container(
-                          width: 30,
-                          height: 30,
-                          decoration: BoxDecoration(
-                            image: DecorationImage(
-                              image: imageProvider,
-                              fit: BoxFit.contain,
+                        imageBuilder:
+                            (context, imageProvider) => Container(
+                              width: 30,
+                              height: 30,
+                              decoration: BoxDecoration(
+                                image: DecorationImage(
+                                  image: imageProvider,
+                                  fit: BoxFit.contain,
+                                ),
+                              ),
                             ),
-                          ),
-                        ),
-                        placeholder: (context, url) =>
-                            const CupertinoActivityIndicator(),
-                        errorWidget: (context, url, error) =>
-                            const Icon(Icons.broken_image_outlined),
+                        placeholder:
+                            (context, url) =>
+                                const CupertinoActivityIndicator(),
+                        errorWidget:
+                            (context, url, error) =>
+                                const Icon(Icons.broken_image_outlined),
                       ),
                       const SizedBox(width: 10),
                       Expanded(
                         child: Text(
                           widget.match.league.name,
-                          style: Theme.of(context)
-                              .textTheme
-                              .titleLarge
-                              ?.copyWith(
-                                color: Theme.of(context).colorScheme.secondary,
-                              ),
+                          style: Theme.of(
+                            context,
+                          ).textTheme.titleLarge?.copyWith(
+                            color: Theme.of(context).colorScheme.secondary,
+                          ),
                         ),
                       ),
                     ],
                   ),
                   const SizedBox(height: Sizes.p16),
-                  MatchInfoWidget(
-                    match: widget.match,
-                    logoSize: 60,
-                  ),
+                  MatchInfoWidget(match: widget.match, logoSize: 60),
                   const SizedBox(height: Sizes.p16),
                   Text(
                     dateStr,
                     textAlign: TextAlign.center,
                     style: Theme.of(context).textTheme.labelSmall?.copyWith(
-                        color: Theme.of(context).colorScheme.secondary),
+                      color: Theme.of(context).colorScheme.secondary,
+                    ),
                   ),
                 ],
               ),
@@ -203,31 +145,9 @@ class _LiveMatchDetailScreenState extends ConsumerState<LiveMatchDetailScreen> {
               child: Divider(),
             ),
           ),
-          if (_bannerAd != null && _isBannerAdLoaded)
-            SliverToBoxAdapter(
-              child: SizedBox(
-                width: double.infinity,
-                height: _bannerAd!.size.height.toDouble(),
-                child: AdWidget(ad: _bannerAd!),
-              ),
-            ),
+
           if (links.isNotEmpty) LiveLinkList(links: links),
           if (links.isEmpty) emptyWidget,
-          if (_nativeAd != null && _isNativeAdLoaded)
-            SliverList.list(
-              children: [
-                Padding(
-                  padding: const EdgeInsets.symmetric(
-                    horizontal: Sizes.p16,
-                    vertical: Sizes.p16,
-                  ),
-                  child: SizedBox(
-                    height: 400,
-                    child: AdWidget(ad: _nativeAd!),
-                  ),
-                )
-              ],
-            ),
         ],
       ),
     );
@@ -235,10 +155,7 @@ class _LiveMatchDetailScreenState extends ConsumerState<LiveMatchDetailScreen> {
 }
 
 class LiveLinkList extends StatelessWidget {
-  const LiveLinkList({
-    super.key,
-    required this.links,
-  });
+  const LiveLinkList({super.key, required this.links});
 
   final List<LiveLink> links;
 
@@ -261,10 +178,7 @@ class LiveLinkList extends StatelessWidget {
 }
 
 class LiveLinkItem extends StatefulWidget {
-  const LiveLinkItem({
-    super.key,
-    required this.link,
-  });
+  const LiveLinkItem({super.key, required this.link});
 
   final LiveLink link;
 
@@ -281,8 +195,9 @@ class _LiveLinkItemState extends State<LiveLinkItem> {
     final videoType =
         widget.link.type?.name.getVideoType().name ?? VideoType.normal.name;
 
-    final resolutionIcon =
-        switch (widget.link.resolution.trim().toLowerCase()) {
+    final resolutionIcon = switch (widget.link.resolution
+        .trim()
+        .toLowerCase()) {
       "fhd" => Icons.hd,
       "hd" => Icons.hd_outlined,
       "sd" => Icons.sd_outlined,
@@ -310,9 +225,7 @@ class _LiveLinkItemState extends State<LiveLinkItem> {
         child: Icon(resolutionIcon),
       ),
       title: Text(widget.link.name),
-      shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.circular(20),
-      ),
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
       selected: _selected == widget.link.url,
       // selectedTileColor: Theme.of(context).colorScheme.primary,
       selectedColor: Theme.of(context).colorScheme.secondary,
diff --git a/lib/src/features/live_match/presentation/live_match_list/live_match_screen.dart b/lib/src/features/live_match/presentation/live_match_list/live_match_screen.dart
index b20249e..0571a34 100644
--- a/lib/src/features/live_match/presentation/live_match_list/live_match_screen.dart
+++ b/lib/src/features/live_match/presentation/live_match_list/live_match_screen.dart
@@ -1,21 +1,13 @@
-import 'dart:async';
-import 'dart:developer';
-
-import 'package:app_links/app_links.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
-import 'package:google_mobile_ads/google_mobile_ads.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:vs_live/src/config/constants/app_sizes.dart';
 import 'package:vs_live/src/features/live_match/domain/live_match.dart';
 import 'package:vs_live/src/features/live_match/presentation/live_match_list/live_match_providers.dart';
 import 'package:vs_live/src/routing/app_router.dart';
-import 'package:vs_live/src/utils/ads/ad_helper.dart';
 import 'package:vs_live/src/utils/analytics_util.dart';
 import 'package:vs_live/src/utils/localization/string_hardcoded.dart';
-import 'package:vs_live/src/utils/onesignal/onesignal.dart';
-import 'package:vs_live/src/utils/remote_config/remote_config.dart';
 import 'package:vs_live/src/utils/scheduler.dart';
 import 'package:vs_live/src/widgets/theme/theme_mode_switch_button.dart';
 import 'package:wiredash/wiredash.dart';
@@ -32,35 +24,13 @@ class LiveMatchScreen extends StatefulWidget {
 class _LiveMatchScreenState extends State<LiveMatchScreen> {
   int _selectedView = 0;
 
-  late AppLinks _appLinks;
-  StreamSubscription<Uri>? _linkSubscription;
-
-  BannerAd? _bannerAd;
-  bool _isAdLoaded = false;
-
-  NativeAd? _nativeAd;
-  bool _isNativeAdLoaded = false;
-
   @override
   void initState() {
     // Record a visit to this page.
     AnalyticsUtil.logScreenView(screenName: 'LiveMatchScreen');
     super.initState();
 
-    initOnesignal();
-    initDeepLinks();
-
-    if (!AppRemoteConfig.hideAdsInMatchList) {
-      final pageAdsInfo = AppRemoteConfig.liveMatchListAdsInfo;
-
-      if (pageAdsInfo.banner) {
-        loadBannerAd();
-      }
-
-      if (pageAdsInfo.native) {
-        loadNativeAd();
-      }
-    }
+    // initOnesignal();
 
     AppScheduler.taskDaily('vpn_notice', () {
       ScaffoldMessenger.of(context).showMaterialBanner(
@@ -84,79 +54,13 @@ class _LiveMatchScreenState extends State<LiveMatchScreen> {
     });
   }
 
-  void loadBannerAd() {
-    final ad = AdHelper.loadBannerAd(
-      onLoaded: () {
-        setState(() {
-          _isAdLoaded = true;
-        });
-      },
-    );
-    setState(() {
-      _bannerAd = ad;
-    });
-  }
-
-  void loadNativeAd() {
-    final ad = AdHelper.loadNativeAd(onLoaded: () {
-      setState(() {
-        _isNativeAdLoaded = true;
-      });
-    });
-    setState(() {
-      _nativeAd = ad;
-    });
-  }
-
-  Future<void> initDeepLinks() async {
-    _appLinks = AppLinks();
-
-    try {
-      // Handle links
-      _linkSubscription = _appLinks.uriLinkStream.listen((uri) {
-        debugPrint('onAppLink: $uri');
-        openAppLink(uri);
-      });
-    } catch (e) {
-      log('[initDeepLinks] Error: ${e.toString()}');
-    }
-  }
-
-  void openAppLink(Uri uri) {
-    if (uri.scheme == 'bsl') {
-      if (uri.host == 'open.bsl.app') {
-        log('Handle bsl://open.bsl.app');
-        // Navigate to a specific page
-      } else if (uri.host == 'kyawzayartun.com') {
-        log('Handle bsl://kyawzayartun.com');
-        // Navigate to another page
-      }
-    } else if (uri.scheme == 'https' && uri.host == 'kyawzayartun.com') {
-      if (uri.path == '/bsl') {
-        log('Handle https://kyawzayartun.com/bsl');
-        // Navigate to another page
-      }
-    } else if (uri.scheme == 'https' && uri.host == 'www.kyawzayartun.com') {
-      if (uri.path == '/bsl') {
-        log('Handle https://www.kyawzayartun.com/bsl');
-        // Navigate to another page
-      }
-    }
-
-    if (uri.queryParameters.containsKey('id')) {
-      String appId = uri.queryParameters['id']!;
-      log('App ID: $appId');
-    }
-
-    context.goNamed(AppRoute.home.name);
-  }
-
   @override
   Widget build(BuildContext context) {
     final isGridView = _selectedView == 0;
 
     return Scaffold(
       floatingActionButton: FloatingActionButton(
+        heroTag: 'live-match-fab',
         onPressed: () {
           Wiredash.of(context).show(inheritMaterialTheme: true);
         },
@@ -210,9 +114,7 @@ class _LiveMatchScreenState extends State<LiveMatchScreen> {
             bottom: AppBar(
               title: Row(
                 children: [
-                  const Expanded(
-                    child: CustomSearchField(),
-                  ),
+                  const Expanded(child: CustomSearchField()),
                   const SizedBox(width: 10),
                   Padding(
                     padding: const EdgeInsets.only(right: Sizes.p8),
@@ -231,10 +133,7 @@ class _LiveMatchScreenState extends State<LiveMatchScreen> {
                       children: [
                         Tooltip(
                           message: "Grid".hardcoded,
-                          child: const Icon(
-                            Icons.grid_view_outlined,
-                            size: 20,
-                          ),
+                          child: const Icon(Icons.grid_view_outlined, size: 20),
                         ),
                         Tooltip(
                           message: "List".hardcoded,
@@ -254,50 +153,18 @@ class _LiveMatchScreenState extends State<LiveMatchScreen> {
               );
             },
           ),
-          SliverList.list(children: [
-            if (_bannerAd != null && _isAdLoaded)
-              SizedBox(
-                width: double.infinity,
-                height: _bannerAd!.size.height.toDouble(),
-                child: AdWidget(ad: _bannerAd!),
-              ),
-            const SizedBox(height: 20),
-          ]),
+
           LiveMatchListWidget(
             viewType: isGridView ? ViewType.grid : ViewType.list,
           ),
-          if (_nativeAd != null && _isNativeAdLoaded)
-            SliverList.list(
-              children: [
-                SafeArea(
-                  child: Padding(
-                    padding: const EdgeInsets.symmetric(horizontal: Sizes.p16),
-                    child: SizedBox(
-                      height: 400,
-                      child: AdWidget(ad: _nativeAd!),
-                    ),
-                  ),
-                ),
-              ],
-            ),
         ],
       ),
     );
   }
-
-  @override
-  void dispose() {
-    _linkSubscription?.cancel();
-    _bannerAd?.dispose();
-    _nativeAd?.dispose();
-    super.dispose();
-  }
 }
 
 class CustomSearchField extends ConsumerStatefulWidget {
-  const CustomSearchField({
-    super.key,
-  });
+  const CustomSearchField({super.key});
 
   @override
   ConsumerState<CustomSearchField> createState() => _CustomSearchFieldState();
@@ -309,8 +176,10 @@ class _CustomSearchFieldState extends ConsumerState<CustomSearchField> {
   @override
   Widget build(BuildContext context) {
     final state = ref.watch(getAllLiveMatchProvider);
-    final List<LiveMatch> data =
-        state.maybeWhen(orElse: () => [], data: (data) => data);
+    final List<LiveMatch> data = state.maybeWhen(
+      orElse: () => [],
+      data: (data) => data,
+    );
 
     return CupertinoSearchTextField(
       controller: _searchController,
diff --git a/lib/src/features/live_match/presentation/live_match_list/widgets/live_match_list_view.dart b/lib/src/features/live_match/presentation/live_match_list/widgets/live_match_list_view.dart
index d023fdc..0250dc0 100644
--- a/lib/src/features/live_match/presentation/live_match_list/widgets/live_match_list_view.dart
+++ b/lib/src/features/live_match/presentation/live_match_list/widgets/live_match_list_view.dart
@@ -1,21 +1,16 @@
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
-import 'package:google_mobile_ads/google_mobile_ads.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:vs_live/src/config/constants/app_sizes.dart';
 import 'package:vs_live/src/features/live_match/domain/live_match.dart';
 import 'package:vs_live/src/features/live_match/presentation/widgets/league_info_widget.dart';
 import 'package:vs_live/src/features/live_match/presentation/widgets/match_info_widget.dart';
 import 'package:vs_live/src/routing/app_router.dart';
-import 'package:vs_live/src/utils/ads/ad_helper.dart';
 import 'package:vs_live/src/utils/format.dart';
 import 'package:vs_live/src/widgets/glassmorphism/glassmorphism.dart';
 
 class LiveMatchListView extends StatefulWidget {
-  const LiveMatchListView({
-    super.key,
-    required this.matches,
-  });
+  const LiveMatchListView({super.key, required this.matches});
 
   final List<LiveMatch> matches;
 
@@ -24,73 +19,19 @@ class LiveMatchListView extends StatefulWidget {
 }
 
 class _LiveMatchListViewState extends State<LiveMatchListView> {
-  BannerAd? _bannerAd;
-  bool _isBannerLoaded = false;
-
-  @override
-  void initState() {
-    super.initState();
-
-    loadBannerAd();
-  }
-
-  void loadBannerAd() async {
-    final ad = AdHelper.loadBannerAd(
-      onLoaded: () {
-        setState(() {
-          _isBannerLoaded = true;
-        });
-      },
-    );
-    setState(() {
-      _bannerAd = ad;
-    });
-  }
-
   @override
   Widget build(BuildContext context) {
-    final List<Widget> items = [];
-
-    for (int i = 0; i < widget.matches.length; i++) {
-      // Add a regular item
-      items.add(LiveMatchItem(match: widget.matches[i]));
-
-      // Insert an ad after every 5th item
-      if ((i + 1) % 5 == 0 && _bannerAd != null) {
-        items.add(
-          _bannerAd != null && _isBannerLoaded
-              ? SafeArea(
-                  child: SizedBox(
-                    width: _bannerAd!.size.width.toDouble(),
-                    height: _bannerAd!.size.height.toDouble(),
-                    child: AdWidget(ad: _bannerAd!),
-                  ),
-                )
-              : const SizedBox(),
-        );
-      }
-    }
-
     return SliverList.builder(
-      itemCount: items.length,
+      itemCount: widget.matches.length,
       itemBuilder: (context, index) {
-        return items[index];
+        return LiveMatchItem(match: widget.matches[index]);
       },
     );
   }
-
-  @override
-  void dispose() {
-    _bannerAd?.dispose();
-    super.dispose();
-  }
 }
 
 class LiveMatchItem extends ConsumerWidget {
-  const LiveMatchItem({
-    super.key,
-    required this.match,
-  });
+  const LiveMatchItem({super.key, required this.match});
 
   final LiveMatch match;
 
@@ -140,16 +81,16 @@ class LiveMatchItem extends ConsumerWidget {
                   child: Text(
                     match.startedTime,
                     style: Theme.of(context).textTheme.labelSmall?.copyWith(
-                          color: Theme.of(context).colorScheme.secondary,
-                        ),
+                      color: Theme.of(context).colorScheme.secondary,
+                    ),
                   ),
                 ),
                 subtitle: Center(
                   child: Text(
                     Format.matchDate(DateTime.parse(match.startedDate)),
                     style: Theme.of(context).textTheme.labelSmall?.copyWith(
-                          color: Theme.of(context).colorScheme.secondary,
-                        ),
+                      color: Theme.of(context).colorScheme.secondary,
+                    ),
                   ),
                 ),
               ),
diff --git a/lib/src/features/live_match/presentation/live_match_list/widgets/live_match_list_widget.dart b/lib/src/features/live_match/presentation/live_match_list/widgets/live_match_list_widget.dart
index 4a18f11..a3a98bc 100644
--- a/lib/src/features/live_match/presentation/live_match_list/widgets/live_match_list_widget.dart
+++ b/lib/src/features/live_match/presentation/live_match_list/widgets/live_match_list_widget.dart
@@ -40,7 +40,7 @@ class _LiveMatchListWidgetState extends ConsumerState<LiveMatchListWidget> {
 
         setState(() {
           _liveMatches = state.maybeWhen(
-            orElse: () => prev?.valueOrNull ?? [],
+            orElse: () => prev?.value ?? [],
             data: (data) => data,
           );
         });
diff --git a/lib/src/features/onboarding/data/onboarding_repository.dart b/lib/src/features/onboarding/data/onboarding_repository.dart
index b659815..ad6a098 100644
--- a/lib/src/features/onboarding/data/onboarding_repository.dart
+++ b/lib/src/features/onboarding/data/onboarding_repository.dart
@@ -1,4 +1,3 @@
-import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:vs_live/src/providers/shared_preferences_provider.dart';
diff --git a/lib/src/features/onboarding/presentation/onboarding_screen.dart b/lib/src/features/onboarding/presentation/onboarding_screen.dart
index 8f5060f..c33c82e 100644
--- a/lib/src/features/onboarding/presentation/onboarding_screen.dart
+++ b/lib/src/features/onboarding/presentation/onboarding_screen.dart
@@ -45,17 +45,18 @@ class OnboardingScreen extends ConsumerWidget {
             ),
             gapH16,
             FilledButton(
-              onPressed: state.isLoading
-                  ? null
-                  : () async {
-                      await ref
-                          .read(onboardingControllerProvider.notifier)
-                          .completeOnboarding();
-                      if (context.mounted) {
-                        // go to sign in page after completing onboarding
-                        context.goNamed(AppRoute.home.name);
-                      }
-                    },
+              onPressed:
+                  state.isLoading
+                      ? null
+                      : () async {
+                        await ref
+                            .read(onboardingControllerProvider.notifier)
+                            .completeOnboarding();
+                        if (context.mounted) {
+                          // go to sign in page after completing onboarding
+                          context.goNamed(AppRoute.socoLivess.name);
+                        }
+                      },
               child: Text('Get Started'.hardcoded),
             ),
             gapH16,
diff --git a/lib/src/features/settings/presentation/app_settings/settings_screen.dart b/lib/src/features/settings/presentation/app_settings/settings_screen.dart
index 1672fa2..3733527 100644
--- a/lib/src/features/settings/presentation/app_settings/settings_screen.dart
+++ b/lib/src/features/settings/presentation/app_settings/settings_screen.dart
@@ -3,7 +3,6 @@ import 'package:url_launcher/url_launcher.dart';
 import 'package:vs_live/src/utils/analytics_util.dart';
 import 'package:vs_live/src/utils/localization/string_hardcoded.dart';
 import 'package:vs_live/src/widgets/settings/force_mobile_layout_list_tile.dart';
-import 'package:vs_live/src/widgets/settings/notification_list_tile.dart';
 import 'package:vs_live/src/widgets/settings/privacy_policy_list_tile.dart';
 import 'package:vs_live/src/widgets/theme/theme_mode_switch_tile.dart';
 import 'package:wiredash/wiredash.dart';
@@ -27,12 +26,10 @@ class _SettingsScreenState extends State<SettingsScreen> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(
-        title: Text("Settings".hardcoded),
-      ),
+      appBar: AppBar(title: Text("Settings".hardcoded)),
       body: ListView(
         children: [
-          const NotificationSwitchListTile(),
+          // const NotificationSwitchListTile(),
           const ForceMobileLayoutListTile(),
           const ThemeModeSwitchTile(),
           const PrivacyPolicyListTile(),
diff --git a/lib/src/features/settings/presentation/privacy_policy/privacy_policy_screen.dart b/lib/src/features/settings/presentation/privacy_policy/privacy_policy_screen.dart
index f1c55b0..b73a3a1 100644
--- a/lib/src/features/settings/presentation/privacy_policy/privacy_policy_screen.dart
+++ b/lib/src/features/settings/presentation/privacy_policy/privacy_policy_screen.dart
@@ -23,14 +23,19 @@ class _PrivacyPolicyPageState extends State<PrivacyPolicyPage> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(title: const Text('Privacy Policy')),
-      body: GptMarkdown(
-        AppStrings.privacyPolicyMarkdown,
-        onLinkTap: (url, title) async {
-          final uri = Uri.parse(url);
-          if (!await launchUrl(uri)) {
-            throw Exception('Could not launch $url');
-          }
-        },
+      body: Padding(
+        padding: const EdgeInsets.all(16.0),
+        child: SingleChildScrollView(
+          child: GptMarkdown(
+            AppStrings.privacyPolicyMarkdown,
+            onLinkTap: (url, title) async {
+              final uri = Uri.parse(url);
+              if (!await launchUrl(uri)) {
+                throw Exception('Could not launch $url');
+              }
+            },
+          ),
+        ),
       ),
     );
   }
diff --git a/lib/src/features/soco/data/repositories/soco_repository.dart b/lib/src/features/soco/data/repositories/soco_repository.dart
index dfef196..288a179 100644
--- a/lib/src/features/soco/data/repositories/soco_repository.dart
+++ b/lib/src/features/soco/data/repositories/soco_repository.dart
@@ -1,5 +1,4 @@
 import 'package:dio/dio.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:vs_live/src/features/soco/data/services/api/bsl_api_client.dart';
 import 'package:vs_live/src/features/soco/domain/soco_models.dart';
diff --git a/lib/src/features/soco/data/services/api/bsl_api_client.dart b/lib/src/features/soco/data/services/api/bsl_api_client.dart
index 065d37b..aef8ad2 100644
--- a/lib/src/features/soco/data/services/api/bsl_api_client.dart
+++ b/lib/src/features/soco/data/services/api/bsl_api_client.dart
@@ -1,6 +1,5 @@
 import 'dart:developer' as developer;
 import 'package:dio/dio.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:vs_live/src/errors/exceptions.dart';
 import 'package:vs_live/src/features/soco/domain/soco_models.dart';
@@ -9,9 +8,8 @@ import 'package:vs_live/src/utils/dio_client/dio_client.dart';
 part 'bsl_api_client.g.dart';
 
 class BslApiClient {
-  BslApiClient(
-    Dio Function()? clientFactory,
-  ) : _clientFactory = clientFactory ?? (() => Dio());
+  BslApiClient(Dio Function()? clientFactory)
+    : _clientFactory = clientFactory ?? (() => Dio());
 
   final Dio Function() _clientFactory;
 
@@ -24,8 +22,9 @@ class BslApiClient {
       final response = await client.get('/matches', cancelToken: cancelToken);
 
       if (response.statusCode == 200) {
-        final result =
-            SocoLiveModel.fromJson(response.data as Map<String, dynamic>);
+        final result = SocoLiveModel.fromJson(
+          response.data as Map<String, dynamic>,
+        );
         return result.data;
       } else {
         throw ServerException(
diff --git a/lib/src/features/soco/presentation/soco_live_detail/soco_live_detail_screen.dart b/lib/src/features/soco/presentation/soco_live_detail/soco_live_detail_screen.dart
index d4fe58d..9f3fdab 100644
--- a/lib/src/features/soco/presentation/soco_live_detail/soco_live_detail_screen.dart
+++ b/lib/src/features/soco/presentation/soco_live_detail/soco_live_detail_screen.dart
@@ -2,15 +2,12 @@ import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
-import 'package:google_mobile_ads/google_mobile_ads.dart';
 import 'package:vs_live/src/config/constants/app_sizes.dart';
 import 'package:vs_live/src/features/soco/domain/soco_models.dart';
 import 'package:vs_live/src/routing/app_router.dart';
-import 'package:vs_live/src/utils/ads/ad_helper.dart';
 import 'package:vs_live/src/utils/analytics_util.dart';
 import 'package:vs_live/src/utils/format.dart';
 import 'package:vs_live/src/utils/localization/string_hardcoded.dart';
-import 'package:vs_live/src/utils/remote_config/remote_config.dart';
 import 'package:vs_live/src/widgets/error_status_icon_widget.dart';
 import 'package:vs_live/src/widgets/text/animated_live_text.dart';
 import 'package:vs_live/src/widgets/text/animated_text.dart';
@@ -26,61 +23,11 @@ class SocoLiveDetailScreen extends StatefulWidget {
 }
 
 class _SocoLiveDetailScreenState extends State<SocoLiveDetailScreen> {
-  NativeAd? _nativeAd;
-  bool _isNativeAdLoaded = false;
-
-  BannerAd? _bannerAd;
-  bool _isBannerAdLoaded = false;
-
   @override
   void initState() {
     // Record a visit to this page.
-    AnalyticsUtil.logScreenView(
-      screenName: 'SocoLiveDetailScreen',
-    );
+    AnalyticsUtil.logScreenView(screenName: 'SocoLiveDetailScreen');
     super.initState();
-
-    if (!AppRemoteConfig.hideAdsInMatchDetail) {
-      final pageAdsInfo = AppRemoteConfig.liveMatchDetailAdsInfo;
-      if (pageAdsInfo.native) {
-        loadNativeAd();
-      }
-
-      if (pageAdsInfo.banner) {
-        loadBannerAd();
-      }
-    }
-  }
-
-  void loadNativeAd() {
-    final ad = AdHelper.loadNativeAd(onLoaded: () {
-      setState(() {
-        _isNativeAdLoaded = true;
-      });
-    });
-
-    setState(() {
-      _nativeAd = ad;
-    });
-  }
-
-  void loadBannerAd() {
-    final ad = AdHelper.loadBannerAd(onLoaded: () {
-      setState(() {
-        _isBannerAdLoaded = true;
-      });
-    });
-
-    setState(() {
-      _bannerAd = ad;
-    });
-  }
-
-  @override
-  void dispose() {
-    _bannerAd?.dispose();
-    _nativeAd?.dispose();
-    super.dispose();
   }
 
   @override
@@ -92,9 +39,7 @@ class _SocoLiveDetailScreenState extends State<SocoLiveDetailScreen> {
           child: Column(
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
-              const ErrorStatusIconWidget(
-                icon: Icons.sports_soccer_outlined,
-              ),
+              const ErrorStatusIconWidget(icon: Icons.sports_soccer_outlined),
               const SizedBox(height: Sizes.p16),
               Text(
                 "No available links found".hardcoded,
@@ -106,10 +51,10 @@ class _SocoLiveDetailScreenState extends State<SocoLiveDetailScreen> {
                 "May be the match has not been started yet".hardcoded,
                 textAlign: TextAlign.center,
                 style: Theme.of(context).textTheme.labelLarge?.copyWith(
-                    color: Theme.of(context)
-                        .colorScheme
-                        .onSurface
-                        .withValues(alpha: 0.7)),
+                  color: Theme.of(
+                    context,
+                  ).colorScheme.onSurface.withValues(alpha: 0.7),
+                ),
               ),
             ],
           ),
@@ -136,8 +81,8 @@ class _SocoLiveDetailScreenState extends State<SocoLiveDetailScreen> {
                   Text(
                     widget.match.leaguename,
                     style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                          color: Theme.of(context).colorScheme.secondary,
-                        ),
+                      color: Theme.of(context).colorScheme.secondary,
+                    ),
                   ),
                   const SizedBox(height: Sizes.p16),
                   SocoLiveMatchInfoWidget(match: widget.match),
@@ -148,7 +93,8 @@ class _SocoLiveDetailScreenState extends State<SocoLiveDetailScreen> {
                     ),
                     textAlign: TextAlign.center,
                     style: Theme.of(context).textTheme.labelSmall?.copyWith(
-                        color: Theme.of(context).colorScheme.secondary),
+                      color: Theme.of(context).colorScheme.secondary,
+                    ),
                   ),
                 ],
               ),
@@ -163,32 +109,10 @@ class _SocoLiveDetailScreenState extends State<SocoLiveDetailScreen> {
               child: Divider(),
             ),
           ),
-          if (_bannerAd != null && _isBannerAdLoaded)
-            SliverToBoxAdapter(
-              child: SizedBox(
-                width: double.infinity,
-                height: _bannerAd!.size.height.toDouble(),
-                child: AdWidget(ad: _bannerAd!),
-              ),
-            ),
+
           if (widget.match.servers.isNotEmpty)
             LiveLinkList(links: widget.match.servers),
           if (widget.match.servers.isEmpty) emptyWidget,
-          if (_nativeAd != null && _isNativeAdLoaded)
-            SliverList.list(
-              children: [
-                Padding(
-                  padding: const EdgeInsets.symmetric(
-                    horizontal: Sizes.p16,
-                    vertical: Sizes.p16,
-                  ),
-                  child: SizedBox(
-                    height: 400,
-                    child: AdWidget(ad: _nativeAd!),
-                  ),
-                )
-              ],
-            ),
         ],
       ),
     );
@@ -196,10 +120,7 @@ class _SocoLiveDetailScreenState extends State<SocoLiveDetailScreen> {
 }
 
 class LiveLinkList extends StatelessWidget {
-  const LiveLinkList({
-    super.key,
-    required this.links,
-  });
+  const LiveLinkList({super.key, required this.links});
 
   final List<SocoLiveServer> links;
 
@@ -222,18 +143,16 @@ class LiveLinkList extends StatelessWidget {
 }
 
 class SocoLiveLinkItem extends StatelessWidget {
-  const SocoLiveLinkItem({
-    super.key,
-    required this.link,
-  });
+  const SocoLiveLinkItem({super.key, required this.link});
 
   final SocoLiveServer link;
 
   @override
   Widget build(BuildContext context) {
-    final resolutionIcon = link.name.toLowerCase().contains('hd')
-        ? Icons.hd_outlined
-        : Icons.sd_outlined;
+    final resolutionIcon =
+        link.name.toLowerCase().contains('hd')
+            ? Icons.hd_outlined
+            : Icons.sd_outlined;
 
     return ListTile(
       onTap: () {
@@ -245,13 +164,9 @@ class SocoLiveLinkItem extends StatelessWidget {
           },
         );
       },
-      leading: CircleAvatar(
-        child: Icon(resolutionIcon),
-      ),
+      leading: CircleAvatar(child: Icon(resolutionIcon)),
       title: Text(link.name),
-      shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.circular(20),
-      ),
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
     );
   }
 }
@@ -275,20 +190,22 @@ class SocoLiveMatchInfoWidget extends StatelessWidget {
               children: [
                 CachedNetworkImage(
                   imageUrl: match.homeTeamLogo,
-                  imageBuilder: (context, imageProvider) => Container(
-                    width: 60,
-                    height: 60,
-                    decoration: BoxDecoration(
-                      image: DecorationImage(
-                        image: imageProvider,
-                        fit: BoxFit.contain,
+                  imageBuilder:
+                      (context, imageProvider) => Container(
+                        width: 60,
+                        height: 60,
+                        decoration: BoxDecoration(
+                          image: DecorationImage(
+                            image: imageProvider,
+                            fit: BoxFit.contain,
+                          ),
+                        ),
                       ),
-                    ),
-                  ),
-                  placeholder: (context, url) =>
-                      const CupertinoActivityIndicator(),
-                  errorWidget: (context, url, error) =>
-                      const Icon(Icons.broken_image_outlined),
+                  placeholder:
+                      (context, url) => const CupertinoActivityIndicator(),
+                  errorWidget:
+                      (context, url, error) =>
+                          const Icon(Icons.broken_image_outlined),
                 ),
                 const SizedBox(height: 4),
                 Text(
@@ -311,9 +228,9 @@ class SocoLiveMatchInfoWidget extends StatelessWidget {
                   match.matchStatus.toUpperCase(),
                   textAlign: TextAlign.center,
                   style: Theme.of(context).textTheme.labelSmall?.copyWith(
-                        fontSize: 16,
-                        fontWeight: FontWeight.w700,
-                      ),
+                    fontSize: 16,
+                    fontWeight: FontWeight.w700,
+                  ),
                 ),
               if (match.matchStatus.toLowerCase() == 'live') ...[
                 const SizedBox(height: 4),
@@ -322,12 +239,13 @@ class SocoLiveMatchInfoWidget extends StatelessWidget {
                   animatedTexts: [
                     AnimatedLiveText(
                       "LIVE",
-                      textStyle:
-                          Theme.of(context).textTheme.labelSmall?.copyWith(
-                                color: Theme.of(context).colorScheme.error,
-                                fontSize: 16,
-                                fontWeight: FontWeight.bold,
-                              ),
+                      textStyle: Theme.of(
+                        context,
+                      ).textTheme.labelSmall?.copyWith(
+                        color: Theme.of(context).colorScheme.error,
+                        fontSize: 16,
+                        fontWeight: FontWeight.bold,
+                      ),
                     ),
                   ],
                 ),
@@ -345,20 +263,22 @@ class SocoLiveMatchInfoWidget extends StatelessWidget {
               children: [
                 CachedNetworkImage(
                   imageUrl: match.awayTeamLogo,
-                  imageBuilder: (context, imageProvider) => Container(
-                    width: 60,
-                    height: 60,
-                    decoration: BoxDecoration(
-                      image: DecorationImage(
-                        image: imageProvider,
-                        fit: BoxFit.contain,
+                  imageBuilder:
+                      (context, imageProvider) => Container(
+                        width: 60,
+                        height: 60,
+                        decoration: BoxDecoration(
+                          image: DecorationImage(
+                            image: imageProvider,
+                            fit: BoxFit.contain,
+                          ),
+                        ),
                       ),
-                    ),
-                  ),
-                  placeholder: (context, url) =>
-                      const CupertinoActivityIndicator(),
-                  errorWidget: (context, url, error) =>
-                      const Icon(Icons.broken_image_outlined),
+                  placeholder:
+                      (context, url) => const CupertinoActivityIndicator(),
+                  errorWidget:
+                      (context, url, error) =>
+                          const Icon(Icons.broken_image_outlined),
                 ),
                 const SizedBox(height: 4),
                 Text(
diff --git a/lib/src/features/soco/presentation/soco_live_list/soco_live_list_screen.dart b/lib/src/features/soco/presentation/soco_live_list/soco_live_list_screen.dart
index af25a9f..9a13053 100644
--- a/lib/src/features/soco/presentation/soco_live_list/soco_live_list_screen.dart
+++ b/lib/src/features/soco/presentation/soco_live_list/soco_live_list_screen.dart
@@ -1,16 +1,12 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
-import 'package:google_mobile_ads/google_mobile_ads.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:vs_live/src/config/constants/app_sizes.dart';
 import 'package:vs_live/src/features/soco/presentation/soco_live_list/soco_live_list_provider.dart';
 import 'package:vs_live/src/features/soco/presentation/soco_live_list/widgets/soco_live_list_view_widget.dart';
 import 'package:vs_live/src/routing/app_router.dart';
-import 'package:vs_live/src/utils/ads/ad_helper.dart';
 import 'package:vs_live/src/utils/analytics_util.dart';
 import 'package:vs_live/src/utils/localization/string_hardcoded.dart';
-import 'package:vs_live/src/utils/remote_config/remote_config.dart';
 import 'package:vs_live/src/widgets/theme/theme_mode_switch_button.dart';
 import 'package:wiredash/wiredash.dart';
 
@@ -22,59 +18,18 @@ class SocoLiveListScreen extends StatefulWidget {
 }
 
 class _SocoLiveListScreenState extends State<SocoLiveListScreen> {
-  BannerAd? _bannerAd;
-  bool _isAdLoaded = false;
-
-  NativeAd? _nativeAd;
-  bool _isNativeAdLoaded = false;
-
   @override
   void initState() {
     // Record a visit to this page.
     AnalyticsUtil.logScreenView(screenName: 'SocoLiveListScreen');
     super.initState();
-
-    if (!AppRemoteConfig.hideAdsInMatchList) {
-      final pageAdsInfo = AppRemoteConfig.liveMatchListAdsInfo;
-
-      if (pageAdsInfo.banner) {
-        loadBannerAd();
-      }
-
-      if (pageAdsInfo.native) {
-        loadNativeAd();
-      }
-    }
-  }
-
-  void loadBannerAd() {
-    final ad = AdHelper.loadBannerAd(
-      onLoaded: () {
-        setState(() {
-          _isAdLoaded = true;
-        });
-      },
-    );
-    setState(() {
-      _bannerAd = ad;
-    });
-  }
-
-  void loadNativeAd() {
-    final ad = AdHelper.loadNativeAd(onLoaded: () {
-      setState(() {
-        _isNativeAdLoaded = true;
-      });
-    });
-    setState(() {
-      _nativeAd = ad;
-    });
   }
 
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       floatingActionButton: FloatingActionButton(
+        heroTag: 'soco-live-list-fab',
         onPressed: () {
           Wiredash.of(context).show(inheritMaterialTheme: true);
         },
@@ -107,30 +62,8 @@ class _SocoLiveListScreenState extends State<SocoLiveListScreen> {
               );
             },
           ),
-          SliverList.list(children: [
-            if (_bannerAd != null && _isAdLoaded)
-              SizedBox(
-                width: double.infinity,
-                height: _bannerAd!.size.height.toDouble(),
-                child: AdWidget(ad: _bannerAd!),
-              ),
-            const SizedBox(height: 20),
-          ]),
+
           const SocoLiveListViewWidget(),
-          if (_nativeAd != null && _isNativeAdLoaded)
-            SliverList.list(
-              children: [
-                SafeArea(
-                  child: Padding(
-                    padding: const EdgeInsets.symmetric(horizontal: Sizes.p16),
-                    child: SizedBox(
-                      height: 400,
-                      child: AdWidget(ad: _nativeAd!),
-                    ),
-                  ),
-                ),
-              ],
-            ),
         ],
       ),
     );
diff --git a/lib/src/providers/native_ad_controller.dart b/lib/src/providers/native_ad_controller.dart
deleted file mode 100644
index 77298dc..0000000
--- a/lib/src/providers/native_ad_controller.dart
+++ /dev/null
@@ -1,41 +0,0 @@
-// ignore_for_file: public_member_api_docs, sort_constructors_first
-import 'package:equatable/equatable.dart';
-import 'package:google_mobile_ads/google_mobile_ads.dart';
-import 'package:riverpod_annotation/riverpod_annotation.dart';
-
-part 'native_ad_controller.g.dart';
-
-class NativeAdModel extends Equatable {
-  const NativeAdModel({
-    this.ad,
-    this.adLoaded = false,
-  });
-
-  final NativeAd? ad;
-  final bool adLoaded;
-
-  @override
-  List<Object?> get props => [ad?.adUnitId, adLoaded];
-
-  NativeAdModel copyWith({
-    NativeAd? ad,
-    bool? adLoaded,
-  }) {
-    return NativeAdModel(
-      ad: ad ?? this.ad,
-      adLoaded: adLoaded ?? this.adLoaded,
-    );
-  }
-}
-
-@riverpod
-class NativeAdController extends _$NativeAdController {
-  @override
-  NativeAdModel build() {
-    return const NativeAdModel();
-  }
-
-  void update(NativeAdModel item) {
-    state = item;
-  }
-}
diff --git a/lib/src/providers/shared_preferences_provider.dart b/lib/src/providers/shared_preferences_provider.dart
index d1f6aca..ac2948a 100644
--- a/lib/src/providers/shared_preferences_provider.dart
+++ b/lib/src/providers/shared_preferences_provider.dart
@@ -1,4 +1,3 @@
-import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
diff --git a/lib/src/routing/app_router.dart b/lib/src/routing/app_router.dart
index b585438..cce14b2 100644
--- a/lib/src/routing/app_router.dart
+++ b/lib/src/routing/app_router.dart
@@ -1,13 +1,11 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:vs_live/src/features/football_highlight/presentation/feed/highlight_feed_screen.dart';
 import 'package:vs_live/src/features/football_highlight/presentation/highlight_player_screen/highlight_player_screen.dart';
 import 'package:vs_live/src/features/live_match/domain/live_match.dart';
 import 'package:vs_live/src/features/live_match/presentation/live_match_detail/live_match_detail_screen.dart';
-import 'package:vs_live/src/features/live_match/presentation/live_match_list/live_match_screen.dart';
 import 'package:vs_live/src/features/live_match/presentation/live_match_player/live_match_player_screen.dart';
 import 'package:vs_live/src/features/onboarding/data/onboarding_repository.dart';
 import 'package:vs_live/src/features/onboarding/presentation/onboarding_screen.dart';
@@ -25,17 +23,20 @@ part 'app_router.g.dart';
 
 // private navigators
 final rootNavigatorKey = GlobalKey<NavigatorState>();
-final _liveMatchesNavigatorKey =
-    GlobalKey<NavigatorState>(debugLabel: 'live-matches');
-final _socoLivessMatchNavigatorKey =
-    GlobalKey<NavigatorState>(debugLabel: 'soco-livess-matches');
-final _highlightsNavigatorKey =
-    GlobalKey<NavigatorState>(debugLabel: 'highlights');
+// final _liveMatchesNavigatorKey = GlobalKey<NavigatorState>(
+//   debugLabel: 'live-matches',
+// );
+final _socoLivessMatchNavigatorKey = GlobalKey<NavigatorState>(
+  debugLabel: 'soco-livess-matches',
+);
+final _highlightsNavigatorKey = GlobalKey<NavigatorState>(
+  debugLabel: 'highlights',
+);
 final _settingsNavigatorKey = GlobalKey<NavigatorState>(debugLabel: 'settings');
 
 enum AppRoute {
   onboarding,
-  home,
+  // home,
   liveMatchDetail,
   player,
   settings,
@@ -50,7 +51,7 @@ enum AppRoute {
 GoRouter goRouter(Ref ref) {
   return GoRouter(
     navigatorKey: rootNavigatorKey,
-    initialLocation: '/home',
+    initialLocation: '/soco-livess',
     debugLogDiagnostics: !kReleaseMode,
     redirect: (context, state) {
       final onboardingRepository =
@@ -67,7 +68,7 @@ GoRouter goRouter(Ref ref) {
       }
 
       if (path.startsWith('/onboarding')) {
-        return '/home';
+        return '/soco-livess';
       }
 
       return null;
@@ -76,9 +77,9 @@ GoRouter goRouter(Ref ref) {
       GoRoute(
         path: '/onboarding',
         name: AppRoute.onboarding.name,
-        pageBuilder: (context, state) => const NoTransitionPage(
-          child: OnboardingScreen(),
-        ),
+        pageBuilder:
+            (context, state) =>
+                const NoTransitionPage(child: OnboardingScreen()),
       ),
       GoRoute(
         path: '/player',
@@ -100,9 +101,7 @@ GoRouter goRouter(Ref ref) {
         pageBuilder: (context, state) {
           final embedVideo = state.uri.queryParameters["embedVideo"];
           return NoTransitionPage(
-            child: HighlightPlayerScreen(
-              embedVideo: embedVideo ?? '',
-            ),
+            child: HighlightPlayerScreen(embedVideo: embedVideo ?? ''),
           );
         },
       ),
@@ -112,9 +111,7 @@ GoRouter goRouter(Ref ref) {
         pageBuilder: (context, state) {
           // todo(me): fix `type 'Null' is not a subtype of type 'LiveMatch' in type cast.`
           LiveMatch match = state.extra as LiveMatch;
-          return NoTransitionPage(
-            child: LiveMatchDetailScreen(match: match),
-          );
+          return NoTransitionPage(child: LiveMatchDetailScreen(match: match));
         },
       ),
       GoRoute(
@@ -123,44 +120,45 @@ GoRouter goRouter(Ref ref) {
         pageBuilder: (context, state) {
           // todo(me): fix `type 'Null' is not a subtype of type 'LiveMatch' in type cast.`
           SocoLiveMatch match = state.extra as SocoLiveMatch;
-          return NoTransitionPage(
-            child: SocoLiveDetailScreen(match: match),
-          );
+          return NoTransitionPage(child: SocoLiveDetailScreen(match: match));
         },
       ),
       GoRoute(
         path: '/privacy-policy',
         name: AppRoute.privacyPolicy.name,
-        pageBuilder: (context, state) => const NoTransitionPage(
-          child: PrivacyPolicyPage(),
-        ),
+        pageBuilder:
+            (context, state) =>
+                const NoTransitionPage(child: PrivacyPolicyPage()),
       ),
       StatefulShellRoute.indexedStack(
-        pageBuilder: (context, state, navigationShell) => NoTransitionPage(
-          child: ScaffoldWithNestedNavigation(navigationShell: navigationShell),
-        ),
-        branches: [
-          StatefulShellBranch(
-            navigatorKey: _liveMatchesNavigatorKey,
-            routes: [
-              GoRoute(
-                path: '/home',
-                name: AppRoute.home.name,
-                pageBuilder: (context, state) => const NoTransitionPage(
-                  child: LiveMatchScreen(),
-                ),
+        pageBuilder:
+            (context, state, navigationShell) => NoTransitionPage(
+              child: ScaffoldWithNestedNavigation(
+                navigationShell: navigationShell,
               ),
-            ],
-          ),
+            ),
+        branches: [
+          // StatefulShellBranch(
+          //   navigatorKey: _liveMatchesNavigatorKey,
+          //   routes: [
+          //     GoRoute(
+          //       path: '/home',
+          //       name: AppRoute.home.name,
+          //       pageBuilder:
+          //           (context, state) =>
+          //               const NoTransitionPage(child: LiveMatchScreen()),
+          //     ),
+          //   ],
+          // ),
           StatefulShellBranch(
             navigatorKey: _socoLivessMatchNavigatorKey,
             routes: [
               GoRoute(
                 path: '/soco-livess',
                 name: AppRoute.socoLivess.name,
-                pageBuilder: (context, state) => const NoTransitionPage(
-                  child: SocoLiveListScreen(),
-                ),
+                pageBuilder:
+                    (context, state) =>
+                        const NoTransitionPage(child: SocoLiveListScreen()),
               ),
             ],
           ),
@@ -170,9 +168,9 @@ GoRouter goRouter(Ref ref) {
               GoRoute(
                 path: '/highlights',
                 name: AppRoute.highlights.name,
-                pageBuilder: (context, state) => const NoTransitionPage(
-                  child: HighlightFeedScreen(),
-                ),
+                pageBuilder:
+                    (context, state) =>
+                        const NoTransitionPage(child: HighlightFeedScreen()),
               ),
             ],
           ),
@@ -182,17 +180,16 @@ GoRouter goRouter(Ref ref) {
               GoRoute(
                 path: '/settings',
                 name: AppRoute.settings.name,
-                pageBuilder: (context, state) => const NoTransitionPage(
-                  child: SettingsScreen(),
-                ),
+                pageBuilder:
+                    (context, state) =>
+                        const NoTransitionPage(child: SettingsScreen()),
               ),
             ],
           ),
         ],
       ),
     ],
-    errorPageBuilder: (context, state) => const NoTransitionPage(
-      child: NotFoundScreen(),
-    ),
+    errorPageBuilder:
+        (context, state) => const NoTransitionPage(child: NotFoundScreen()),
   );
 }
diff --git a/lib/src/routing/scaffold_with_nested_navigation.dart b/lib/src/routing/scaffold_with_nested_navigation.dart
index f76811b..b62e1eb 100644
--- a/lib/src/routing/scaffold_with_nested_navigation.dart
+++ b/lib/src/routing/scaffold_with_nested_navigation.dart
@@ -9,10 +9,8 @@ import 'package:vs_live/src/utils/localization/string_hardcoded.dart';
 // Stateful navigation based on:
 // https://github.com/flutter/packages/blob/main/packages/go_router/example/lib/stateful_shell_route.dart
 class ScaffoldWithNestedNavigation extends ConsumerWidget {
-  const ScaffoldWithNestedNavigation({
-    Key? key,
-    required this.navigationShell,
-  }) : super(key: key ?? const ValueKey('ScaffoldWithNestedNavigation'));
+  const ScaffoldWithNestedNavigation({Key? key, required this.navigationShell})
+    : super(key: key ?? const ValueKey('ScaffoldWithNestedNavigation'));
   final StatefulNavigationShell navigationShell;
 
   void _goBranch(int index) {
@@ -65,11 +63,11 @@ class ScaffoldWithNavigationBar extends StatelessWidget {
       bottomNavigationBar: NavigationBar(
         selectedIndex: currentIndex,
         destinations: [
-          NavigationDestination(
-            icon: const Icon(Icons.home),
-            selectedIcon: const Icon(Icons.home_outlined),
-            label: 'Home'.hardcoded,
-          ),
+          // NavigationDestination(
+          //   icon: const Icon(Icons.home),
+          //   selectedIcon: const Icon(Icons.home_outlined),
+          //   label: 'Home'.hardcoded,
+          // ),
           NavigationDestination(
             icon: const Icon(Icons.live_tv),
             selectedIcon: const Icon(Icons.live_tv_outlined),
@@ -113,11 +111,11 @@ class ScaffoldWithNavigationRail extends StatelessWidget {
             onDestinationSelected: onDestinationSelected,
             labelType: NavigationRailLabelType.all,
             destinations: <NavigationRailDestination>[
-              NavigationRailDestination(
-                icon: const Icon(Icons.home),
-                selectedIcon: const Icon(Icons.home_outlined),
-                label: Text('Home'.hardcoded),
-              ),
+              // NavigationRailDestination(
+              //   icon: const Icon(Icons.home),
+              //   selectedIcon: const Icon(Icons.home_outlined),
+              //   label: Text('Home'.hardcoded),
+              // ),
               NavigationRailDestination(
                 icon: const Icon(Icons.live_tv),
                 selectedIcon: const Icon(Icons.live_tv_outlined),
@@ -137,9 +135,7 @@ class ScaffoldWithNavigationRail extends StatelessWidget {
           ),
           const VerticalDivider(thickness: 1, width: 1),
           // This is the main content.
-          Expanded(
-            child: body,
-          ),
+          Expanded(child: body),
         ],
       ),
     );
diff --git a/lib/src/utils/ads/ad_helper.dart b/lib/src/utils/ads/ad_helper.dart
deleted file mode 100644
index 96c03e3..0000000
--- a/lib/src/utils/ads/ad_helper.dart
+++ /dev/null
@@ -1,335 +0,0 @@
-// ignore_for_file: unused_field
-
-import 'dart:developer';
-import 'dart:io';
-
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
-import 'package:google_mobile_ads/google_mobile_ads.dart';
-import 'package:vs_live/src/utils/dialogs.dart';
-import 'package:vs_live/src/utils/remote_config/remote_config.dart';
-
-class AdHelper {
-  // for initializing ads sdk
-  static Future initAds() async {
-    return MobileAds.instance.initialize();
-  }
-
-  static String get bannerAdUnitId {
-    if (Platform.isAndroid) {
-      return !kReleaseMode
-          ? 'ca-app-pub-3940256099942544/9214589741'
-          : 'ca-app-pub-7567997114394639/8648546201';
-    } else {
-      throw UnsupportedError("Unsupported platform");
-    }
-  }
-
-  static String get nativeAdUnitId {
-    if (Platform.isAndroid) {
-      return !kReleaseMode
-          ? 'ca-app-pub-3940256099942544/2247696110'
-          : 'ca-app-pub-7567997114394639/9425876604';
-    } else {
-      throw UnsupportedError("Unsupported platform");
-    }
-  }
-
-  static String get interstitialAdUnitId {
-    if (Platform.isAndroid) {
-      return !kReleaseMode
-          ? 'ca-app-pub-3940256099942544/1033173712'
-          : 'ca-app-pub-7567997114394639/1475405831';
-    } else {
-      throw UnsupportedError("Unsupported platform");
-    }
-  }
-
-  static String get appOpenAdUnitId {
-    if (Platform.isAndroid) {
-      return !kReleaseMode
-          ? 'ca-app-pub-3940256099942544/9257395921'
-          : 'ca-app-pub-7567997114394639/7748304172';
-    } else {
-      throw UnsupportedError("Unsupported platform");
-    }
-  }
-
-  static String get rewardedAdUnitId {
-    if (Platform.isAndroid) {
-      return !kReleaseMode
-          ? 'ca-app-pub-3940256099942544/5224354917'
-          : 'ca-app-pub-7567997114394639/8288226195';
-    } else {
-      throw UnsupportedError("Unsupported platform");
-    }
-  }
-
-  static InterstitialAd? _interstitialAd;
-  static bool _interstitialAdLoaded = false;
-
-  static NativeAd? _nativeAd;
-  static bool _nativeAdLoaded = false;
-
-  static BannerAd? _bannerAd;
-  static bool _bannerAdLoaded = false;
-
-  //*****************Interstitial Ad******************
-  static void precacheInterstitialAd() {
-    if (AppRemoteConfig.hideAds) return;
-
-    InterstitialAd.load(
-      adUnitId: interstitialAdUnitId,
-      request: const AdRequest(),
-      adLoadCallback: InterstitialAdLoadCallback(
-        onAdLoaded: (ad) {
-          ad.fullScreenContentCallback = FullScreenContentCallback(
-            onAdDismissedFullScreenContent: (ad) {
-              _resetInterstitialAd();
-              precacheInterstitialAd();
-            },
-          );
-          _interstitialAd = ad;
-          _interstitialAdLoaded = true;
-        },
-        onAdFailedToLoad: (error) {
-          _resetInterstitialAd();
-          log('Failed to load an interstitial ad: ${error.message}');
-        },
-      ),
-    );
-  }
-
-  static void _resetInterstitialAd() {
-    _interstitialAd?.dispose();
-    _interstitialAd = null;
-    _interstitialAdLoaded = false;
-  }
-
-  static void showInterstitialAd(
-    BuildContext context, {
-    required VoidCallback onComplete,
-  }) {
-    if (AppRemoteConfig.hideAds) {
-      onComplete();
-      return;
-    }
-
-    if (_interstitialAdLoaded && _interstitialAd != null) {
-      _interstitialAd?.show();
-      onComplete();
-      return;
-    }
-
-    showLoadingDialog(context);
-
-    InterstitialAd.load(
-      adUnitId: interstitialAdUnitId,
-      request: const AdRequest(),
-      adLoadCallback: InterstitialAdLoadCallback(
-        onAdLoaded: (ad) {
-          //ad listener
-          ad.fullScreenContentCallback = FullScreenContentCallback(
-            onAdDismissedFullScreenContent: (ad) {
-              onComplete();
-              _resetInterstitialAd();
-              precacheInterstitialAd();
-            },
-          );
-          Navigator.pop(context);
-          ad.show();
-        },
-        onAdFailedToLoad: (err) {
-          Navigator.pop(context);
-          log('Failed to load an interstitial ad: ${err.message}');
-          onComplete();
-        },
-      ),
-    );
-  }
-
-  //*****************Native Ad******************
-  static void precacheNativeAd() {
-    if (AppRemoteConfig.hideAds || AppRemoteConfig.hideNativeAd) return;
-
-    _nativeAd = NativeAd(
-      adUnitId: nativeAdUnitId,
-      listener: NativeAdListener(
-        onAdLoaded: (ad) {
-          log('$NativeAd loaded.');
-          _nativeAdLoaded = true;
-        },
-        onAdFailedToLoad: (ad, error) {
-          _resetNativeAd();
-          log('$NativeAd failed to load: $error');
-        },
-      ),
-      request: const AdRequest(),
-      // Styling
-      nativeTemplateStyle: NativeTemplateStyle(
-        templateType: TemplateType.medium,
-      ),
-    )..load();
-  }
-
-  static void _resetNativeAd() {
-    _nativeAd?.dispose();
-    _nativeAd = null;
-    _nativeAdLoaded = false;
-  }
-
-  static NativeAd? loadNativeAd({VoidCallback? onLoaded}) {
-    if (AppRemoteConfig.hideAds || AppRemoteConfig.hideNativeAd) return null;
-
-    // if (_nativeAdLoaded && _nativeAd != null) {
-    //   onLoaded?.call();
-    //   return _nativeAd;
-    // }
-
-    return NativeAd(
-      adUnitId: nativeAdUnitId,
-      listener: NativeAdListener(
-        onAdLoaded: (ad) {
-          log('$NativeAd loaded.');
-          onLoaded?.call();
-          // _resetNativeAd();
-          // precacheNativeAd();
-        },
-        onAdFailedToLoad: (ad, error) {
-          // _resetNativeAd();
-          log('$NativeAd failed to load: $error');
-        },
-      ),
-      request: const AdRequest(),
-      // Styling
-      nativeTemplateStyle: NativeTemplateStyle(
-        templateType: TemplateType.medium,
-      ),
-    )..load();
-  }
-
-  // **************** Banner Ad*******************
-  static void precacheBannerAd() {
-    if (AppRemoteConfig.hideAds || AppRemoteConfig.hideBannerAd) return;
-
-    _bannerAd = BannerAd(
-      size: AdSize.banner,
-      adUnitId: bannerAdUnitId,
-      listener: BannerAdListener(
-        onAdLoaded: (ad) {
-          log('$NativeAd loaded.');
-          _bannerAdLoaded = true;
-        },
-        onAdFailedToLoad: (ad, error) {
-          _resetBannerAd();
-          log('$BannerAd failed to load: $error');
-        },
-      ),
-      request: const AdRequest(),
-    )..load();
-  }
-
-  static void _resetBannerAd() {
-    _bannerAd?.dispose();
-    _bannerAd = null;
-    _bannerAdLoaded = false;
-  }
-
-  static BannerAd? loadBannerAd({VoidCallback? onLoaded}) {
-    if (AppRemoteConfig.hideAds || AppRemoteConfig.hideBannerAd) return null;
-
-    // if (_bannerAdLoaded && _bannerAd != null) {
-    //   onLoaded?.call();
-    //   return _bannerAd;
-    // }
-
-    return BannerAd(
-      size: AdSize.banner,
-      adUnitId: bannerAdUnitId,
-      listener: BannerAdListener(
-        onAdLoaded: (ad) {
-          log('$BannerAd loaded.');
-          onLoaded?.call();
-          // _resetBannerAd();
-          // precacheBannerAd();
-        },
-        onAdFailedToLoad: (ad, error) {
-          // _resetBannerAd();
-          log('$BannerAd failed to load: $error');
-        },
-      ),
-      request: const AdRequest(),
-    )..load();
-  }
-
-  //*****************Rewarded Ad******************
-  static void showRewardedAd(
-    BuildContext context, {
-    required VoidCallback onComplete,
-  }) {
-    if (AppRemoteConfig.hideAds || AppRemoteConfig.hideRewardedAd) {
-      onComplete();
-      return;
-    }
-
-    showLoadingDialog(context);
-
-    RewardedAd.load(
-      adUnitId: rewardedAdUnitId,
-      request: const AdRequest(),
-      rewardedAdLoadCallback: RewardedAdLoadCallback(
-        onAdLoaded: (ad) {
-          Navigator.pop(context);
-
-          //reward listener
-          ad.show(
-            onUserEarnedReward: (AdWithoutView ad, RewardItem rewardItem) {
-              onComplete();
-            },
-          );
-        },
-        onAdFailedToLoad: (err) {
-          Navigator.pop(context);
-          log('Failed to load an interstitial ad: ${err.message}');
-          // onComplete();
-        },
-      ),
-    );
-  }
-
-  // ****************** Consent ****************************
-  static void showConsentUMP() {
-    log("showConsentUMP called");
-    if (AppRemoteConfig.hideAds) return;
-
-    final params = ConsentRequestParameters();
-    ConsentInformation.instance.requestConsentInfoUpdate(
-      params,
-      () async {
-        if (await ConsentInformation.instance.isConsentFormAvailable()) {
-          loadForm();
-        }
-      },
-      (FormError error) {
-        // Handle the error
-      },
-    );
-  }
-
-  static void loadForm() {
-    ConsentForm.loadConsentForm(
-      (ConsentForm consentForm) async {
-        var status = await ConsentInformation.instance.getConsentStatus();
-        if (status == ConsentStatus.required) {
-          consentForm.show((FormError? formError) {
-            loadForm();
-          });
-        }
-      },
-      (formError) {
-        // Handle the error
-      },
-    );
-  }
-}
diff --git a/lib/src/utils/ads/app_life_cycle_reactor.dart b/lib/src/utils/ads/app_life_cycle_reactor.dart
deleted file mode 100644
index b66c9b5..0000000
--- a/lib/src/utils/ads/app_life_cycle_reactor.dart
+++ /dev/null
@@ -1,28 +0,0 @@
-import 'dart:developer';
-
-import 'package:google_mobile_ads/google_mobile_ads.dart';
-
-import 'app_open_ad_manager.dart';
-
-/// Listens for app foreground events and shows app open ads.
-class AppLifecycleReactor {
-  final AppOpenAdManager appOpenAdManager;
-
-  AppLifecycleReactor({required this.appOpenAdManager});
-
-  void listenToAppStateChanges() {
-    AppStateEventNotifier.startListening();
-
-    AppStateEventNotifier.appStateStream
-        .forEach((state) => _onAppStateChanged(state));
-  }
-
-  void _onAppStateChanged(AppState appState) {
-    log('AppState: $appState');
-    // Try to show an app open ad if the app is being resumed and
-    // we're not already showing an app open ad.
-    if (appState == AppState.foreground) {
-      appOpenAdManager.showAdIfAvailable();
-    }
-  }
-}
diff --git a/lib/src/utils/ads/app_open_ad_manager.dart b/lib/src/utils/ads/app_open_ad_manager.dart
deleted file mode 100644
index 592efeb..0000000
--- a/lib/src/utils/ads/app_open_ad_manager.dart
+++ /dev/null
@@ -1,87 +0,0 @@
-import 'dart:developer';
-
-import 'package:flutter/material.dart';
-import 'package:google_mobile_ads/google_mobile_ads.dart';
-import 'package:vs_live/src/utils/ads/ad_helper.dart';
-
-import 'package:vs_live/src/utils/remote_config/remote_config.dart';
-
-class AppOpenAdManager {
-  String adUnitId = AdHelper.appOpenAdUnitId;
-
-  AppOpenAd? _appOpenAd;
-  bool _isShowingAd = false;
-
-  final Duration maxCacheDuration = const Duration(hours: 4);
-
-  /// Keep track of load time so we don't show an expired ad.
-  DateTime? _appOpenLoadTime;
-
-  /// Load an AppOpenAd.
-  void loadAd({VoidCallback? onAdLoaded}) {
-    AppOpenAd.load(
-      adUnitId: adUnitId,
-      request: const AdRequest(),
-      adLoadCallback: AppOpenAdLoadCallback(
-        onAdLoaded: (ad) {
-          _appOpenAd = ad;
-          log('AppOpenAd loaded');
-          _appOpenLoadTime = DateTime.now();
-          onAdLoaded?.call();
-        },
-        onAdFailedToLoad: (error) {
-          log('AppOpenAd failed to load: $error');
-          // Handle the error.
-        },
-      ),
-    );
-  }
-
-  /// Whether an ad is available to be shown.
-  bool get isAdAvailable {
-    return _appOpenAd != null;
-  }
-
-  void showAdIfAvailable() {
-    if (AppRemoteConfig.hideAds || AppRemoteConfig.hideAppOpenAd) return;
-
-    if (!isAdAvailable) {
-      log('Tried to show ad before available.');
-      loadAd();
-      return;
-    }
-    if (_isShowingAd) {
-      log('Tried to show ad while already showing an ad.');
-      return;
-    }
-    if (DateTime.now().subtract(maxCacheDuration).isAfter(_appOpenLoadTime!)) {
-      log('Maximum cache duration exceeded. Loading another ad.');
-      _appOpenAd!.dispose();
-      _appOpenAd = null;
-      loadAd();
-      return;
-    }
-
-    // Set the fullScreenContentCallback and show the ad.
-    _appOpenAd!.fullScreenContentCallback = FullScreenContentCallback(
-      onAdShowedFullScreenContent: (ad) {
-        _isShowingAd = true;
-        log('$ad onAdShowedFullScreenContent');
-      },
-      onAdFailedToShowFullScreenContent: (ad, error) {
-        log('$ad onAdFailedToShowFullScreenContent: $error');
-        _isShowingAd = false;
-        ad.dispose();
-        _appOpenAd = null;
-      },
-      onAdDismissedFullScreenContent: (ad) {
-        log('$ad onAdDismissedFullScreenContent');
-        _isShowingAd = false;
-        ad.dispose();
-        _appOpenAd = null;
-        loadAd();
-      },
-    );
-    _appOpenAd!.show();
-  }
-}
diff --git a/lib/src/utils/ads/app_open_ad_widget.dart b/lib/src/utils/ads/app_open_ad_widget.dart
deleted file mode 100644
index 4e8d3ef..0000000
--- a/lib/src/utils/ads/app_open_ad_widget.dart
+++ /dev/null
@@ -1,45 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:vs_live/src/utils/ads/ad_helper.dart';
-import 'package:vs_live/src/utils/remote_config/remote_config.dart';
-
-import 'app_life_cycle_reactor.dart';
-import 'app_open_ad_manager.dart';
-
-class AppOpenAdWidget extends StatefulWidget {
-  const AppOpenAdWidget({super.key, required this.child});
-
-  final Widget child;
-
-  @override
-  State<AppOpenAdWidget> createState() => _AppOpenAdWidgetState();
-}
-
-class _AppOpenAdWidgetState extends State<AppOpenAdWidget> {
-  late AppLifecycleReactor _appLifecycleReactor;
-  final AppOpenAdManager _appOpenAdManager = AppOpenAdManager();
-
-  @override
-  void initState() {
-    super.initState();
-
-    if (AppRemoteConfig.hideAds) return;
-
-    AdHelper.showConsentUMP();
-
-    if (!AppRemoteConfig.hideAppOpenAdListener) {
-      _appOpenAdManager.loadAd(onAdLoaded: () {
-        _appOpenAdManager.showAdIfAvailable();
-      });
-
-      _appLifecycleReactor = AppLifecycleReactor(
-        appOpenAdManager: _appOpenAdManager,
-      );
-      _appLifecycleReactor.listenToAppStateChanges();
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return widget.child;
-  }
-}
diff --git a/lib/src/utils/ads/consent_manager.dart b/lib/src/utils/ads/consent_manager.dart
deleted file mode 100644
index ee39632..0000000
--- a/lib/src/utils/ads/consent_manager.dart
+++ /dev/null
@@ -1,59 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:google_mobile_ads/google_mobile_ads.dart';
-
-class ConsentManager with ChangeNotifier {
-  ConsentStatus? status;
-
-  bool get hasConsent =>
-      status == ConsentStatus.obtained || status == ConsentStatus.notRequired;
-
-  ConsentManager() {
-    ConsentInformation.instance.getConsentStatus().then((status) {
-      status = status;
-      notifyListeners();
-    });
-  }
-
-  void updateConsent() {
-    final params = ConsentRequestParameters(
-      tagForUnderAgeOfConsent: false,
-      consentDebugSettings: ConsentDebugSettings(
-        debugGeography: DebugGeography.debugGeographyDisabled,
-      ),
-    );
-    ConsentInformation.instance.requestConsentInfoUpdate(
-      params,
-      () async {
-        if (await ConsentInformation.instance.isConsentFormAvailable()) {
-          _loadForm();
-        }
-      },
-      (FormError error) {},
-    );
-  }
-
-  void _loadForm() {
-    ConsentForm.loadConsentForm(
-      (consentForm) async {
-        status = await ConsentInformation.instance.getConsentStatus();
-        if (status == ConsentStatus.required) {
-          consentForm.show(
-            (formError) => _loadForm(),
-          );
-        }
-      },
-      (formError) {},
-    );
-  }
-
-  Future<void> debugReset() async {
-    await ConsentInformation.instance.reset();
-  }
-}
-
-/// Helper variable to determine if the privacy options entry point is required.
-Future<bool> isPrivacyOptionsRequired() async {
-  return await ConsentInformation.instance
-          .getPrivacyOptionsRequirementStatus() ==
-      PrivacyOptionsRequirementStatus.required;
-}
diff --git a/lib/src/utils/dio_client/dio_client.dart b/lib/src/utils/dio_client/dio_client.dart
index 77a1b7a..5b08fd2 100644
--- a/lib/src/utils/dio_client/dio_client.dart
+++ b/lib/src/utils/dio_client/dio_client.dart
@@ -1,6 +1,5 @@
 import 'package:dio/dio.dart';
 import 'package:flutter/foundation.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:pretty_dio_logger/pretty_dio_logger.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:vs_live/src/config/env.dart';
@@ -24,24 +23,25 @@ class DioClient {
 
   Dio _createDioClient() {
     final baseUrl = Env.baseUrl;
-    final dio = Dio()
-      ..options = BaseOptions(
-        baseUrl: baseUrl,
-        headers: {
-          Headers.acceptHeader: Headers.jsonContentType,
-          Headers.contentTypeHeader: Headers.jsonContentType,
-        },
-      )
-      ..interceptors.addAll([
-        if (!kReleaseMode)
-          PrettyDioLogger(
-            requestHeader: true,
-            requestBody: true,
-            responseHeader: true,
-          ),
-        AuthInterceptor(),
-        AppInterceptor(),
-      ]);
+    final dio =
+        Dio()
+          ..options = BaseOptions(
+            baseUrl: baseUrl,
+            headers: {
+              Headers.acceptHeader: Headers.jsonContentType,
+              Headers.contentTypeHeader: Headers.jsonContentType,
+            },
+          )
+          ..interceptors.addAll([
+            if (!kReleaseMode)
+              PrettyDioLogger(
+                requestHeader: true,
+                requestBody: true,
+                responseHeader: true,
+              ),
+            AuthInterceptor(),
+            AppInterceptor(),
+          ]);
 
     return dio;
   }
@@ -50,45 +50,47 @@ class DioClient {
 @riverpod
 Dio defaultDioClient(Ref ref) {
   final baseUrl = Env.baseUrl;
-  final dio = Dio()
-    ..options = BaseOptions(
-      baseUrl: baseUrl,
-      headers: {
-        Headers.acceptHeader: Headers.jsonContentType,
-        Headers.contentTypeHeader: Headers.jsonContentType,
-      },
-    )
-    ..interceptors.addAll([
-      if (!kReleaseMode)
-        PrettyDioLogger(
-          requestHeader: true,
-          requestBody: true,
-          responseHeader: true,
-        ),
-      AuthInterceptor(),
-      AppInterceptor(),
-    ]);
+  final dio =
+      Dio()
+        ..options = BaseOptions(
+          baseUrl: baseUrl,
+          headers: {
+            Headers.acceptHeader: Headers.jsonContentType,
+            Headers.contentTypeHeader: Headers.jsonContentType,
+          },
+        )
+        ..interceptors.addAll([
+          if (!kReleaseMode)
+            PrettyDioLogger(
+              requestHeader: true,
+              requestBody: true,
+              responseHeader: true,
+            ),
+          AuthInterceptor(),
+          AppInterceptor(),
+        ]);
   return dio;
 }
 
 @riverpod
 Dio bslDioClient(Ref ref) {
   final baseUrl = Env.bslApiUrl;
-  final dio = Dio()
-    ..options = BaseOptions(
-      baseUrl: baseUrl,
-      headers: {
-        Headers.acceptHeader: Headers.jsonContentType,
-        Headers.contentTypeHeader: Headers.jsonContentType,
-      },
-    )
-    ..interceptors.addAll([
-      if (!kReleaseMode)
-        PrettyDioLogger(
-          requestHeader: true,
-          requestBody: true,
-          responseHeader: true,
-        ),
-    ]);
+  final dio =
+      Dio()
+        ..options = BaseOptions(
+          baseUrl: baseUrl,
+          headers: {
+            Headers.acceptHeader: Headers.jsonContentType,
+            Headers.contentTypeHeader: Headers.jsonContentType,
+          },
+        )
+        ..interceptors.addAll([
+          if (!kReleaseMode)
+            PrettyDioLogger(
+              requestHeader: true,
+              requestBody: true,
+              responseHeader: true,
+            ),
+        ]);
   return dio;
 }
diff --git a/lib/src/utils/dio_client/highlight_client/highlight_dio_client.dart b/lib/src/utils/dio_client/highlight_client/highlight_dio_client.dart
index 684fa7e..60afd54 100644
--- a/lib/src/utils/dio_client/highlight_client/highlight_dio_client.dart
+++ b/lib/src/utils/dio_client/highlight_client/highlight_dio_client.dart
@@ -1,6 +1,5 @@
 import 'package:dio/dio.dart';
 import 'package:flutter/foundation.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:pretty_dio_logger/pretty_dio_logger.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
diff --git a/lib/src/utils/native_id.dart b/lib/src/utils/native_id.dart
index 752f9e3..1972594 100644
--- a/lib/src/utils/native_id.dart
+++ b/lib/src/utils/native_id.dart
@@ -1,5 +1,5 @@
 import 'package:native_id/native_id.dart';
 
 Future<String?> getNativeDeviceId() async {
-  return NativeId().getId();
+  return await NativeIdService.getDeviceId();
 }
diff --git a/lib/src/utils/onesignal/onesignal.dart b/lib/src/utils/onesignal/onesignal.dart
index e76b31d..70fecc8 100644
--- a/lib/src/utils/onesignal/onesignal.dart
+++ b/lib/src/utils/onesignal/onesignal.dart
@@ -1,36 +1,36 @@
-import 'dart:developer';
+// import 'dart:developer';
 
-import 'package:flutter/foundation.dart';
-import 'package:onesignal_flutter/onesignal_flutter.dart';
-import 'package:vs_live/src/config/env.dart';
-import 'package:vs_live/src/utils/native_id.dart';
+// import 'package:flutter/foundation.dart';
+// import 'package:onesignal_flutter/onesignal_flutter.dart';
+// import 'package:vs_live/src/config/env.dart';
+// import 'package:vs_live/src/utils/native_id.dart';
 
-Future<void> initOnesignal() async {
-  if (!kReleaseMode) {
-    OneSignal.Debug.setLogLevel(OSLogLevel.verbose);
-  }
+// Future<void> initOnesignal() async {
+//   if (!kReleaseMode) {
+//     OneSignal.Debug.setLogLevel(OSLogLevel.verbose);
+//   }
 
-  OneSignal.initialize(Env.onesignalAppId);
-  final granted = await OneSignal.Notifications.requestPermission(true);
+//   OneSignal.initialize(Env.onesignalAppId);
+//   final granted = await OneSignal.Notifications.requestPermission(true);
 
-  final deviceId = await getNativeDeviceId();
-  if (deviceId != null && deviceId.isNotEmpty && granted) {
-    log("Device: $deviceId");
-    OneSignal.login(deviceId);
-  }
-}
+//   final deviceId = await getNativeDeviceId();
+//   if (deviceId != null && deviceId.isNotEmpty && granted) {
+//     log("Device: $deviceId");
+//     OneSignal.login(deviceId);
+//   }
+// }
 
-Future<void> disablePush([bool disable = true]) async {
-  if (disable) {
-    OneSignal.User.pushSubscription.optOut();
-  } else {
-    final granted = await OneSignal.Notifications.requestPermission(true);
-    if (granted) {
-      OneSignal.User.pushSubscription.optIn();
-    }
-  }
-}
+// Future<void> disablePush([bool disable = true]) async {
+//   if (disable) {
+//     OneSignal.User.pushSubscription.optOut();
+//   } else {
+//     final granted = await OneSignal.Notifications.requestPermission(true);
+//     if (granted) {
+//       OneSignal.User.pushSubscription.optIn();
+//     }
+//   }
+// }
 
-bool? getPushSubsciption() {
-  return OneSignal.User.pushSubscription.optedIn;
-}
+// bool? getPushSubsciption() {
+//   return OneSignal.User.pushSubscription.optedIn;
+// }
diff --git a/lib/src/utils/prefs_manager.dart b/lib/src/utils/prefs_manager.dart
index cff64c0..fd5343b 100644
--- a/lib/src/utils/prefs_manager.dart
+++ b/lib/src/utils/prefs_manager.dart
@@ -1,4 +1,3 @@
-import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:vs_live/main.dart';
@@ -55,7 +54,7 @@ class PreferenceManager {
   }
 }
 
-@riverpod
+@Riverpod(keepAlive: true)
 PreferenceManager preferenceManager(Ref ref) {
   return PreferenceManager(sharedPreferences);
 }
diff --git a/lib/src/widgets/ads/banner_ad_widget.dart b/lib/src/widgets/ads/banner_ad_widget.dart
deleted file mode 100644
index 9f32631..0000000
--- a/lib/src/widgets/ads/banner_ad_widget.dart
+++ /dev/null
@@ -1,51 +0,0 @@
-import 'dart:developer';
-
-import 'package:flutter/material.dart';
-import 'package:google_mobile_ads/google_mobile_ads.dart';
-import 'package:vs_live/src/utils/ads/ad_helper.dart';
-
-class BannerAdWidget extends StatefulWidget {
-  const BannerAdWidget({super.key});
-
-  @override
-  State<BannerAdWidget> createState() => _BannerAdWidgetState();
-}
-
-class _BannerAdWidgetState extends State<BannerAdWidget> {
-  BannerAd? _bannerAd;
-  bool _isLoaded = false;
-
-  @override
-  void initState() {
-    super.initState();
-    loadAd();
-  }
-
-  void loadAd() async {
-    final ad = AdHelper.loadBannerAd(
-      onLoaded: () {
-        setState(() {
-          _isLoaded = true;
-        });
-      },
-    );
-
-    setState(() {
-      _bannerAd = ad;
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    log("_isLoaded: $_isLoaded");
-    return _bannerAd != null && _isLoaded
-        ? SafeArea(
-            child: SizedBox(
-              width: double.infinity,
-              height: _bannerAd!.size.height.toDouble(),
-              child: AdWidget(ad: _bannerAd!),
-            ),
-          )
-        : const SizedBox();
-  }
-}
diff --git a/lib/src/widgets/ads/native_ad_widget.dart b/lib/src/widgets/ads/native_ad_widget.dart
deleted file mode 100644
index 6548536..0000000
--- a/lib/src/widgets/ads/native_ad_widget.dart
+++ /dev/null
@@ -1,62 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:google_mobile_ads/google_mobile_ads.dart';
-import 'package:vs_live/src/utils/ads/ad_helper.dart';
-
-class NativeAdWidget extends StatefulWidget {
-  const NativeAdWidget({super.key, this.height = 400});
-
-  final double height;
-
-  @override
-  State<NativeAdWidget> createState() => _NativeAdWidgetState();
-}
-
-class _NativeAdWidgetState extends State<NativeAdWidget> {
-  NativeAd? _nativeAd;
-  bool _isNativeAdLoaded = false;
-
-  @override
-  void initState() {
-    super.initState();
-
-    final nativeAd = AdHelper.loadNativeAd(
-      onLoaded: () {
-        setState(() {
-          _isNativeAdLoaded = true;
-        });
-      },
-    );
-
-    setState(() {
-      _nativeAd = nativeAd;
-    });
-  }
-
-  @override
-  void dispose() {
-    _nativeAd?.dispose();
-    _nativeAd = null;
-    _isNativeAdLoaded = false;
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    if (_isNativeAdLoaded && _nativeAd != null) {
-      return Container(
-        padding: const EdgeInsets.symmetric(vertical: 8.0),
-        width: double.infinity,
-        alignment: Alignment.center,
-        height: widget.height,
-        child: AdWidget(ad: _nativeAd!),
-      );
-    }
-
-    return Container(
-      alignment: Alignment.center,
-      height: 150.0,
-      color: Colors.grey[300],
-      child: const Text("Ad loading..."),
-    );
-  }
-}
diff --git a/lib/src/widgets/ads/watch_ad_dialog.dart b/lib/src/widgets/ads/watch_ad_dialog.dart
deleted file mode 100644
index 83749de..0000000
--- a/lib/src/widgets/ads/watch_ad_dialog.dart
+++ /dev/null
@@ -1,30 +0,0 @@
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-
-class WatchAdDialog extends StatelessWidget {
-  final VoidCallback onComplete;
-
-  const WatchAdDialog({
-    super.key,
-    required this.onComplete,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return CupertinoAlertDialog(
-      title: const Text('Change Theme'),
-      content: const Text('Watch an Ad to Change App Theme.'),
-      actions: [
-        CupertinoDialogAction(
-          isDefaultAction: true,
-          textStyle: const TextStyle(color: Colors.green),
-          child: const Text('Watch Ad'),
-          onPressed: () {
-            Navigator.pop(context);
-            onComplete();
-          },
-        ),
-      ],
-    );
-  }
-}
diff --git a/lib/src/widgets/grid_view/staggered_grid_view_with_banner_ads.dart b/lib/src/widgets/grid_view/staggered_grid_view_with_banner_ads.dart
deleted file mode 100644
index b8cbef4..0000000
--- a/lib/src/widgets/grid_view/staggered_grid_view_with_banner_ads.dart
+++ /dev/null
@@ -1,75 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
-import 'package:google_mobile_ads/google_mobile_ads.dart';
-
-class StaggeredGridViewWithBannerAds extends StatelessWidget {
-  const StaggeredGridViewWithBannerAds({
-    super.key,
-    required this.gridItems,
-    required this.bannerAds,
-    required this.isAdLoaded,
-  });
-
-  final List<dynamic> gridItems;
-  final Map<int, BannerAd> bannerAds;
-  final Map<int, bool> isAdLoaded;
-
-  @override
-  Widget build(BuildContext context) {
-    return StaggeredGrid.count(
-      crossAxisCount: 2,
-      mainAxisSpacing: 10,
-      crossAxisSpacing: 10,
-      children: List.generate(
-        gridItems.length,
-        (index) {
-          final item = gridItems[index];
-
-          if (item is String && item.startsWith("ad-")) {
-            int adIndex = int.parse(item.split("-")[1]);
-
-            if (isAdLoaded[adIndex] == true && bannerAds[adIndex] != null) {
-              return StaggeredGridTile.count(
-                crossAxisCellCount: 2,
-                mainAxisCellCount: 1,
-                // child: AdWidget(ad: nativeAds[adIndex]!),
-                child: SizedBox(
-                  width: double.infinity,
-                  height: bannerAds[adIndex]!.size.height.toDouble(),
-                  child: AdWidget(ad: bannerAds[adIndex]!),
-                ),
-              );
-            } else {
-              return StaggeredGridTile.count(
-                crossAxisCellCount: 2,
-                mainAxisCellCount: 1,
-                child: SafeArea(
-                  child: SizedBox(
-                    width: double.infinity,
-                    height: bannerAds[adIndex]!.size.height.toDouble(),
-                    child: Center(
-                      child: Text(
-                        "Ad loading...",
-                        style: Theme.of(context)
-                            .textTheme
-                            .labelMedium
-                            ?.copyWith(
-                                color: Theme.of(context).colorScheme.onSurface),
-                      ),
-                    ),
-                  ),
-                ),
-              );
-            }
-          } else {
-            return StaggeredGridTile.count(
-              crossAxisCellCount: 1,
-              mainAxisCellCount: 1,
-              child: gridItems[index],
-            );
-          }
-        },
-      ),
-    );
-  }
-}
diff --git a/lib/src/widgets/grid_view/staggered_grid_view_with_native_ads.dart b/lib/src/widgets/grid_view/staggered_grid_view_with_native_ads.dart
deleted file mode 100644
index f2e848a..0000000
--- a/lib/src/widgets/grid_view/staggered_grid_view_with_native_ads.dart
+++ /dev/null
@@ -1,70 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
-import 'package:google_mobile_ads/google_mobile_ads.dart';
-
-class StaggeredGridViewWithNativeAds extends StatelessWidget {
-  const StaggeredGridViewWithNativeAds({
-    super.key,
-    required this.gridItems,
-    required this.nativeAds,
-    required this.isAdLoaded,
-  });
-
-  final List<dynamic> gridItems;
-  final Map<int, NativeAd> nativeAds;
-  final Map<int, bool> isAdLoaded;
-
-  @override
-  Widget build(BuildContext context) {
-    return StaggeredGrid.count(
-      crossAxisCount: 2,
-      mainAxisSpacing: 10,
-      crossAxisSpacing: 10,
-      children: List.generate(
-        gridItems.length,
-        (index) {
-          final item = gridItems[index];
-
-          if (item is String && item.startsWith("ad-")) {
-            int adIndex = int.parse(item.split("-")[1]);
-
-            if (isAdLoaded[adIndex] == true && nativeAds[adIndex] != null) {
-              return StaggeredGridTile.count(
-                crossAxisCellCount: 2,
-                mainAxisCellCount: 2,
-                child: Container(
-                  padding: const EdgeInsets.all(8.0),
-                  width: double.infinity,
-                  alignment: Alignment.center,
-                  child: AdWidget(ad: nativeAds[adIndex]!),
-                ),
-              );
-            } else {
-              return StaggeredGridTile.count(
-                crossAxisCellCount: 2,
-                mainAxisCellCount: 1,
-                child: Container(
-                  alignment: Alignment.center,
-                  color: Theme.of(context).cardColor,
-                  width: double.infinity,
-                  height: 150.0,
-                  child: Text(
-                    "Ad loading...",
-                    style: Theme.of(context).textTheme.labelMedium?.copyWith(
-                        color: Theme.of(context).colorScheme.onSurface),
-                  ),
-                ),
-              );
-            }
-          } else {
-            return StaggeredGridTile.count(
-              crossAxisCellCount: 1,
-              mainAxisCellCount: 1,
-              child: gridItems[index],
-            );
-          }
-        },
-      ),
-    );
-  }
-}
diff --git a/lib/src/widgets/masonry_grid_with_ads.dart b/lib/src/widgets/masonry_grid_with_ads.dart
deleted file mode 100644
index 4a507e7..0000000
--- a/lib/src/widgets/masonry_grid_with_ads.dart
+++ /dev/null
@@ -1,63 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
-import 'package:google_mobile_ads/google_mobile_ads.dart';
-
-class MasonryGridWithAds extends StatelessWidget {
-  final List<dynamic> gridItems;
-  final List<NativeAd?> nativeAds;
-  final List<bool> isAdLoaded;
-
-  const MasonryGridWithAds({
-    super.key,
-    required this.gridItems,
-    required this.nativeAds,
-    required this.isAdLoaded,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return MasonryGridView.builder(
-      gridDelegate: const SliverSimpleGridDelegateWithFixedCrossAxisCount(
-        crossAxisCount: 2, // Two columns for regular items
-      ),
-      mainAxisSpacing: 10.0,
-      crossAxisSpacing: 10.0,
-      itemCount: gridItems.length,
-      itemBuilder: (context, index) {
-        final item = gridItems[index];
-
-        if (item is String && item.startsWith("ad-")) {
-          // Ad placeholder logic
-          int adIndex = int.parse(item.split("-")[1]);
-
-          if (isAdLoaded[adIndex] && nativeAds[adIndex] != null) {
-            return Container(
-              padding: const EdgeInsets.all(8.0),
-              child: AdWidget(ad: nativeAds[adIndex]!),
-            );
-          } else {
-            return Container(
-              alignment: Alignment.center,
-              color: Theme.of(context).cardColor,
-              height: 150.0,
-              child: Text(
-                "Ad loading...",
-                style: Theme.of(context)
-                    .textTheme
-                    .labelMedium
-                    ?.copyWith(color: Theme.of(context).colorScheme.onSurface),
-              ),
-            );
-          }
-        } else {
-          // Regular grid item
-          return Container(
-            alignment: Alignment.center,
-            color: Colors.blue[100 * (index % 9)],
-            child: Text(item),
-          );
-        }
-      },
-    );
-  }
-}
diff --git a/lib/src/widgets/masonry_grid_with_ads_scrollview.dart b/lib/src/widgets/masonry_grid_with_ads_scrollview.dart
deleted file mode 100644
index 7d74d0d..0000000
--- a/lib/src/widgets/masonry_grid_with_ads_scrollview.dart
+++ /dev/null
@@ -1,76 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:google_mobile_ads/google_mobile_ads.dart';
-
-class MasonryGridWithAdsScrollView extends StatelessWidget {
-  final List<dynamic> gridItems; // Items and ad placeholders
-  final List<NativeAd?> nativeAds;
-  final List<bool> isAdLoaded;
-
-  const MasonryGridWithAdsScrollView({
-    super.key,
-    required this.gridItems,
-    required this.nativeAds,
-    required this.isAdLoaded,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return CustomScrollView(
-      slivers: [
-        const SliverAppBar(
-          pinned: true,
-          expandedHeight: 150.0,
-          flexibleSpace: FlexibleSpaceBar(
-            title: Text("CustomScrollView Example"),
-          ),
-        ),
-        SliverPadding(
-          padding: const EdgeInsets.all(8.0),
-          sliver: SliverList(
-            delegate: SliverChildBuilderDelegate(
-              (context, index) {
-                final item = gridItems[index];
-
-                if (item is String && item.startsWith("ad-")) {
-                  // Ad placeholder logic
-                  int adIndex = int.parse(item.split("-")[1]);
-
-                  if (isAdLoaded[adIndex] && nativeAds[adIndex] != null) {
-                    return Container(
-                      margin: const EdgeInsets.symmetric(vertical: 8.0),
-                      child: AdWidget(ad: nativeAds[adIndex]!),
-                    );
-                  } else {
-                    return Container(
-                      height: 150.0,
-                      alignment: Alignment.center,
-                      color: Theme.of(context).cardColor,
-                      child: Text(
-                        "Ad loading...",
-                        style: Theme.of(context)
-                            .textTheme
-                            .labelMedium
-                            ?.copyWith(
-                                color: Theme.of(context).colorScheme.onSurface),
-                      ),
-                    );
-                  }
-                } else {
-                  // Regular grid item
-                  return Container(
-                    margin: const EdgeInsets.symmetric(vertical: 8.0),
-                    alignment: Alignment.center,
-                    height: index.isEven ? 200.0 : 150.0, // Variable height
-                    color: Colors.blue[100 * (index % 9)],
-                    child: Text(item),
-                  );
-                }
-              },
-              childCount: gridItems.length,
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-}
diff --git a/lib/src/widgets/placeholder/empty_placeholder_widget.dart b/lib/src/widgets/placeholder/empty_placeholder_widget.dart
index 01b0f25..6b820f5 100644
--- a/lib/src/widgets/placeholder/empty_placeholder_widget.dart
+++ b/lib/src/widgets/placeholder/empty_placeholder_widget.dart
@@ -6,11 +6,7 @@ import 'package:vs_live/src/routing/app_router.dart';
 
 /// Placeholder widget showing a message and CTA to go back to the home screen.
 class EmptyPlaceholderWidget extends ConsumerWidget {
-  const EmptyPlaceholderWidget({
-    super.key,
-    required this.message,
-    this.onTap,
-  });
+  const EmptyPlaceholderWidget({super.key, required this.message, this.onTap});
 
   final String message;
   final VoidCallback? onTap;
@@ -26,17 +22,17 @@ class EmptyPlaceholderWidget extends ConsumerWidget {
           children: [
             Text(
               message,
-              style: Theme.of(context)
-                  .textTheme
-                  .headlineMedium
-                  ?.copyWith(color: Theme.of(context).colorScheme.onSurface),
+              style: Theme.of(context).textTheme.headlineMedium?.copyWith(
+                color: Theme.of(context).colorScheme.onSurface,
+              ),
               textAlign: TextAlign.center,
             ),
             gapH32,
             FilledButton(
-              onPressed: onTap ??
+              onPressed:
+                  onTap ??
                   () {
-                    context.goNamed(AppRoute.home.name);
+                    context.goNamed(AppRoute.socoLivess.name);
                   },
               child: const Text('Go Home'),
             ),
diff --git a/lib/src/widgets/settings/notification_list_tile.dart b/lib/src/widgets/settings/notification_list_tile.dart
index 880770a..79ebfc7 100644
--- a/lib/src/widgets/settings/notification_list_tile.dart
+++ b/lib/src/widgets/settings/notification_list_tile.dart
@@ -1,10 +1,8 @@
 import 'package:flutter/material.dart';
-import 'package:vs_live/src/utils/onesignal/onesignal.dart';
+// import 'package:vs_live/src/utils/onesignal/onesignal.dart';
 
 class NotificationSwitchListTile extends StatefulWidget {
-  const NotificationSwitchListTile({
-    super.key,
-  });
+  const NotificationSwitchListTile({super.key});
 
   @override
   State<NotificationSwitchListTile> createState() =>
@@ -17,10 +15,10 @@ class _NotificationSwitchListTileState
 
   @override
   void initState() {
-    final flag = getPushSubsciption();
-    setState(() {
-      _enabled = flag ?? false;
-    });
+    // final flag = getPushSubsciption();
+    // setState(() {
+    //   _enabled = flag ?? false;
+    // });
     super.initState();
   }
 
@@ -32,7 +30,7 @@ class _NotificationSwitchListTileState
         setState(() {
           _enabled = newValue;
         });
-        await disablePush(!newValue);
+        // await disablePush(!newValue);
       },
       secondary: const Icon(Icons.notifications_outlined),
       title: const Text('Notification'),
diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc
index 3792af4..f6f23bf 100644
--- a/linux/flutter/generated_plugin_registrant.cc
+++ b/linux/flutter/generated_plugin_registrant.cc
@@ -6,13 +6,9 @@
 
 #include "generated_plugin_registrant.h"
 
-#include <gtk/gtk_plugin.h>
 #include <url_launcher_linux/url_launcher_plugin.h>
 
 void fl_register_plugins(FlPluginRegistry* registry) {
-  g_autoptr(FlPluginRegistrar) gtk_registrar =
-      fl_plugin_registry_get_registrar_for_plugin(registry, "GtkPlugin");
-  gtk_plugin_register_with_registrar(gtk_registrar);
   g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin");
   url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar);
diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake
index 5d07423..f16b4c3 100644
--- a/linux/flutter/generated_plugins.cmake
+++ b/linux/flutter/generated_plugins.cmake
@@ -3,7 +3,6 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
-  gtk
   url_launcher_linux
 )
 
diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift
index 4a7bb4a..42c7598 100644
--- a/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -5,7 +5,6 @@
 import FlutterMacOS
 import Foundation
 
-import app_links
 import device_info_plus
 import firebase_analytics
 import firebase_core
@@ -21,12 +20,11 @@ import wakelock_plus
 import webview_flutter_wkwebview
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
-  AppLinksMacosPlugin.register(with: registry.registrar(forPlugin: "AppLinksMacosPlugin"))
   DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
   FirebaseAnalyticsPlugin.register(with: registry.registrar(forPlugin: "FirebaseAnalyticsPlugin"))
   FLTFirebaseCorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCorePlugin"))
   FLTFirebaseCrashlyticsPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCrashlyticsPlugin"))
-  FLTFirebaseRemoteConfigPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseRemoteConfigPlugin"))
+  FirebaseRemoteConfigPlugin.register(with: registry.registrar(forPlugin: "FirebaseRemoteConfigPlugin"))
   FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
diff --git a/pubspec.lock b/pubspec.lock
index 79d34c7..0a5d1f5 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -5,66 +5,34 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: e55636ed79578b9abca5fecf9437947798f5ef7456308b5cb85720b793eac92f
+      sha256: c209688d9f5a5f26b2fb47a188131a6fb9e876ae9e47af3737c0b4f58a93470d
       url: "https://pub.dev"
     source: hosted
-    version: "82.0.0"
+    version: "91.0.0"
   _flutterfire_internals:
     dependency: transitive
     description:
       name: _flutterfire_internals
-      sha256: "50e24b769bd1e725732f0aff18b806b8731c1fbcf4e8018ab98e7c4805a2a52f"
+      sha256: e4a1b612fd2955908e26116075b3a4baf10c353418ca645b4deae231c82bf144
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.57"
+    version: "1.3.65"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      sha256: "904ae5bb474d32c38fb9482e2d925d5454cda04ddd0e55d2e6826bc72f6ba8c0"
+      sha256: f51c8499b35f9b26820cfe914828a6a98a94efd5cc78b37bb7d03debae3a1d08
       url: "https://pub.dev"
     source: hosted
-    version: "7.4.5"
-  analyzer_plugin:
+    version: "8.4.1"
+  analyzer_buffer:
     dependency: transitive
     description:
-      name: analyzer_plugin
-      sha256: ee188b6df6c85f1441497c7171c84f1392affadc0384f71089cb10a3bc508cef
+      name: analyzer_buffer
+      sha256: aba2f75e63b3135fd1efaa8b6abefe1aa6e41b6bd9806221620fa48f98156033
       url: "https://pub.dev"
     source: hosted
-    version: "0.13.1"
-  app_links:
-    dependency: "direct main"
-    description:
-      name: app_links
-      sha256: "85ed8fc1d25a76475914fff28cc994653bd900bc2c26e4b57a49e097febb54ba"
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.4.0"
-  app_links_linux:
-    dependency: transitive
-    description:
-      name: app_links_linux
-      sha256: f5f7173a78609f3dfd4c2ff2c95bd559ab43c80a87dc6a095921d96c05688c81
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.3"
-  app_links_platform_interface:
-    dependency: transitive
-    description:
-      name: app_links_platform_interface
-      sha256: "05f5379577c513b534a29ddea68176a4d4802c46180ee8e2e966257158772a3f"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.2"
-  app_links_web:
-    dependency: transitive
-    description:
-      name: app_links_web
-      sha256: af060ed76183f9e2b87510a9480e56a5352b6c249778d07bd2c95fc35632a555
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.4"
+    version: "0.1.11"
   args:
     dependency: transitive
     description:
@@ -93,50 +61,34 @@ packages:
     dependency: transitive
     description:
       name: build
-      sha256: "51dc711996cbf609b90cbe5b335bbce83143875a9d58e4b5c6d3c4f684d3dda7"
+      sha256: c1668065e9ba04752570ad7e038288559d1e2ca5c6d0131c0f5f55e39e777413
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.4"
+    version: "4.0.3"
   build_config:
     dependency: transitive
     description:
       name: build_config
-      sha256: "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33"
+      sha256: "4f64382b97504dc2fcdf487d5aae33418e08b4703fc21249e4db6d804a4d0187"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.2"
+    version: "1.2.0"
   build_daemon:
     dependency: transitive
     description:
       name: build_daemon
-      sha256: "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.0.4"
-  build_resolvers:
-    dependency: transitive
-    description:
-      name: build_resolvers
-      sha256: ee4257b3f20c0c90e72ed2b57ad637f694ccba48839a821e87db762548c22a62
+      sha256: bf05f6e12cfea92d3c09308d7bcdab1906cd8a179b023269eed00c071004b957
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.4"
+    version: "4.1.1"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: "382a4d649addbfb7ba71a3631df0ec6a45d5ab9b098638144faf27f02778eb53"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.5.4"
-  build_runner_core:
-    dependency: transitive
-    description:
-      name: build_runner_core
-      sha256: "85fbbb1036d576d966332a3f5ce83f2ce66a40bea1a94ad2d5fc29a19a0d3792"
+      sha256: "110c56ef29b5eb367b4d17fc79375fa8c18a6cd7acd92c05bb3986c17a079057"
       url: "https://pub.dev"
     source: hosted
-    version: "9.1.2"
+    version: "2.10.4"
   built_collection:
     dependency: transitive
     description:
@@ -149,10 +101,10 @@ packages:
     dependency: transitive
     description:
       name: built_value
-      sha256: "082001b5c3dc495d4a42f1d5789990505df20d8547d42507c29050af6933ee27"
+      sha256: "426cf75afdb23aa74bd4e471704de3f9393f3c7b04c1e2d9c6f1073ae0b8b139"
       url: "https://pub.dev"
     source: hosted
-    version: "8.10.1"
+    version: "8.12.1"
   cached_network_image:
     dependency: "direct main"
     description:
@@ -197,26 +149,18 @@ packages:
     dependency: "direct main"
     description:
       name: chewie
-      sha256: "19b93a1e60e4ba640a792208a6543f1c7d5b124d011ce0199e2f18802199d984"
+      sha256: "44bcfc5f0dfd1de290c87c9d86a61308b3282a70b63435d5557cfd60f54a69ca"
       url: "https://pub.dev"
     source: hosted
-    version: "1.12.1"
-  ci:
-    dependency: transitive
-    description:
-      name: ci
-      sha256: "145d095ce05cddac4d797a158bc4cf3b6016d1fe63d8c3d2fbd7212590adca13"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.1.0"
-  cli_util:
+    version: "1.13.0"
+  cli_config:
     dependency: transitive
     description:
-      name: cli_util
-      sha256: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c
+      name: cli_config
+      sha256: ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec
       url: "https://pub.dev"
     source: hosted
-    version: "0.4.2"
+    version: "0.2.0"
   clock:
     dependency: transitive
     description:
@@ -229,10 +173,10 @@ packages:
     dependency: transitive
     description:
       name: code_builder
-      sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e"
+      sha256: "6a6cab2ba4680d6423f34a9b972a4c9a94ebe1b62ecec4e1a1f2cba91fd1319d"
       url: "https://pub.dev"
     source: hosted
-    version: "4.10.1"
+    version: "4.11.1"
   collection:
     dependency: transitive
     description:
@@ -249,14 +193,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.1.2"
+  coverage:
+    dependency: transitive
+    description:
+      name: coverage
+      sha256: "5da775aa218eaf2151c721b16c01c7676fbfdd99cebba2bf64e8b807a28ff94d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.15.0"
   crypto:
     dependency: transitive
     description:
       name: crypto
-      sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"
+      sha256: c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.6"
+    version: "3.0.7"
   csslib:
     dependency: transitive
     description:
@@ -273,46 +225,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.8"
-  custom_lint:
-    dependency: "direct dev"
-    description:
-      name: custom_lint
-      sha256: "409c485fd14f544af1da965d5a0d160ee57cd58b63eeaa7280a4f28cf5bda7f1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.7.5"
-  custom_lint_builder:
-    dependency: transitive
-    description:
-      name: custom_lint_builder
-      sha256: "107e0a43606138015777590ee8ce32f26ba7415c25b722ff0908a6f5d7a4c228"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.7.5"
-  custom_lint_core:
-    dependency: transitive
-    description:
-      name: custom_lint_core
-      sha256: "31110af3dde9d29fb10828ca33f1dce24d2798477b167675543ce3d208dee8be"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.7.5"
-  custom_lint_visitor:
-    dependency: transitive
-    description:
-      name: custom_lint_visitor
-      sha256: cba5b6d7a6217312472bf4468cdf68c949488aed7ffb0eab792cd0b6c435054d
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0+7.4.5"
   dart_style:
     dependency: transitive
     description:
       name: dart_style
-      sha256: "5b236382b47ee411741447c1f1e111459c941ea1b3f2b540dde54c210a3662af"
+      sha256: a9c30492da18ff84efe2422ba2d319a89942d93e58eb0b73d32abe822ef54b7b
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.0"
+    version: "3.1.3"
   dbus:
     dependency: transitive
     description:
@@ -333,10 +253,10 @@ packages:
     dependency: transitive
     description:
       name: device_info_plus
-      sha256: "98f28b42168cc509abc92f88518882fd58061ea372d7999aecc424345c7bff6a"
+      sha256: "4df8babf73058181227e18b08e6ea3520cf5fc5d796888d33b7cb0f33f984b7c"
       url: "https://pub.dev"
     source: hosted
-    version: "11.5.0"
+    version: "12.3.0"
   device_info_plus_platform_interface:
     dependency: transitive
     description:
@@ -357,10 +277,10 @@ packages:
     dependency: "direct main"
     description:
       name: dio
-      sha256: "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9"
+      sha256: d90ee57923d1828ac14e492ca49440f65477f4bb1263575900be731a3dac66a9
       url: "https://pub.dev"
     source: hosted
-    version: "5.8.0+1"
+    version: "5.9.0"
   dio_web_adapter:
     dependency: transitive
     description:
@@ -373,26 +293,26 @@ packages:
     dependency: "direct main"
     description:
       name: envied
-      sha256: a4e2b1d0caa479b5d61332ae516518c175a6d09328a35a0bc0a53894cc5d7e4d
+      sha256: "4cfe31953c13977d1118b4f14cc5dfb683d8bb4c35d5b0c64b29d5b2e30712e8"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.3.2"
   envied_generator:
     dependency: "direct dev"
     description:
       name: envied_generator
-      sha256: "894f6c5eb624c60a1ce6f642b6fd7ec68bc3440aa6f1881837aa9acbbeade0c8"
+      sha256: "04467955af3b8f8a249b2f20686f00c89a979cb077aef7d0918642978b28bdeb"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.3.2"
   equatable:
     dependency: "direct main"
     description:
       name: equatable
-      sha256: "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7"
+      sha256: "3e0141505477fd8ad55d6eb4e7776d3fe8430be8e497ccb1521370c3f21a3e2b"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.7"
+    version: "2.0.8"
   fake_async:
     dependency: transitive
     description:
@@ -405,10 +325,10 @@ packages:
     dependency: transitive
     description:
       name: ffi
-      sha256: "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418"
+      sha256: d07d37192dbf97461359c1518788f203b0c9102cfd2c35a716b823741219542c
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.5"
   file:
     dependency: transitive
     description:
@@ -421,90 +341,90 @@ packages:
     dependency: "direct main"
     description:
       name: firebase_analytics
-      sha256: b2f312c3b3bb4ebdfb7947ef5cd263d8feeb26bdefe2d639e266f2f3f13a5da1
+      sha256: "8ca4832c7a6d145ce987fd07d6dfbb8c91d9058178342f20de6305fb77b1b40d"
       url: "https://pub.dev"
     source: hosted
-    version: "11.5.1"
+    version: "12.1.0"
   firebase_analytics_platform_interface:
     dependency: transitive
     description:
       name: firebase_analytics_platform_interface
-      sha256: f670edd9046657930085b7fe7eab42fe86a6f9876f9ebf54987ebc9be79b4874
+      sha256: d00234716f415f89eb5c2cefb1238d7fd2f3120275d71414b84ae434dcdb7a19
       url: "https://pub.dev"
     source: hosted
-    version: "4.4.1"
+    version: "5.0.5"
   firebase_analytics_web:
     dependency: transitive
     description:
       name: firebase_analytics_web
-      sha256: "75633782de3e21ed86a6cfb326b3a201eded4f5d64f34dc2abfeb7c864b934c8"
+      sha256: e42b294e51aedb4bd4b761a886c8d6b473c44b44aa4c0b47cab06b2c66ac3fba
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.10+14"
+    version: "0.6.1+1"
   firebase_core:
     dependency: "direct main"
     description:
       name: firebase_core
-      sha256: "5bba5924139e91d26446fd2601c18a6aa62c1161c768a989bb5e245dcdc20644"
+      sha256: "29cfa93c771d8105484acac340b5ea0835be371672c91405a300303986f4eba9"
       url: "https://pub.dev"
     source: hosted
-    version: "3.15.0"
+    version: "4.3.0"
   firebase_core_platform_interface:
     dependency: transitive
     description:
       name: firebase_core_platform_interface
-      sha256: "5d2ab45779d91af2aa0252dec9fe4ee1caa015d83377de255454dcaa1526a0e0"
+      sha256: cccb4f572325dc14904c02fcc7db6323ad62ba02536833dddb5c02cac7341c64
       url: "https://pub.dev"
     source: hosted
-    version: "5.4.1"
+    version: "6.0.2"
   firebase_core_web:
     dependency: transitive
     description:
       name: firebase_core_web
-      sha256: eb3afccfc452b2b2075acbe0c4b27de62dd596802b4e5e19869c1e926cbb20b3
+      sha256: a631bbfbfa26963d68046aed949df80b228964020e9155b086eff94f462bbf1f
       url: "https://pub.dev"
     source: hosted
-    version: "2.24.0"
+    version: "3.3.1"
   firebase_crashlytics:
     dependency: "direct main"
     description:
       name: firebase_crashlytics
-      sha256: "6f1aeb2862e09bf03f7c2d95e0e044e7d52cb242f2e48d6114262c0686134a0f"
+      sha256: "8d52022ee6fdd224e92c042f297d1fd0ec277195c49f39fa61b8cc500a639f00"
       url: "https://pub.dev"
     source: hosted
-    version: "4.3.8"
+    version: "5.0.6"
   firebase_crashlytics_platform_interface:
     dependency: transitive
     description:
       name: firebase_crashlytics_platform_interface
-      sha256: "39b9022eb190f63780a6441ab9e4dc1898cc29372ca457f94271796c3b6a416a"
+      sha256: "97c6a97b35e3d3dafe38fb053a65086a1efb125022d292161405848527cc25a4"
       url: "https://pub.dev"
     source: hosted
-    version: "3.8.8"
+    version: "3.8.16"
   firebase_remote_config:
     dependency: "direct main"
     description:
       name: firebase_remote_config
-      sha256: "01b213e70d3830b9b3a250ef0c9391cbbf1a18ddd8637368e8a7a5ee3ac9fa94"
+      sha256: "50cbbef2acf135fa94ed17b585a49d38248951892044ceedd7a26269eff3447b"
       url: "https://pub.dev"
     source: hosted
-    version: "5.4.6"
+    version: "6.1.3"
   firebase_remote_config_platform_interface:
     dependency: transitive
     description:
       name: firebase_remote_config_platform_interface
-      sha256: df56b065a32366517a134bb96a23e893aec40ad9bb469099b2d23f8f2d16ed33
+      sha256: effb7be478767bc60a46d79175a862607fc4904cffea27b2a2d049da774887c6
       url: "https://pub.dev"
     source: hosted
-    version: "1.5.6"
+    version: "2.0.6"
   firebase_remote_config_web:
     dependency: transitive
     description:
       name: firebase_remote_config_web
-      sha256: f6927df411a3f347201f64b47eb4f520f965e5c73a218957adc20ce33a3f3944
+      sha256: "20f1d40cb2b345dc5e7db1603c33d0403c78b09036f5cf3a5c778baa2594bbb5"
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.6"
+    version: "1.10.2"
   fixnum:
     dependency: transitive
     description:
@@ -530,10 +450,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_hooks
-      sha256: b772e710d16d7a20c0740c4f855095026b31c7eb5ba3ab67d2bd52021cd9461d
+      sha256: "8ae1f090e5f4ef5cfa6670ce1ab5dddadd33f3533a7f9ba19d9f958aa2a89f42"
       url: "https://pub.dev"
     source: hosted
-    version: "0.21.2"
+    version: "0.21.3+1"
   flutter_lints:
     dependency: "direct dev"
     description:
@@ -559,10 +479,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_riverpod
-      sha256: "9532ee6db4a943a1ed8383072a2e3eeda041db5657cdf6d2acecf3c21ecbe7e1"
+      sha256: "38ec6c303e2c83ee84512f5fc2a82ae311531021938e63d7137eccc107bf3c02"
       url: "https://pub.dev"
     source: hosted
-    version: "2.6.1"
+    version: "3.1.0"
   flutter_staggered_grid_view:
     dependency: "direct main"
     description:
@@ -575,10 +495,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_svg
-      sha256: cd57f7969b4679317c17af6fd16ee233c1e60a82ed209d8a475c54fd6fd6f845
+      sha256: "87fbd7c534435b6c5d9d98b01e1fd527812b82e68ddd8bd35fc45ed0fa8f0a95"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.2.3"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -593,10 +513,10 @@ packages:
     dependency: transitive
     description:
       name: freezed_annotation
-      sha256: c87ff004c8aa6af2d531668b46a4ea379f7191dc6dfa066acd53d506da6e044b
+      sha256: "7294967ff0a6d98638e7acb774aac3af2550777accd8149c90af5b014e6d44d8"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.0"
+    version: "3.1.0"
   frontend_server_client:
     dependency: transitive
     description:
@@ -617,26 +537,18 @@ packages:
     dependency: "direct main"
     description:
       name: go_router
-      sha256: c489908a54ce2131f1d1b7cc631af9c1a06fac5ca7c449e959192089f9489431
+      sha256: eff94d2a6fc79fa8b811dde79c7549808c2346037ee107a1121b4a644c745f2a
       url: "https://pub.dev"
     source: hosted
-    version: "16.0.0"
-  google_mobile_ads:
-    dependency: "direct main"
-    description:
-      name: google_mobile_ads
-      sha256: a4f59019f2c32769fb6c60ed8aa321e9c21a36297e2c4f23452b3e779a3e7a26
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.0.0"
+    version: "17.0.1"
   gpt_markdown:
     dependency: "direct main"
     description:
       name: gpt_markdown
-      sha256: "0ef0d258b8a97ed11a985a5ed348e9ec9428199f73011704704ddd0620a894eb"
+      sha256: "9b88dfaffea644070b648c204ca4a55745a49f4ad0b58ed0ab70913ad593c7a1"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.5"
   graphs:
     dependency: transitive
     description:
@@ -645,30 +557,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.3.2"
-  gtk:
-    dependency: transitive
-    description:
-      name: gtk
-      sha256: e8ce9ca4b1df106e4d72dad201d345ea1a036cc12c360f1a7d5a758f78ffa42c
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.0"
   hooks_riverpod:
     dependency: "direct main"
     description:
       name: hooks_riverpod
-      sha256: "70bba33cfc5670c84b796e6929c54b8bc5be7d0fe15bb28c2560500b9ad06966"
+      sha256: b880efcd17757af0aa242e5dceac2fb781a014c22a32435a5daa8f17e9d5d8a9
       url: "https://pub.dev"
     source: hosted
-    version: "2.6.1"
-  hotreloader:
-    dependency: transitive
-    description:
-      name: hotreloader
-      sha256: bc167a1163807b03bada490bfe2df25b0d744df359227880220a5cbd04e5734b
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.3.0"
+    version: "3.1.0"
   html:
     dependency: transitive
     description:
@@ -681,10 +577,10 @@ packages:
     dependency: transitive
     description:
       name: http
-      sha256: "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b"
+      sha256: "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412"
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.0"
+    version: "1.6.0"
   http_multi_server:
     dependency: transitive
     description:
@@ -737,34 +633,34 @@ packages:
     dependency: "direct dev"
     description:
       name: json_serializable
-      sha256: c50ef5fc083d5b5e12eef489503ba3bf5ccc899e487d691584699b4bdefeea8c
+      sha256: c5b2ee75210a0f263c6c7b9eeea80553dbae96ea1bf57f02484e806a3ffdffa3
       url: "https://pub.dev"
     source: hosted
-    version: "6.9.5"
+    version: "6.11.2"
   leak_tracker:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0"
+      sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.9"
+    version: "11.0.2"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
+      sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.9"
+    version: "3.0.10"
   leak_tracker_testing:
     dependency: transitive
     description:
       name: leak_tracker_testing
-      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
+      sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "3.0.2"
   lints:
     dependency: transitive
     description:
@@ -801,10 +697,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
+      sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
       url: "https://pub.dev"
     source: hosted
-    version: "1.16.0"
+    version: "1.17.0"
   mime:
     dependency: transitive
     description:
@@ -813,6 +709,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.0"
+  mockito:
+    dependency: transitive
+    description:
+      name: mockito
+      sha256: dac24d461418d363778d53198d9ac0510b9d073869f078450f195766ec48d05e
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.6.1"
   nanoid2:
     dependency: transitive
     description:
@@ -825,10 +729,10 @@ packages:
     dependency: "direct main"
     description:
       name: native_id
-      sha256: b776367d80b7b4cdc13f1b2bca06166d24f57a964f0a0284baf7a9cf47d15c26
+      sha256: "088480de91e3acb32386fc31e37d676c29515145f2a93e1e6a9655d1bdc512bf"
       url: "https://pub.dev"
     source: hosted
-    version: "0.0.5"
+    version: "1.0.0"
   nested:
     dependency: transitive
     description:
@@ -837,6 +741,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
+  node_preamble:
+    dependency: transitive
+    description:
+      name: node_preamble
+      sha256: "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.2"
   octo_image:
     dependency: transitive
     description:
@@ -845,14 +757,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.0"
-  onesignal_flutter:
-    dependency: "direct main"
-    description:
-      name: onesignal_flutter
-      sha256: b5bb43bf496ddb5e3975ba54c6477cc2d1fcd18fb3698f195d2e0bfd376ddafd
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.3.4"
   package_config:
     dependency: transitive
     description:
@@ -865,18 +769,18 @@ packages:
     dependency: "direct main"
     description:
       name: package_info_plus
-      sha256: "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191"
+      sha256: f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d
       url: "https://pub.dev"
     source: hosted
-    version: "8.3.0"
+    version: "9.0.0"
   package_info_plus_platform_interface:
     dependency: transitive
     description:
       name: package_info_plus_platform_interface
-      sha256: "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c"
+      sha256: "202a487f08836a592a6bd4f901ac69b3a8f146af552bbd14407b6b41e1c3f086"
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.0"
+    version: "3.2.1"
   path:
     dependency: transitive
     description:
@@ -905,18 +809,18 @@ packages:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9
+      sha256: f2c65e21139ce2c3dad46922be8272bb5963516045659e71bb16e151c93b580e
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.17"
+    version: "2.2.22"
   path_provider_foundation:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942"
+      sha256: "6d13aece7b3f5c5a9731eaf553ff9dcbc2eff41087fd2df587fd0fed9a3eb0c4"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.1"
+    version: "2.5.1"
   path_provider_linux:
     dependency: transitive
     description:
@@ -945,10 +849,10 @@ packages:
     dependency: transitive
     description:
       name: petitparser
-      sha256: "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646"
+      sha256: "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.0"
+    version: "7.0.1"
   platform:
     dependency: transitive
     description:
@@ -969,10 +873,10 @@ packages:
     dependency: transitive
     description:
       name: pool
-      sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a"
+      sha256: "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d"
       url: "https://pub.dev"
     source: hosted
-    version: "1.5.1"
+    version: "1.5.2"
   pretty_dio_logger:
     dependency: "direct main"
     description:
@@ -985,10 +889,10 @@ packages:
     dependency: transitive
     description:
       name: provider
-      sha256: "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84"
+      sha256: "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.5"
+    version: "6.1.5+1"
   pub_semver:
     dependency: "direct main"
     description:
@@ -1017,42 +921,34 @@ packages:
     dependency: transitive
     description:
       name: riverpod
-      sha256: "59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959"
+      sha256: "16ff608d21e8ea64364f2b7c049c94a02ab81668f78845862b6e88b71dd4935a"
       url: "https://pub.dev"
     source: hosted
-    version: "2.6.1"
+    version: "3.1.0"
   riverpod_analyzer_utils:
     dependency: transitive
     description:
       name: riverpod_analyzer_utils
-      sha256: "03a17170088c63aab6c54c44456f5ab78876a1ddb6032ffde1662ddab4959611"
+      sha256: "947b05d04c52a546a2ac6b19ef2a54b08520ff6bdf9f23d67957a4c8df1c3bc0"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.10"
+    version: "1.0.0-dev.8"
   riverpod_annotation:
     dependency: "direct main"
     description:
       name: riverpod_annotation
-      sha256: e14b0bf45b71326654e2705d462f21b958f987087be850afd60578fcd502d1b8
+      sha256: cc1474bc2df55ec3c1da1989d139dcef22cd5e2bd78da382e867a69a8eca2e46
       url: "https://pub.dev"
     source: hosted
-    version: "2.6.1"
+    version: "4.0.0"
   riverpod_generator:
     dependency: "direct dev"
     description:
       name: riverpod_generator
-      sha256: "44a0992d54473eb199ede00e2260bd3c262a86560e3c6f6374503d86d0580e36"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.6.5"
-  riverpod_lint:
-    dependency: "direct dev"
-    description:
-      name: riverpod_lint
-      sha256: "89a52b7334210dbff8605c3edf26cfe69b15062beed5cbfeff2c3812c33c9e35"
+      sha256: e43b1537229cc8f487f09b0c20d15dba840acbadcf5fc6dad7ad5e8ab75950dc
       url: "https://pub.dev"
     source: hosted
-    version: "2.6.5"
+    version: "4.0.0+1"
   rxdart:
     dependency: transitive
     description:
@@ -1065,26 +961,26 @@ packages:
     dependency: "direct main"
     description:
       name: shared_preferences
-      sha256: "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5"
+      sha256: "2939ae520c9024cb197fc20dee269cd8cdbf564c8b5746374ec6cacdc5169e64"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.3"
+    version: "2.5.4"
   shared_preferences_android:
     dependency: transitive
     description:
       name: shared_preferences_android
-      sha256: "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac"
+      sha256: "83af5c682796c0f7719c2bbf74792d113e40ae97981b8f266fa84574573556bc"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.10"
+    version: "2.4.18"
   shared_preferences_foundation:
     dependency: transitive
     description:
       name: shared_preferences_foundation
-      sha256: "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03"
+      sha256: "4e7eaffc2b17ba398759f1151415869a34771ba11ebbccd1b0145472a619a64f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.4"
+    version: "2.5.6"
   shared_preferences_linux:
     dependency: transitive
     description:
@@ -1125,6 +1021,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.4.2"
+  shelf_packages_handler:
+    dependency: transitive
+    description:
+      name: shelf_packages_handler
+      sha256: "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.2"
+  shelf_static:
+    dependency: transitive
+    description:
+      name: shelf_static
+      sha256: c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.3"
   shelf_web_socket:
     dependency: transitive
     description:
@@ -1142,34 +1054,42 @@ packages:
     dependency: transitive
     description:
       name: source_gen
-      sha256: "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b"
+      sha256: "07b277b67e0096c45196cbddddf2d8c6ffc49342e88bf31d460ce04605ddac75"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "4.1.1"
   source_helper:
     dependency: transitive
     description:
       name: source_helper
-      sha256: "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c"
+      sha256: "6a3c6cc82073a8797f8c4dc4572146114a39652851c157db37e964d9c7038723"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.5"
-  source_span:
+    version: "1.3.8"
+  source_map_stack_trace:
     dependency: transitive
     description:
-      name: source_span
-      sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c"
+      name: source_map_stack_trace
+      sha256: c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b
       url: "https://pub.dev"
     source: hosted
-    version: "1.10.1"
-  sprintf:
+    version: "2.1.2"
+  source_maps:
+    dependency: transitive
+    description:
+      name: source_maps
+      sha256: "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.10.13"
+  source_span:
     dependency: transitive
     description:
-      name: sprintf
-      sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23"
+      name: source_span
+      sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c"
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.0"
+    version: "1.10.1"
   sqflite:
     dependency: transitive
     description:
@@ -1182,18 +1102,18 @@ packages:
     dependency: transitive
     description:
       name: sqflite_android
-      sha256: "2b3070c5fa881839f8b402ee4a39c1b4d561704d4ebbbcfb808a119bc2a1701b"
+      sha256: ecd684501ebc2ae9a83536e8b15731642b9570dc8623e0073d227d0ee2bfea88
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.1"
+    version: "2.4.2+2"
   sqflite_common:
     dependency: transitive
     description:
       name: sqflite_common
-      sha256: "84731e8bfd8303a3389903e01fb2141b6e59b5973cacbb0929021df08dddbe8b"
+      sha256: "6ef422a4525ecc601db6c0a2233ff448c731307906e92cabc9ba292afaae16a6"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.5"
+    version: "2.5.6"
   sqflite_darwin:
     dependency: transitive
     description:
@@ -1266,22 +1186,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.2"
+  test:
+    dependency: transitive
+    description:
+      name: test
+      sha256: "75906bf273541b676716d1ca7627a17e4c4070a3a16272b7a3dc7da3b9f3f6b7"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.26.3"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
+      sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.4"
-  timing:
+    version: "0.7.7"
+  test_core:
     dependency: transitive
     description:
-      name: timing
-      sha256: "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe"
+      name: test_core
+      sha256: "0cc24b5ff94b38d2ae73e1eb43cc302b77964fbf67abad1e296025b78deb53d0"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.2"
+    version: "0.6.12"
   tuple:
     dependency: transitive
     description:
@@ -1302,42 +1230,42 @@ packages:
     dependency: "direct main"
     description:
       name: url_launcher
-      sha256: "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603"
+      sha256: f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.1"
+    version: "6.3.2"
   url_launcher_android:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79"
+      sha256: "767344bf3063897b5cf0db830e94f904528e6dd50a6dfaf839f0abf509009611"
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.16"
+    version: "6.3.28"
   url_launcher_ios:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb"
+      sha256: cfde38aa257dae62ffe79c87fab20165dfdf6988c1d31b58ebf59b9106062aad
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.3"
+    version: "6.3.6"
   url_launcher_linux:
     dependency: transitive
     description:
       name: url_launcher_linux
-      sha256: "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935"
+      sha256: d5e14138b3bc193a0f63c10a53c94b91d399df0512b1f29b94a043db7482384a
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.1"
+    version: "3.2.2"
   url_launcher_macos:
     dependency: transitive
     description:
       name: url_launcher_macos
-      sha256: "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2"
+      sha256: "368adf46f71ad3c21b8f06614adb38346f193f3a59ba8fe9a2fd74133070ba18"
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.2"
+    version: "3.2.5"
   url_launcher_platform_interface:
     dependency: transitive
     description:
@@ -1358,18 +1286,18 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_windows
-      sha256: "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77"
+      sha256: "712c70ab1b99744ff066053cbe3e80c73332b38d46e5e945c98689b2e66fc15f"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.4"
+    version: "3.1.5"
   uuid:
     dependency: transitive
     description:
       name: uuid
-      sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff
+      sha256: a11b666489b1954e01d992f3d601b1804a33937b5a8fe677bd26b8a9f96f96e8
       url: "https://pub.dev"
     source: hosted
-    version: "4.5.1"
+    version: "4.5.2"
   vector_graphics:
     dependency: transitive
     description:
@@ -1390,90 +1318,90 @@ packages:
     dependency: transitive
     description:
       name: vector_graphics_compiler
-      sha256: "557a315b7d2a6dbb0aaaff84d857967ce6bdc96a63dc6ee2a57ce5a6ee5d3331"
+      sha256: d354a7ec6931e6047785f4db12a1f61ec3d43b207fc0790f863818543f8ff0dc
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.17"
+    version: "1.1.19"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.2.0"
   video_player:
     dependency: "direct main"
     description:
       name: video_player
-      sha256: "0d55b1f1a31e5ad4c4967bfaa8ade0240b07d20ee4af1dfef5f531056512961a"
+      sha256: "096bc28ce10d131be80dfb00c223024eb0fba301315a406728ab43dd99c45bdf"
       url: "https://pub.dev"
     source: hosted
-    version: "2.10.0"
+    version: "2.10.1"
   video_player_android:
     dependency: transitive
     description:
       name: video_player_android
-      sha256: "4a5135754a62dbc827a64a42ef1f8ed72c962e191c97e2d48744225c2b9ebb73"
+      sha256: ee4fd520b0cafa02e4a867a0f882092e727cdaa1a2d24762171e787f8a502b0a
       url: "https://pub.dev"
     source: hosted
-    version: "2.8.7"
+    version: "2.9.1"
   video_player_avfoundation:
     dependency: transitive
     description:
       name: video_player_avfoundation
-      sha256: "0d47db6cbf72db61d86369219efd35c7f9d93515e1319da941ece81b1f21c49c"
+      sha256: d1eb970495a76abb35e5fa93ee3c58bd76fb6839e2ddf2fbb636674f2b971dd4
       url: "https://pub.dev"
     source: hosted
-    version: "2.7.2"
+    version: "2.8.9"
   video_player_platform_interface:
     dependency: transitive
     description:
       name: video_player_platform_interface
-      sha256: cf2a1d29a284db648fd66cbd18aacc157f9862d77d2cc790f6f9678a46c1db5a
+      sha256: "57c5d73173f76d801129d0531c2774052c5a7c11ccb962f1830630decd9f24ec"
       url: "https://pub.dev"
     source: hosted
-    version: "6.4.0"
+    version: "6.6.0"
   video_player_web:
     dependency: transitive
     description:
       name: video_player_web
-      sha256: e8bba2e5d1e159d5048c9a491bb2a7b29c535c612bb7d10c1e21107f5bd365ba
+      sha256: "9f3c00be2ef9b76a95d94ac5119fb843dca6f2c69e6c9968f6f2b6c9e7afbdeb"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.5"
+    version: "2.4.0"
   vm_service:
     dependency: transitive
     description:
       name: vm_service
-      sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02
+      sha256: "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60"
       url: "https://pub.dev"
     source: hosted
-    version: "15.0.0"
+    version: "15.0.2"
   wakelock_plus:
     dependency: "direct main"
     description:
       name: wakelock_plus
-      sha256: a474e314c3e8fb5adef1f9ae2d247e57467ad557fa7483a2b895bc1b421c5678
+      sha256: "9296d40c9adbedaba95d1e704f4e0b434be446e2792948d0e4aa977048104228"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.2"
+    version: "1.4.0"
   wakelock_plus_platform_interface:
     dependency: transitive
     description:
       name: wakelock_plus_platform_interface
-      sha256: e10444072e50dbc4999d7316fd303f7ea53d31c824aa5eb05d7ccbdd98985207
+      sha256: "036deb14cd62f558ca3b73006d52ce049fabcdcb2eddfe0bf0fe4e8a943b5cf2"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.3"
+    version: "1.3.0"
   watcher:
     dependency: transitive
     description:
       name: watcher
-      sha256: "0b7fd4a0bbc4b92641dbf20adfd7e3fd1398fe17102d94b674234563e110088a"
+      sha256: "1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.2"
+    version: "1.2.1"
   web:
     dependency: transitive
     description:
@@ -1498,46 +1426,54 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.3"
+  webkit_inspection_protocol:
+    dependency: transitive
+    description:
+      name: webkit_inspection_protocol
+      sha256: "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.1"
   webview_flutter:
     dependency: "direct main"
     description:
       name: webview_flutter
-      sha256: c3e4fe614b1c814950ad07186007eff2f2e5dd2935eba7b9a9a1af8e5885f1ba
+      sha256: a3da219916aba44947d3a5478b1927876a09781174b5a2b67fa5be0555154bf9
       url: "https://pub.dev"
     source: hosted
-    version: "4.13.0"
+    version: "4.13.1"
   webview_flutter_android:
     dependency: transitive
     description:
       name: webview_flutter_android
-      sha256: f6e6afef6e234801da77170f7a1847ded8450778caf2fe13979d140484be3678
+      sha256: eeeb3fcd5f0ff9f8446c9f4bbc18a99b809e40297528a3395597d03aafb9f510
       url: "https://pub.dev"
     source: hosted
-    version: "4.7.0"
+    version: "4.10.11"
   webview_flutter_platform_interface:
     dependency: transitive
     description:
       name: webview_flutter_platform_interface
-      sha256: f0dc2dc3a2b1e3a6abdd6801b9355ebfeb3b8f6cde6b9dc7c9235909c4a1f147
+      sha256: "63d26ee3aca7256a83ccb576a50272edd7cfc80573a4305caa98985feb493ee0"
       url: "https://pub.dev"
     source: hosted
-    version: "2.13.1"
+    version: "2.14.0"
   webview_flutter_wkwebview:
     dependency: "direct main"
     description:
       name: webview_flutter_wkwebview
-      sha256: a3d461fe3467014e05f3ac4962e5fdde2a4bf44c561cb53e9ae5c586600fdbc3
+      sha256: e49f378ed066efb13fc36186bbe0bd2425630d4ea0dbc71a18fdd0e4d8ed8ebc
       url: "https://pub.dev"
     source: hosted
-    version: "3.22.0"
+    version: "3.23.5"
   win32:
     dependency: transitive
     description:
       name: win32
-      sha256: "66814138c3562338d05613a6e368ed8cfb237ad6d64a9e9334be3f309acfca03"
+      sha256: d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e
       url: "https://pub.dev"
     source: hosted
-    version: "5.14.0"
+    version: "5.15.0"
   win32_registry:
     dependency: transitive
     description:
@@ -1550,10 +1486,10 @@ packages:
     dependency: "direct main"
     description:
       name: wiredash
-      sha256: c66c12e56147b26c810cf0288e81b2917ea7a3423fb1411f6dd5e001565189de
+      sha256: cf2b8db3a3833fb0c68759a4c2843edd1ad92559877755a3d78e6ac9b379e1cf
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.0"
+    version: "2.6.0"
   xdg_directories:
     dependency: transitive
     description:
@@ -1566,10 +1502,10 @@ packages:
     dependency: transitive
     description:
       name: xml
-      sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226
+      sha256: "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025"
       url: "https://pub.dev"
     source: hosted
-    version: "6.5.0"
+    version: "6.6.1"
   yaml:
     dependency: transitive
     description:
@@ -1582,18 +1518,18 @@ packages:
     dependency: "direct main"
     description:
       name: youtube_player_iframe
-      sha256: "66020f7756accfb22b3297565d845f9bef14249c730dd51e1ec648fa155fb24a"
+      sha256: "6690da91591d14b32a6884eb6ae270ea4cc946a748d577d89d18cde565be689f"
       url: "https://pub.dev"
     source: hosted
-    version: "5.2.1"
+    version: "5.2.2"
   youtube_player_iframe_web:
     dependency: transitive
     description:
       name: youtube_player_iframe_web
-      sha256: "05222a228937932e7ee7a6171e8020fee4cd23d1c7bf6b4128c569484338c593"
+      sha256: "333901d008634f2ea67ef27aba8d597567e4ff45f393290b948a739654ab6dca"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.1"
+    version: "3.1.2"
 sdks:
-  dart: ">=3.8.0 <4.0.0"
-  flutter: ">=3.32.0"
+  dart: ">=3.10.4 <4.0.0"
+  flutter: ">=3.35.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index e910d52..395216f 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: vs_live
 description: "Billion sport live application."
 publish_to: "none"
-version: 1.2.2+24
+version: 1.3.0+25
 
 environment:
   sdk: ^3.7.0
@@ -10,44 +10,41 @@ dependencies:
   flutter:
     sdk: flutter
   cupertino_icons: ^1.0.8
-  intl: ^0.20.0
-  equatable: ^2.0.7
-  flutter_hooks: ^0.21.2
-  hooks_riverpod: ^2.6.1
-  riverpod_annotation: ^2.6.1
-  url_launcher: ^6.3.1
-  dio: ^5.8.0+1
+  intl: ^0.20.2
+  equatable: ^2.0.8
+  flutter_hooks:
+  hooks_riverpod: ^3.1.0
+  riverpod_annotation: ^4.0.0
+  url_launcher: ^6.3.2
+  dio: ^5.9.0
   pretty_dio_logger: ^1.4.0
-  go_router: ^16.0.0
+  go_router: ^17.0.1
   json_annotation: ^4.9.0
-  shared_preferences: ^2.5.3
-  envied: ^1.1.1
+  shared_preferences: ^2.5.4
+  envied: ^1.3.2
 
   # video player
-  video_player: ^2.10.0
-  chewie: ^1.12.1
+  video_player: ^2.10.1
+  chewie: ^1.13.0
 
-  webview_flutter: ^4.13.0
-  webview_flutter_wkwebview: ^3.22.0
-  youtube_player_iframe: ^5.2.1
+  webview_flutter: ^4.13.1
+  webview_flutter_wkwebview: ^3.23.5
+  youtube_player_iframe: ^5.2.2
 
   cached_network_image: ^3.4.1
-  gpt_markdown: ^1.1.1
-  onesignal_flutter: ^5.3.4
-  native_id: ^0.0.5
+  gpt_markdown: ^1.1.5
+  native_id: ^1.0.0
 
-  google_mobile_ads: ^6.0.0
-  firebase_core: ^3.15.0
-  firebase_remote_config: ^5.4.6
-  firebase_analytics: ^11.5.1
-  firebase_crashlytics: ^4.3.8
+  firebase_core: ^4.3.0
+  firebase_remote_config: ^6.1.3
+  firebase_analytics: ^12.1.0
+  firebase_crashlytics: ^5.0.6
 
-  app_links: ^6.4.0
   flutter_staggered_grid_view: ^0.7.0
-  package_info_plus: ^8.3.0
-  wakelock_plus: ^1.3.2
+  package_info_plus: ^9.0.0
+  wakelock_plus: ^1.4.0
   pub_semver: ^2.2.0
-  wiredash: ^2.5.0
+  wiredash: ^2.6.0
 
   device_preview: ^1.3.1
 
@@ -55,12 +52,10 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   flutter_lints: ^6.0.0
-  build_runner: ^2.4.15
-  riverpod_generator: ^2.4.3
-  custom_lint: ^0.7.5
-  json_serializable: ^6.9.5
-  riverpod_lint: ^2.3.13
-  envied_generator: ^1.1.1
+  build_runner:
+  riverpod_generator: ^4.0.0+1
+  json_serializable: ^6.11.2
+  envied_generator: ^1.3.2
 
 flutter:
   uses-material-design: true
diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc
index c87e8b8..ec8e8d4 100644
--- a/windows/flutter/generated_plugin_registrant.cc
+++ b/windows/flutter/generated_plugin_registrant.cc
@@ -6,13 +6,10 @@
 
 #include "generated_plugin_registrant.h"
 
-#include <app_links/app_links_plugin_c_api.h>
 #include <firebase_core/firebase_core_plugin_c_api.h>
 #include <url_launcher_windows/url_launcher_windows.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
-  AppLinksPluginCApiRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("AppLinksPluginCApi"));
   FirebaseCorePluginCApiRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("FirebaseCorePluginCApi"));
   UrlLauncherWindowsRegisterWithRegistrar(
diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake
index 19833e4..02d26c3 100644
--- a/windows/flutter/generated_plugins.cmake
+++ b/windows/flutter/generated_plugins.cmake
@@ -3,7 +3,6 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
-  app_links
   firebase_core
   url_launcher_windows
 )