From c9ce003b29cca070f47cc9544e848c2c20384cf7 Mon Sep 17 00:00:00 2001
From: Sikander Saleem <sikandersaleem.cloudsolutions@gmail.com>
Date: Sun, 6 Oct 2024 19:16:04 +0300
Subject: [PATCH] bug fixed & 1.3.0+12 sent for UAT

---
 lib/dashboard_latest/dashboard_view.dart       | 2 +-
 lib/views/pages/user/ppm/ppm_details_page.dart | 2 +-
 lib/views/widgets/pentry/pentry_tbs_form.dart  | 4 ++--
 pubspec.yaml                                   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/dashboard_latest/dashboard_view.dart b/lib/dashboard_latest/dashboard_view.dart
index 583e10c9..44eec765 100644
--- a/lib/dashboard_latest/dashboard_view.dart
+++ b/lib/dashboard_latest/dashboard_view.dart
@@ -100,7 +100,7 @@ class _DashboardViewState extends State<DashboardView> {
     _scrollController.addListener(() async {
       if (_scrollController.position.pixels == _scrollController.position.maxScrollExtent && !_dashBoardProvider.isDetailLoading) {
         _dashBoardProvider.pageNum = _dashBoardProvider.pageNum + 1;
-        _dashBoardProvider.getRequestDetail(usersType: user.type!, showLoader: false, status: _dashBoardProvider.currentListIndex);
+        _dashBoardProvider.getRequestDetail(usersType: user.type!, showLoader: false, status: _dashBoardProvider.tabs[_dashBoardProvider.currentListIndex].tag);
       }
     });
   }
diff --git a/lib/views/pages/user/ppm/ppm_details_page.dart b/lib/views/pages/user/ppm/ppm_details_page.dart
index b1751e35..ed12998b 100644
--- a/lib/views/pages/user/ppm/ppm_details_page.dart
+++ b/lib/views/pages/user/ppm/ppm_details_page.dart
@@ -78,7 +78,7 @@ class _PpmDetailsPageState extends State<PpmDetailsPage> {
                             if (widget.request.priority != null) 8.width,
                             StatusLabel(
                               label: ppm.visitStatusName,
-                              id: ppm.deviceStatusId!.toInt(),
+                              id: ppm.visitStatusId!.toInt(),
                               textColor: AppColor.getRequestStatusTextColorByName(context, ppm.visitStatusName!),
                               backgroundColor: AppColor.getRequestStatusColorByName(context, ppm.visitStatusName!),
                             ),
diff --git a/lib/views/widgets/pentry/pentry_tbs_form.dart b/lib/views/widgets/pentry/pentry_tbs_form.dart
index 5126da73..c78f0008 100644
--- a/lib/views/widgets/pentry/pentry_tbs_form.dart
+++ b/lib/views/widgets/pentry/pentry_tbs_form.dart
@@ -73,7 +73,7 @@ class _PentryTBSFormState extends State<PentryTBSForm> {
           8.height,
           if (totalWorkingHours > 0.0) ...[
             Container(
-              height: 50.toScreenHeight,
+              height: 56.toScreenHeight,
               padding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth),
               alignment: Alignment.centerLeft,
               decoration: BoxDecoration(
@@ -91,7 +91,7 @@ class _PentryTBSFormState extends State<PentryTBSForm> {
                   ),
                   Text(
                     " ${formatDuration(totalWorkingHours.round())}",
-                    style: Theme.of(context).textTheme.bodyLarge,
+                    style: Theme.of(context).textTheme.bodyMedium,
                   ),
                 ],
               ),
diff --git a/pubspec.yaml b/pubspec.yaml
index 66cfa7ee..07a1a8f6 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.2.3+10
+version: 1.3.0+12
 
 environment:
   sdk: ">=3.5.0 <4.0.0"