Merge branch 'development_sikander' into 'master'

Development sikander

See merge request Cloud_Solution/mohemm-flutter-app!9

lib/ui/my_attendance/dynamic_screens/dynamic_listview_screen.dart

@@ -60,28 +60,27 @@ class _DynamicListViewScreenState extends State<DynamicListViewScreen> {
     super.dispose();
   }
 
+  late bool isTicketRequest;
+
   @override
   Widget build(BuildContext context) {
     if (dynamicParams == null) {
       dynamicParams = ModalRoute.of(context)!.settings.arguments as DynamicListViewParams;
+      isTicketRequest = dynamicParams!.dynamicId == "HMG_TKT_NEW_EIT_SS";
       getTransactions();
     }
 
-    return Scaffold(
+    Widget dataWidget = ListView(
-      backgroundColor: Colors.white,
-      appBar: AppBarWidget(context, title: dynamicParams!.title),
-      body: Center(
-        child: ListView(
       physics: const BouncingScrollPhysics(),
       shrinkWrap: true,
       padding: const EdgeInsets.all(21),
       children: [
         //    HMG_TKT_NEW_EIT_SS Id used for ticket balance dashboard
-            if (dynamicParams!.dynamicId == "HMG_TKT_NEW_EIT_SS") ...[const BalancesDashboardWidget("Current Ticket Balance", false), 12.height],
+        if (isTicketRequest) ...[const BalancesDashboardWidget("Current Ticket Balance", false), 12.height],
         getEITTransactionList == null
             ? const SizedBox()
             : (getEITTransactionList!.isEmpty
-                    ? Utils.getNoDataWidget(context)
+                ? Utils.getNoDataWidget(context).paddingOnly(top: isTicketRequest ? 50 : 0)
                 : ListView.separated(
                     physics: const NeverScrollableScrollPhysics(),
                     shrinkWrap: true,
@@ -100,8 +99,12 @@ class _DynamicListViewScreenState extends State<DynamicListViewScreen> {
                     separatorBuilder: (cxt, index) => 12.height,
                     itemCount: getEITTransactionList!.length)),
       ],
-        ),
+    );
-      ),
+
+    return Scaffold(
+      backgroundColor: Colors.white,
+      appBar: AppBarWidget(context, title: dynamicParams!.title),
+      body: isTicketRequest ? dataWidget : dataWidget.center,
       floatingActionButton: Container(
         height: 54,
         width: 54,

lib/ui/screens/pending_transactions/pending_transactions.dart

@@ -45,7 +45,8 @@ class _PendingTransactionsState extends State<PendingTransactions> {
       ),
       body: Column(
         children: [
-          Column(
+          ListView(
+            padding: const EdgeInsets.all(21),
             children: [
               PopupMenuButton(
                   child: DynamicTextFieldWidget(
@@ -86,7 +87,7 @@ class _PendingTransactionsState extends State<PendingTransactions> {
                 },
               )
             ],
-          ).objectContainerView().expanded,
+          ).expanded,
           DefaultButton(
                   LocaleKeys.submit.tr(),
                   selectedFunction == null