diff --git a/android/local.properties b/android/local.properties
index d5fb89a..9e131e0 100644
--- a/android/local.properties
+++ b/android/local.properties
@@ -1,5 +1,5 @@
 sdk.dir=C:/Users/Housh11/AppData/Local/Android/Sdk
 flutter.sdk=C:\\src\\flutter
-flutter.buildMode=release
-flutter.versionName=1.3.24
-flutter.versionCode=21
\ No newline at end of file
+flutter.buildMode=debug
+flutter.versionName=1.3.25
+flutter.versionCode=22
\ No newline at end of file
diff --git a/assets/rive/shapes.riv b/assets/rive/shapes.riv
deleted file mode 100644
index 0c9cf5f..0000000
Binary files a/assets/rive/shapes.riv and /dev/null differ
diff --git a/packages/core/lib/presentation/common/assets.gen.dart b/packages/core/lib/presentation/common/assets.gen.dart
index f488199..cb5f975 100644
--- a/packages/core/lib/presentation/common/assets.gen.dart
+++ b/packages/core/lib/presentation/common/assets.gen.dart
@@ -13,7 +13,6 @@ import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_svg/flutter_svg.dart' as _svg;
 import 'package:lottie/lottie.dart' as _lottie;
-import 'package:rive/rive.dart' as _rive;
 import 'package:vector_graphics/vector_graphics.dart' as _vg;
 
 class $AssetsAnimGen {
@@ -516,16 +515,6 @@ class $AssetsLogosGen {
   List<AssetGenImage> get values => [finalLogo];
 }
 
-class $AssetsRiveGen {
-  const $AssetsRiveGen();
-
-  /// File path: assets/rive/shapes.riv
-  RiveGenImage get shapes => const RiveGenImage('assets/rive/shapes.riv');
-
-  /// List of all assets
-  List<RiveGenImage> get values => [shapes];
-}
-
 class $AssetsVecGen {
   const $AssetsVecGen();
 
@@ -985,7 +974,6 @@ class Assets {
   static const $AssetsIconsGen icons = $AssetsIconsGen();
   static const $AssetsImagesGen images = $AssetsImagesGen();
   static const $AssetsLogosGen logos = $AssetsLogosGen();
-  static const $AssetsRiveGen rive = $AssetsRiveGen();
   static const $AssetsVecGen vec = $AssetsVecGen();
 }
 
@@ -1134,44 +1122,6 @@ class SvgGenImage {
   String get keyName => _assetName;
 }
 
-class RiveGenImage {
-  const RiveGenImage(this._assetName, {this.flavors = const {}});
-
-  final String _assetName;
-  final Set<String> flavors;
-
-  _rive.RiveAnimation rive({
-    String? artboard,
-    List<String> animations = const [],
-    List<String> stateMachines = const [],
-    BoxFit? fit,
-    Alignment? alignment,
-    Widget? placeHolder,
-    bool antialiasing = true,
-    bool useArtboardSize = false,
-    List<_rive.RiveAnimationController> controllers = const [],
-    _rive.OnInitCallback? onInit,
-  }) {
-    return _rive.RiveAnimation.asset(
-      _assetName,
-      artboard: artboard,
-      animations: animations,
-      stateMachines: stateMachines,
-      fit: fit,
-      alignment: alignment,
-      placeHolder: placeHolder,
-      antialiasing: antialiasing,
-      useArtboardSize: useArtboardSize,
-      controllers: controllers,
-      onInit: onInit,
-    );
-  }
-
-  String get path => _assetName;
-
-  String get keyName => _assetName;
-}
-
 class LottieGenImage {
   const LottieGenImage(this._assetName, {this.flavors = const {}});
 
diff --git a/pubspec.lock b/pubspec.lock
index 5c47647..33b8045 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -101,10 +101,10 @@ packages:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: "804c47c936df75e1911c19a4fb8c46fa8ff2b3099b9f2b2aa4726af3774f734b"
+      sha256: "4e54dbeefdc70691ba80b3bce3976af63b5425c8c07dface348dfee664a0edc1"
       url: "https://pub.dev"
     source: hosted
-    version: "2.8.0"
+    version: "2.9.0"
   built_collection:
     dependency: transitive
     description:
@@ -634,14 +634,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.1.0"
-  frontend_server_client:
-    dependency: transitive
-    description:
-      name: frontend_server_client
-      sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.0.0"
   fuchsia_remote_debug_protocol:
     dependency: transitive
     description: flutter
diff --git a/pubspec.yaml b/pubspec.yaml
index b9b63ca..9c162c8 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -38,7 +38,7 @@ dev_dependencies:
     sdk: flutter
   flutter_lints: ^6.0.0
   ##code generation
-  build_runner: ^2.8.0
+  build_runner: ^2.9.0
   hive_ce_generator: ^1.9.5
   freezed: ^3.2.3
   json_serializable: ^6.11.1
@@ -60,7 +60,6 @@ flutter:
     - assets/icons/
     - assets/images/
     - assets/logos/
-    - assets/rive/
     - assets/vec/
     - assets/anim/
 
@@ -79,4 +78,4 @@ flutter_gen:
     image: true
     flutter_svg: true
     lottie: true
-    rive: true
+