From a47e12edf888543d5d7a3ac53acb9953505c0c11 Mon Sep 17 00:00:00 2001
From: Hari-egov <hariprasad@egovernments.org>
Date: Wed, 8 May 2024 12:00:14 +0530
Subject: [PATCH 1/2] Disabled checkbox from update expenses for paid bill

---
 .../lib/screeens/add_expense/expense_details.dart          | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/frontend/mgramseva/lib/screeens/add_expense/expense_details.dart b/frontend/mgramseva/lib/screeens/add_expense/expense_details.dart
index 2ad06955a..db6f7e022 100644
--- a/frontend/mgramseva/lib/screeens/add_expense/expense_details.dart
+++ b/frontend/mgramseva/lib/screeens/add_expense/expense_details.dart
@@ -489,8 +489,10 @@ class _ExpenseDetailsState extends State<ExpenseDetails> {
                                         height: 20,
                                         child: Checkbox(
                                             value: expensesDetailsProvider.expenditureDetails.isBillCancelled,
-                                            onChanged: expensesDetailsProvider
-                                                .onChangeOfCheckBox),
+                                            onChanged:
+                                            expensesDetailsProvider.expenditureDetails.allowEdit == true ?
+                                            expensesDetailsProvider
+                                                .onChangeOfCheckBox : null ) ,
                                       ),
                                       Text(
                                           ApplicationLocalizations.of(context)
@@ -498,6 +500,7 @@ class _ExpenseDetailsState extends State<ExpenseDetails> {
                                               .MARK_BILL_HAS_CANCELLED),
                                           style: TextStyle(
                                               fontSize: 19,
+                                              color: expensesDetailsProvider.expenditureDetails.allowEdit == true ? Colors.black:  Colors.grey,
                                               fontWeight: FontWeight.normal))
                                     ],
                                   ),

From fa641fa181cf55d816d902b94591fef4e99b83ed Mon Sep 17 00:00:00 2001
From: Hari-egov <hariprasad@egovernments.org>
Date: Fri, 10 May 2024 12:45:21 +0530
Subject: [PATCH 2/2] WhatsApp Share Logo Alignment Issue Fixed
 https://digit-discuss.atlassian.net/browse/ISTE-25

---
 .../household_register.dart                   | 36 ++++++++++++++-----
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/frontend/mgramseva/lib/screeens/household_register/household_register.dart b/frontend/mgramseva/lib/screeens/household_register/household_register.dart
index 36d7d699f..f8fe27fb7 100644
--- a/frontend/mgramseva/lib/screeens/household_register/household_register.dart
+++ b/frontend/mgramseva/lib/screeens/household_register/household_register.dart
@@ -1,4 +1,6 @@
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
 import 'package:flutter_focus_watcher/flutter_focus_watcher.dart';
 import 'package:mgramseva/components/household_register/household_card.dart';
 import 'package:mgramseva/providers/household_register_provider.dart';
@@ -44,6 +46,7 @@ class _HouseholdRegister extends State<HouseholdRegister>
 
   @override
   Widget build(BuildContext context) {
+    Size size = MediaQuery.of(context).size;
     var householdRegisterProvider =
         Provider.of<HouseholdRegisterProvider>(context, listen: false);
 
@@ -76,14 +79,25 @@ class _HouseholdRegister extends State<HouseholdRegister>
                     child: CustomScrollView(slivers: [
                       SliverList(
                           delegate: SliverChildListDelegate([
-                        Row(
-                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                          children: [
-                            HomeBack(),
-                            Row(
-                                mainAxisAlignment: MainAxisAlignment.end,
-                                children: [_buildDownload, _buildShare])
-                          ],
+                        SizedBox(
+                          width: size.width,
+                          child: Row(
+                            children: [
+                              HomeBack(),
+                              Expanded(
+                                child: Row(
+                                  mainAxisAlignment: MainAxisAlignment.end,
+                                  children: [
+                                    Expanded(
+                                        child: Align(
+                                            alignment: Alignment.centerRight,
+                                            child: _buildDownload)),
+                                    _buildShare
+                                  ],
+                                ),
+                              )
+                            ],
+                          ),
                         ),
                         Container(key: key, child: HouseholdCard()),
                       ])),
@@ -130,7 +144,11 @@ class _HouseholdRegister extends State<HouseholdRegister>
       onPressed: () => showDownloadList(Constants.DOWNLOAD_OPTIONS, context),
       icon: Icon(Icons.download_sharp),
       label: Text(
-          ApplicationLocalizations.of(context).translate(i18.common.DOWNLOAD)));
+        ApplicationLocalizations.of(context).translate(i18.common.DOWNLOAD),
+        maxLines: 1,
+        softWrap: false,
+        overflow: TextOverflow.ellipsis,
+      ));
 }
 
 showDownloadList(List<String> result, BuildContext context) {