diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index c1ccc0b9..c70123d4 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -179,7 +179,8 @@ dependencies { implementation("androidx.room:room-runtime:$room_version") annotationProcessor("androidx.room:room-compiler:$room_version") - implementation("net.zetetic:android-database-sqlcipher:4.5.4") +// implementation("net.zetetic:android-database-sqlcipher:4.6.1") + implementation("net.zetetic:sqlcipher-android:4.6.1@aar") implementation("com.intuit.ssp:ssp-android:1.1.0") implementation("com.intuit.sdp:sdp-android:1.1.0") diff --git a/lib/core/api_consts.dart b/lib/core/api_consts.dart index c9c4aaff..6243ab3b 100644 --- a/lib/core/api_consts.dart +++ b/lib/core/api_consts.dart @@ -54,7 +54,7 @@ class ApiConsts { GET_TAMARA_PAYMENT_STATUS = 'https://mdlaboratories.com/tamaralive/api/OnlineTamara/order_status?orderid='; rcBaseUrl = 'https://rc.hmg.com/'; QLINE_URL = "https://qline.hmg.com/api/PatientCall/PatientInQueue_Detail"; - CHAT_URL = "https://chat.hmg.com/Index.aspx?RequestedId="; + CHAT_URL = "https://chat.hmg.com/geneysChat/Index.aspx?RequestedId="; symptomsCheckerApi = symptomsCheckerApiLive; symptomsCheckerUsername = 'mobile_user'; symptomsCheckerPassword = '8d969eef6ecad3c29a3a629280e686cf0c3f5d5a86aff3ca12020c923adc6c92'; diff --git a/lib/features/my_invoices/my_invoices_view_model.dart b/lib/features/my_invoices/my_invoices_view_model.dart index 631efd5b..e191b24d 100644 --- a/lib/features/my_invoices/my_invoices_view_model.dart +++ b/lib/features/my_invoices/my_invoices_view_model.dart @@ -1,4 +1,6 @@ import 'package:flutter/material.dart'; +import 'package:hmg_patient_app_new/core/app_state.dart'; +import 'package:hmg_patient_app_new/core/dependencies.dart'; import 'package:hmg_patient_app_new/features/my_invoices/models/get_invoice_details_response_model.dart'; import 'package:hmg_patient_app_new/features/my_invoices/models/get_invoices_list_response_model.dart'; import 'package:hmg_patient_app_new/features/my_invoices/my_invoices_repo.dart'; @@ -229,7 +231,7 @@ class MyInvoicesViewModel extends ChangeNotifier { } else if (filterType == InvoiceFilterType.clinic) { itemName = invoice.clinicName; } else if (filterType == InvoiceFilterType.doctor) { - itemName = invoice.doctorName; + itemName = getIt().isArabic() ? invoice.doctorNameN : invoice.doctorName; } if (itemName != null && itemName.isNotEmpty) { diff --git a/lib/presentation/authentication/saved_login_screen.dart b/lib/presentation/authentication/saved_login_screen.dart index 10a69711..7d4d32aa 100644 --- a/lib/presentation/authentication/saved_login_screen.dart +++ b/lib/presentation/authentication/saved_login_screen.dart @@ -100,7 +100,6 @@ class _SavedLogin extends State { child: Column( children: [ // Last login info - show WhatsApp only if isOther AND loginType is SMS - ("${LocaleKeys.lastLoginBy.tr()} ${(isOther == true && loginType == LoginTypeEnum.sms) ? LoginTypeEnum.whatsapp.displayName : loginType.displayName}") .toText14(isBold: true, color: AppColors.greyTextColor, letterSpacing: -1), Directionality( @@ -251,7 +250,7 @@ class _SavedLogin extends State { }), ); }, - height: isFoldable ? 50.h : 40.h, + height: isFoldable ? 56.h : 50.h, backgroundColor: AppColors.whiteColor, borderColor: AppColors.borderOnlyColor, textColor: AppColors.textColor, diff --git a/lib/presentation/my_invoices/widgets/invoice_filter_bottom_sheet.dart b/lib/presentation/my_invoices/widgets/invoice_filter_bottom_sheet.dart index 340f1020..ada8b466 100644 --- a/lib/presentation/my_invoices/widgets/invoice_filter_bottom_sheet.dart +++ b/lib/presentation/my_invoices/widgets/invoice_filter_bottom_sheet.dart @@ -35,7 +35,7 @@ class InvoiceFilterBottomSheet extends StatelessWidget { children: [ TextInputWidget( labelText: LocaleKeys.search.tr(context: context), - hintText: "Search $title", + hintText: "${LocaleKeys.search.tr(context: context)} $title", controller: vm.filterSearchController, onChange: (value) { debouncer.run(() {