diff --git a/lib/modules/cm_module/views/forms/cost/cost_detail_form_screen.dart b/lib/modules/cm_module/views/forms/cost/cost_detail_form_screen.dart
index 923e91b0..7e7096b9 100644
--- a/lib/modules/cm_module/views/forms/cost/cost_detail_form_screen.dart
+++ b/lib/modules/cm_module/views/forms/cost/cost_detail_form_screen.dart
@@ -89,7 +89,7 @@ class _CostDetailFormScreenState extends State<CostDetailFormScreen> with Ticker
                     initialValue: requestDetailProvider.workOrderCostModel?.labourCost?.toString(),
                     textAlign: TextAlign.center,
                     labelStyle: AppTextStyles.textFieldLabelStyle,
-                    textInputType: TextInputType.number,
+                    textInputType:const TextInputType.numberWithOptions(decimal: true),
                     showShadow: false,
                     onChange: (value) {
                       requestDetailProvider.workOrderCostModel?.labourCost = num.parse(value);
@@ -103,7 +103,7 @@ class _CostDetailFormScreenState extends State<CostDetailFormScreen> with Ticker
                     initialValue: requestDetailProvider.workOrderCostModel?.travelCost?.toString(),
                     textAlign: TextAlign.center,
                     labelStyle: AppTextStyles.textFieldLabelStyle,
-                    textInputType: TextInputType.number,
+                    textInputType: const TextInputType.numberWithOptions(decimal: true),
                     showShadow: false,
                     onChange: (value) {
                       requestDetailProvider.workOrderCostModel?.travelCost = num.parse(value);
@@ -117,7 +117,7 @@ class _CostDetailFormScreenState extends State<CostDetailFormScreen> with Ticker
                     initialValue: requestDetailProvider.workOrderCostModel?.qAmount?.toString(),
                     textAlign: TextAlign.center,
                     labelStyle: AppTextStyles.textFieldLabelStyle,
-                    textInputType: TextInputType.number,
+                    textInputType: const TextInputType.numberWithOptions(decimal: true),
                     showShadow: false,
                     onChange: (value) {
                       requestDetailProvider.workOrderCostModel?.qAmount = num.parse(value);
@@ -131,7 +131,7 @@ class _CostDetailFormScreenState extends State<CostDetailFormScreen> with Ticker
                     initialValue: requestDetailProvider.workOrderCostModel?.prNo,
                     textAlign: TextAlign.center,
                     labelStyle: AppTextStyles.textFieldLabelStyle,
-                    textInputType: TextInputType.text,
+                    textInputType:const TextInputType.numberWithOptions(decimal: true),
                     showShadow: false,
                     onChange: (value) {
                       requestDetailProvider.workOrderCostModel?.prNo = value;
@@ -145,7 +145,7 @@ class _CostDetailFormScreenState extends State<CostDetailFormScreen> with Ticker
                     initialValue: requestDetailProvider.workOrderCostModel?.poNo,
                     textAlign: TextAlign.center,
                     labelStyle: AppTextStyles.textFieldLabelStyle,
-                    textInputType: TextInputType.text,
+                    textInputType:const TextInputType.numberWithOptions(decimal: true),
                     showShadow: false,
                     onChange: (value) {
                       requestDetailProvider.workOrderCostModel?.poNo = value;
diff --git a/lib/modules/cm_module/views/forms/spare_part/spare_part_request.dart b/lib/modules/cm_module/views/forms/spare_part/spare_part_request.dart
index fd604b62..ce77a407 100644
--- a/lib/modules/cm_module/views/forms/spare_part/spare_part_request.dart
+++ b/lib/modules/cm_module/views/forms/spare_part/spare_part_request.dart
@@ -222,7 +222,7 @@ class _SparePartRequestState extends State<SparePartRequest> with TickerProvider
                               AppTextFormField(
                                 controller: _installQtyController,
                                 labelText: context.translation.installedQty,
-                                textInputType: TextInputType.number,
+                                textInputType: const TextInputType.numberWithOptions(decimal: true),
                                 labelStyle: AppTextStyles.textFieldLabelStyle,
                                 showWithoutDecoration: true,
                                 backgroundColor: context.isDark ? AppColor.neutral20 : AppColor.neutral90,
diff --git a/lib/views/pages/user/requests/work_order/create_service_report.dart b/lib/views/pages/user/requests/work_order/create_service_report.dart
index 4e49b20d..2c7e7fc9 100644
--- a/lib/views/pages/user/requests/work_order/create_service_report.dart
+++ b/lib/views/pages/user/requests/work_order/create_service_report.dart
@@ -321,7 +321,7 @@ class _CreateServiceReportState extends State<CreateServiceReport> with TickerPr
                       AppTextFormField(
                         labelText: context.translation.travelingExpense,
                         initialValue: _serviceReport.travelingExpenses?.toString(),
-                        textInputType: TextInputType.number,
+                        textInputType: const TextInputType.numberWithOptions(decimal: true),
                         onSaved: (value) {
                           _serviceReport.travelingExpenses = double.tryParse(value) ?? 0.0;
                         },
@@ -330,7 +330,7 @@ class _CreateServiceReportState extends State<CreateServiceReport> with TickerPr
                       AppTextFormField(
                         labelText: context.translation.travelingHours,
                         initialValue: _serviceReport.travelingHours?.toString(),
-                        textInputType: TextInputType.number,
+                        textInputType: const TextInputType.numberWithOptions(decimal: true),
                         onSaved: (value) {
                           _serviceReport.travelingHours = double.tryParse(value) ?? 0.0;
                         },
diff --git a/lib/views/pages/user/update_profile_info_bottmsheet.dart b/lib/views/pages/user/update_profile_info_bottmsheet.dart
index 75edfd9f..01e065d4 100644
--- a/lib/views/pages/user/update_profile_info_bottmsheet.dart
+++ b/lib/views/pages/user/update_profile_info_bottmsheet.dart
@@ -31,7 +31,7 @@ class UpdateProfileInfoBottmsheet extends StatelessWidget {
                 initialValue: userInfoModel.email,
                 textAlign: TextAlign.center,
                 labelStyle: AppTextStyles.textFieldLabelStyle,
-                textInputType: TextInputType.number,
+                textInputType: TextInputType.emailAddress,
                 showShadow: false,
                 onChange: (value) {
                   userInfoModel.email = value;
@@ -47,7 +47,7 @@ class UpdateProfileInfoBottmsheet extends StatelessWidget {
                 initialValue: userInfoModel.phoneNo,
                 textAlign: TextAlign.center,
                 labelStyle: AppTextStyles.textFieldLabelStyle,
-                textInputType: TextInputType.number,
+                textInputType: TextInputType.phone,
                 showShadow: false,
                 onChange: (value) {
                   userInfoModel.phoneNo = value;
@@ -63,7 +63,7 @@ class UpdateProfileInfoBottmsheet extends StatelessWidget {
                 initialValue: userInfoModel.extensionNo,
                 textAlign: TextAlign.center,
                 labelStyle: AppTextStyles.textFieldLabelStyle,
-                textInputType: TextInputType.number,
+                textInputType: const TextInputType.numberWithOptions(decimal: true),
                 showShadow: false,
                 onChange: (value) {
                   userInfoModel.extensionNo = value;