From fe29431246df1ab25cff1fd7b05fb9c893e41319 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Tue, 21 Jul 2026 11:07:49 +0300 Subject: [PATCH 1/2] updates --- .../authentication/authentication_view_model.dart | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/features/authentication/authentication_view_model.dart b/lib/features/authentication/authentication_view_model.dart index 16b84d15..fdc16943 100644 --- a/lib/features/authentication/authentication_view_model.dart +++ b/lib/features/authentication/authentication_view_model.dart @@ -3,6 +3,7 @@ import 'dart:developer'; import 'dart:io'; import 'package:easy_localization/easy_localization.dart'; +import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart' show rootBundle; import 'package:get_it/get_it.dart'; @@ -979,12 +980,14 @@ class AuthenticationViewModel extends ChangeNotifier { // TODO: GET APP SMS SIGNATURE HERE request.sMSSignature = await getSignature(); - // Get Turnstile token if configured - final turnstileToken = await _turnstileService.getTurnstileToken(); - if (turnstileToken != null) { - request.turnstileToken = turnstileToken; - } else { - request.turnstileToken = ""; + if(!kDebugMode) { + // Get Turnstile token if configured + final turnstileToken = await _turnstileService.getTurnstileToken(); + if (turnstileToken != null) { + request.turnstileToken = turnstileToken; + } else { + request.turnstileToken = ""; + } } if (isNeedLoading) { -- 2.30.2 From 3030c13a171608f7f30974edb9d65b54949b1840 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Tue, 21 Jul 2026 11:56:31 +0300 Subject: [PATCH 2/2] Updates & fixes --- assets/langs/ar-SA.json | 5 ++--- .../widgets/appointment_doctor_card.dart | 6 +++--- .../habib_wallet/habib_wallet_page.dart | 2 +- .../home/lakum_wallet_details.dart | 18 +++++++++++------- lib/widgets/common_bottom_sheet.dart | 6 +++--- 5 files changed, 20 insertions(+), 17 deletions(-) diff --git a/assets/langs/ar-SA.json b/assets/langs/ar-SA.json index ed554e97..d0321ace 100644 --- a/assets/langs/ar-SA.json +++ b/assets/langs/ar-SA.json @@ -123,7 +123,7 @@ "forgotFileNoTitle": "نسيت الملف الطبي", "enterNationalId": "يرجى إدخال رقم الهاتف المحمول ورقم الهوية", "profileInfo": "يرجى إدخال معلومات الملف الشخصي", - "submit": "بحث", + "submit": "تأكيد", "forgotDesc": "أدخل رقم الهاتف المحمول لاستلام رقم الملف الطبي عبر الرسائل القصيرة", "dob": "تاريخ الميلاد", "hijriDate": "التاريخ الهجري", @@ -1390,7 +1390,6 @@ "medicalFiles": "الملفات الطبية", "addANewFamilyMember": "اضافة", "viewInvoiceDetails": "عرض تفاصيل الفاتورة", - "outPatient": "مريض خارجي", "invoiceDetails": "تفاصيل الفاتورة", "sendingEmailPleaseWait": "جاري إرسال ال��ريد الإلكتروني، يرجى الانتظار...", "emailSentSuccessfullyMessage": "تم إرسال البريد الإلكتروني بنجاح.", @@ -1946,7 +1945,7 @@ "transactions": "المعاملات", "pharmacy": "الصيدلية", "visitsOrders": "الزيارات/الطلبات", - "earned": "حصل", + "earned": "مكتسب", "getParkingQR": "الحصول على رمز الاستجابة السريعة لوقوف السيارات", "cannotOpenThisFile": "لا يمكن فتح هذا الملف", "refundDetails": "تفاصيل الاسترداد", diff --git a/lib/presentation/appointments/widgets/appointment_doctor_card.dart b/lib/presentation/appointments/widgets/appointment_doctor_card.dart index f0dd2f5d..6e3f77d1 100644 --- a/lib/presentation/appointments/widgets/appointment_doctor_card.dart +++ b/lib/presentation/appointments/widgets/appointment_doctor_card.dart @@ -127,9 +127,9 @@ class AppointmentDoctorCard extends StatelessWidget { runSpacing: 6.h, children: [ AppCustomChipWidget( - labelText: (patientAppointmentHistoryResponseModel.clinicName!.length > 20 - ? '${patientAppointmentHistoryResponseModel.clinicName!.substring(0, 20)}...' - : patientAppointmentHistoryResponseModel.clinicName!), + labelText: ((patientAppointmentHistoryResponseModel.clinicName ?? "").length > 20 + ? '${(patientAppointmentHistoryResponseModel.clinicName ?? "").substring(0, 20)}...' + : (patientAppointmentHistoryResponseModel.clinicName ?? "")), labelPadding: EdgeInsetsDirectional.only(start: 4.w, end: 4.w), ), AppCustomChipWidget( diff --git a/lib/presentation/habib_wallet/habib_wallet_page.dart b/lib/presentation/habib_wallet/habib_wallet_page.dart index 07df55ea..2814a961 100644 --- a/lib/presentation/habib_wallet/habib_wallet_page.dart +++ b/lib/presentation/habib_wallet/habib_wallet_page.dart @@ -89,7 +89,7 @@ class _HabibWalletState extends State { "${appState.getAuthenticatedUser()!.firstName!} ${appState.getAuthenticatedUser()!.lastName!}" .toText19(isBold: true, color: Colors.white), "${LocaleKeys.fileno.tr(context: context)}: ${appState.getAuthenticatedUser()!.patientId!}" - .toText14(isBold: true, color: AppColors.greyTextColor, isEnglishOnly: true), + .toText14(isBold: true, color: AppColors.greyTextColor), ], ).expanded, Utils.buildSvgWithAssets(icon: AppAssets.habiblogo, width: 24.h, height: 24.h, applyThemeColor: false), diff --git a/lib/presentation/home/lakum_wallet_details.dart b/lib/presentation/home/lakum_wallet_details.dart index d2ef15f4..bcd5cb3e 100644 --- a/lib/presentation/home/lakum_wallet_details.dart +++ b/lib/presentation/home/lakum_wallet_details.dart @@ -17,6 +17,7 @@ import 'package:hmg_patient_app_new/widgets/appbar/collapsing_list_view.dart'; import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart'; import 'package:provider/provider.dart'; import 'package:url_launcher/url_launcher.dart'; +import 'dart:ui' as ui; class LakumWalletDetails extends StatelessWidget { const LakumWalletDetails({super.key}); @@ -239,10 +240,10 @@ class LakumWalletDetails extends StatelessWidget { return CustomButton( height: 46.h, icon: AppAssets.redeem_icon, - iconColor: AppColors.whiteColor, + iconColor: AppColors.textColor, iconSize: 24.h, backgroundColor: AppColors.habibPharmacyColor, - textColor: AppColors.whiteColor, + textColor: AppColors.textColor, text: LocaleKeys.redeem.tr(context: context), borderWidth: 0.w, fontWeight: FontWeight.w600, @@ -350,7 +351,10 @@ class LakumWalletDetails extends StatelessWidget { maxlines: 2, ), SizedBox(height: 2.h), - formattedDate.toText12(color: AppColors.greyTextColor), + Directionality( + textDirection: ui.TextDirection.ltr, + child: formattedDate.toText12(color: AppColors.greyTextColor), + ), ], ), ), @@ -363,10 +367,10 @@ class LakumWalletDetails extends StatelessWidget { isBold: true, color: transactionColor, ), - if (transaction.amount != null && transaction.amount! > 0) - "${transaction.amount?.toStringAsFixed(2) ?? "0.00"} SAR".toText11( - color: AppColors.greyTextColor, - ), + // if (transaction.amount != null && transaction.amount! > 0) + // "${transaction.amount?.toStringAsFixed(2) ?? "0.00"} SAR".toText11( + // color: AppColors.greyTextColor, + // ), ], ), ], diff --git a/lib/widgets/common_bottom_sheet.dart b/lib/widgets/common_bottom_sheet.dart index c3e78a6a..c86bc516 100644 --- a/lib/widgets/common_bottom_sheet.dart +++ b/lib/widgets/common_bottom_sheet.dart @@ -273,9 +273,9 @@ void showCommonBottomSheetWithoutHeight( if (navContext != null && Navigator.canPop(navContext)) { Navigator.of(navContext).pop(); } - if (callBackFunc != null) { - callBackFunc(); - } + // if (callBackFunc != null) { + // callBackFunc(); + // } }); } return SafeArea( -- 2.30.2