profile wallet linked with view model.

lib/core/utils/utils.dart

@@ -650,6 +650,24 @@ class Utils {
     );
   }
 
+  static Widget getPaymentAmountWithSymbol2(num habibWalletAmount, Color iconColor, double iconSize, {bool isSaudiCurrency = true, bool isExpanded = true}) {
+    return RichText(
+      text: TextSpan(
+        children: [
+          WidgetSpan(
+            alignment: PlaceholderAlignment.baseline,
+            baseline: TextBaseline.alphabetic,
+            child: Utils.buildSvgWithAssets(icon: AppAssets.saudi_riyal_icon, width: 14.h, height: 14.h, iconColor: Colors.black.withValues(alpha: 0.31)),
+          ),
+          TextSpan(
+            text: " $habibWalletAmount",
+            style: TextStyle(color: AppColors.blackColor, fontSize: 32.fSize, letterSpacing: -4, fontWeight: FontWeight.w600, height: 1),
+          ),
+        ],
+      ),
+    );
+  }
+
   static Future<bool> isGoogleServicesAvailable() async {
     GooglePlayServicesAvailability availability = await GoogleApiAvailability.instance.checkGooglePlayServicesAvailability();
     String status = availability.toString().split('.').last;

lib/presentation/habib_wallet/habib_wallet_page.dart

@@ -51,6 +51,7 @@ class _HabibWalletState extends State<HabibWalletPage> {
                       children: [
                         Row(
                           mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                          crossAxisAlignment: CrossAxisAlignment.center,
                           children: [
                             Column(
                               crossAxisAlignment: CrossAxisAlignment.start,
@@ -58,7 +59,7 @@ class _HabibWalletState extends State<HabibWalletPage> {
                                 "${_appState.getAuthenticatedUser()!.firstName!} ${_appState.getAuthenticatedUser()!.lastName!}".toText19(isBold: true, color: AppColors.whiteColor),
                                 "MRN: ${_appState.getAuthenticatedUser()!.patientId!}".toText14(weight: FontWeight.w500, color: AppColors.greyTextColor),
                               ],
-                            ),
+                            ).expanded,
                             Utils.buildSvgWithAssets(icon: AppAssets.habiblogo, width: 24.h, height: 24.h),
                           ],
                         ),

lib/presentation/home/landing_page.dart

@@ -34,6 +34,7 @@ import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart';
 import 'package:hmg_patient_app_new/widgets/common_bottom_sheet.dart';
 import 'package:hmg_patient_app_new/widgets/custom_tab_bar.dart' show CustomTabBar;
 import 'package:hmg_patient_app_new/widgets/loader/bottomsheet_loader.dart';
+import 'package:hmg_patient_app_new/widgets/routes/spring_page_route_builder.dart';
 import 'package:hmg_patient_app_new/widgets/transitions/fade_page.dart';
 import 'package:provider/provider.dart';
 
@@ -96,11 +97,7 @@ class _LandingPageState extends State<LandingPage> {
                   appState.isAuthenticated
                       ? WelcomeWidget(
                           onTap: () {
-                            Navigator.of(context).push(
+                            Navigator.of(context).push(springPageRoute(ProfileSettings()));
-                              FadePage(
-                                page: ProfileSettings(),
-                              ),
-                            );
                           },
                           name: ('${appState.getAuthenticatedUser()!.firstName!} ${appState.getAuthenticatedUser()!.lastName!}'),
                           imageUrl: appState.getAuthenticatedUser()?.gender == 1 ? AppAssets.male_img : AppAssets.femaleImg,

lib/presentation/lab/collapsing_list_view.dart

@@ -41,11 +41,14 @@ class CollapsingListView extends StatelessWidget {
                 systemOverlayStyle: SystemUiOverlayStyle(statusBarBrightness: Brightness.light),
                 surfaceTintColor: Colors.transparent,
                 backgroundColor: AppColors.bgScaffoldColor,
-                leading: isLeading ? IconButton(
+                leading: isLeading
-                  icon: Utils.buildSvgWithAssets(icon: isClose ? AppAssets.closeBottomNav : AppAssets.arrow_back, width: 32.h, height: 32.h),
+                    ? IconButton(
-                  padding: EdgeInsets.only(left: 12),
+                        icon: Utils.buildSvgWithAssets(icon: isClose ? AppAssets.closeBottomNav : AppAssets.arrow_back, width: 32.h, height: 32.h),
-                  onPressed: () => Navigator.pop(context),
+                        padding: EdgeInsets.only(left: 12),
-                ) : SizedBox.shrink(),
+                        onPressed: () => Navigator.pop(context),
+                        highlightColor: Colors.transparent,
+                      )
+                    : SizedBox.shrink(),
                 flexibleSpace: LayoutBuilder(
                   builder: (context, constraints) {
                     final double maxHeight = 100;

lib/presentation/profile_settings/profile_settings.dart

@@ -6,6 +6,7 @@ import 'package:hmg_patient_app_new/core/utils/utils.dart';
 import 'package:hmg_patient_app_new/extensions/int_extensions.dart';
 import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
 import 'package:hmg_patient_app_new/extensions/widget_extensions.dart';
+import 'package:hmg_patient_app_new/features/habib_wallet/habib_wallet_view_model.dart';
 import 'package:hmg_patient_app_new/features/profile_settings/profile_settings_view_model.dart';
 import 'package:hmg_patient_app_new/presentation/habib_wallet/habib_wallet_page.dart';
 import 'package:hmg_patient_app_new/presentation/habib_wallet/recharge_wallet_page.dart';
@@ -13,6 +14,7 @@ import 'package:hmg_patient_app_new/presentation/lab/collapsing_list_view.dart';
 import 'package:hmg_patient_app_new/theme/colors.dart';
 import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart';
 import 'package:hmg_patient_app_new/widgets/chip/app_custom_chip_widget.dart';
+import 'package:hmg_patient_app_new/widgets/routes/custom_page_route.dart';
 import 'package:hmg_patient_app_new/widgets/transitions/fade_page.dart';
 import 'package:provider/provider.dart';
 
@@ -100,19 +102,10 @@ class _ProfileSettingsState extends State<ProfileSettings> {
                             ],
                           ),
                           Spacer(),
-                          RichText(
+                          Consumer<HabibWalletViewModel>(builder: (context, habibWalletVM, child) {
-                            text: TextSpan(
+                            return Utils.getPaymentAmountWithSymbol2(habibWalletVM.habibWalletAmount, AppColors.whiteColor, 13.h, isExpanded: false)
-                              children: [
+                                .toShimmer2(isShow: habibWalletVM.isWalletAmountLoading, radius: 12.h, width: 80.h, height: 24.h);
-                                WidgetSpan(
+                          }),
-                                  child: Utils.buildSvgWithAssets(icon: AppAssets.saudi_riyal_icon, width: 14.h, height: 14.h, iconColor: Colors.black.withValues(alpha: 0.31)),
-                                ),
-                                TextSpan(
-                                  text: " 247",
-                                  style: TextStyle(color: AppColors.blackColor, fontSize: 32.fSize, letterSpacing: -4, fontWeight: FontWeight.w600),
-                                ),
-                              ],
-                            ),
-                          ),
                           CustomButton(
                             height: 40.h,
                             icon: AppAssets.recharge_icon,
@@ -127,12 +120,12 @@ class _ProfileSettingsState extends State<ProfileSettings> {
                             padding: EdgeInsets.all(8.h),
                             fontSize: 14,
                             onPressed: () {
-                              Navigator.of(context).push(FadePage(page: RechargeWalletPage()));
+                              Navigator.of(context).push(CustomPageRoute(page: RechargeWalletPage()));
                             },
                           ),
                         ],
                       ).onPress(() {
-                        Navigator.of(context).push(FadePage(page: HabibWalletPage()));
+                        Navigator.of(context).push(CustomPageRoute(page: HabibWalletPage()));
                       }),
                     )
                   ],

lib/widgets/routes/custom_page_route.dart

@@ -0,0 +1,59 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/physics.dart';
+
+/// Reusable spring route
+class CustomPageRoute extends PageRouteBuilder {
+  final Widget page;
+  final AxisDirection direction;
+
+  CustomPageRoute({required this.page, this.direction = AxisDirection.right})
+      : super(
+          transitionDuration: const Duration(milliseconds: 1000),
+          pageBuilder: (_, __, ___) => page,
+          transitionsBuilder: (context, animation, secondaryAnimation, child) {
+            final spring = SpringDescription(mass: 1, stiffness: 100, damping: 15);
+
+            // Drive animation with spring
+            final curvedAnimation = animation.drive(
+              Tween<double>(begin: 0.0, end: 1.0).chain(CurveTween(curve: _SpringCurve(spring))),
+            );
+
+            // Choose offset based on direction
+            Offset beginOffset;
+            switch (direction) {
+              case AxisDirection.left:
+                beginOffset = const Offset(-1.0, 0.0);
+                break;
+              case AxisDirection.right:
+                beginOffset = const Offset(1.0, 0.0);
+                break;
+              case AxisDirection.up:
+                beginOffset = const Offset(0.0, -1.0);
+                break;
+              case AxisDirection.down:
+                beginOffset = const Offset(0.0, 1.0);
+                break;
+            }
+
+            final offsetAnimation = Tween<Offset>(begin: beginOffset, end: Offset.zero).animate(curvedAnimation);
+
+            return SlideTransition(
+              position: offsetAnimation,
+              child: child,
+            );
+          },
+        );
+}
+
+/// Custom spring curve
+class _SpringCurve extends Curve {
+  final SpringDescription spring;
+
+  _SpringCurve(this.spring);
+
+  @override
+  double transform(double t) {
+    final sim = SpringSimulation(spring, 0, 1, 0);
+    return sim.x(t * 1.5); // scaled time
+  }
+}

lib/widgets/routes/spring_page_route_builder.dart

@@ -0,0 +1,38 @@
+import 'package:flutter/physics.dart';
+import 'package:flutter/widgets.dart';
+
+PageRouteBuilder springPageRoute(Widget page) {
+  return PageRouteBuilder(
+    pageBuilder: (_, __, ___) => page,
+    transitionDuration: const Duration(milliseconds: 1000),
+    transitionsBuilder: (context, animation, secondaryAnimation, child) {
+      final spring = SpringDescription(mass: 1, stiffness: 100, damping: 15);
+
+      final curvedAnimation = animation.drive(
+        Tween<double>(begin: 0.0, end: 1.0).chain(CurveTween(curve: _SpringCurve(spring))),
+      );
+
+      final offsetAnimation = Tween<Offset>(
+        begin: const Offset(-1.0, 0.0), // slide from left
+        end: Offset.zero,
+      ).animate(curvedAnimation);
+
+      return SlideTransition(
+        position: offsetAnimation,
+        child: child,
+      );
+    },
+  );
+}
+
+class _SpringCurve extends Curve {
+  final SpringDescription spring;
+
+  _SpringCurve(this.spring);
+
+  @override
+  double transform(double t) {
+    final sim = SpringSimulation(spring, 0, 1, 0);
+    return sim.x(t * 1.5); // scale time so it completes properly
+  }
+}