diff --git a/assets/langs/ar-SA.json b/assets/langs/ar-SA.json index 33e7f2f6..cfb40a8f 100644 --- a/assets/langs/ar-SA.json +++ b/assets/langs/ar-SA.json @@ -1289,7 +1289,7 @@ "quickLinks": "روابط سريعة", "viewMedicalFileLandingPage": "عرض الملف الطبي", "immediateLiveCareRequest": "طلب لايف كير فوري", - "yourTurnIsAfterPatients": "أمامك {count} مريض. سيقوم الطبيب بالتواصل معكً.", + "yourTurnIsAfterPatients": "أمامك {count} مريض. سيقوم الطبيب بالتواصل معكً.\n", "dontHaveHHCOrders": "ليس لديك أي أوامر رعاية صحية منزلية حتى الآن.", "hhcOrders": "أوامر الرعاية الصحية المنزلية", "requestedServices": "الخدمات المطلوبة", @@ -1714,7 +1714,7 @@ "selectHospitalContinue": "يرجى اختيار المستشفى للمتابعة.", "year": "سنة", "notifyPrescription": "تنبيه قبل موعد الجرعة", - "doctorRatingAppointment": "طبيب\nتصنيف", + "doctorRatingAppointment": "تقييم الطبيب", "ratingSubmitted": "تم إرسال التقييم", "rateTheDoctor": "يرجى تقييم الطبيب", "downloadInvoice": "تحميل", @@ -1834,9 +1834,10 @@ "benefit": "الفائدة", "commonSideEffects": "الآثار الجانبية الشائعة", "seriousWarnings": "تحذيرات خطيرة", - "storage": "التخزين", + "storage": "طريقة الحفظ", "aiDisclaimerPrescription": "سيتم مشاركة بيانات نتائج الوصفات الطبية الخاصة بك بشكل آمن مع محلل الذكاء الاصطناعي لدينا لتحليلها. يساعد هذا في توفير رؤى صحية مخصصة. هل ترغب في المتابعة؟", "generateAiAnalysisPrescription": "تحليل الذكاء الاصطناعي", "loadingAIAnalysisPrescription": "ٍتحليل الوصفات الطبية بواسطة الذكاء الاصطناعي، يرجى الانتظار...", - "thisAboveInfoPrescription": "تم تحليل الوصفة الطبية هذه بواسطة الذكاء الاصطناعي، وهي لا تُعدّ نصيحة طبية. استشر طبيبك المختص للتشخيص والعلاج." + "thisAboveInfoPrescription": "تم تحليل الوصفة الطبية هذه بواسطة الذكاء الاصطناعي، وهي لا تُعدّ نصيحة طبية. استشر طبيبك المختص للتشخيص والعلاج.", + "liveCareNotificationPermissionsMessage": "يتطلب لايف كير أذونات الإشعارات، يرجى السماح بهذه الأذونات للمتابعة." } diff --git a/assets/langs/en-US.json b/assets/langs/en-US.json index 06cec111..a760c39d 100644 --- a/assets/langs/en-US.json +++ b/assets/langs/en-US.json @@ -1705,7 +1705,7 @@ "selectHospitalContinue": "Please select hospital to continue.", "year": "Year", "notifyPrescription": "Notify me before the consumption time", - "doctorRatingAppointment": "Doctor\nRating", + "doctorRatingAppointment": "Doctor Rating", "ratingSubmitted": "Rating Submitted", "rateTheDoctor": "Please rate the doctor", "downloadInvoice": "Download Invoice", @@ -1828,7 +1828,8 @@ "aiDisclaimerPrescription": "Your prescription data will be securely shared with our AI Analyzer for analysis. This helps provide personalized health insights. Do you want to proceed?", "generateAiAnalysisPrescription": "Generate AI analysis", "loadingAIAnalysisPrescription": "Analysing your prescription, let the AI do the magic, This might take some time.", - "thisAboveInfoPrescription": "This prescription was analyzed by AI, and it is not medical advice. Consult your healthcare provider for diagnosis and treatment." + "thisAboveInfoPrescription": "This prescription was analyzed by AI, and it is not medical advice. Consult your healthcare provider for diagnosis and treatment.", + "liveCareNotificationPermissionsMessage": "LiveCare requires Notifications permission, Please allow to proceed." } diff --git a/lib/features/immediate_livecare/immediate_livecare_view_model.dart b/lib/features/immediate_livecare/immediate_livecare_view_model.dart index 8a30f154..1b1d1f9e 100644 --- a/lib/features/immediate_livecare/immediate_livecare_view_model.dart +++ b/lib/features/immediate_livecare/immediate_livecare_view_model.dart @@ -248,6 +248,7 @@ class ImmediateLiveCareViewModel extends ChangeNotifier { Future getPatientLiveCareHistory({Function(dynamic)? onSuccess, Function(String)? onError}) async { patientLiveCareHistoryList = []; patientHasPendingLiveCareRequest = false; + timer?.cancel(); notifyListeners(); final result = await immediateLiveCareRepo.getPatientLiveCareHistory(); diff --git a/lib/generated/locale_keys.g.dart b/lib/generated/locale_keys.g.dart index 9d7d99fd..c8478deb 100644 --- a/lib/generated/locale_keys.g.dart +++ b/lib/generated/locale_keys.g.dart @@ -1831,5 +1831,6 @@ abstract class LocaleKeys { static const generateAiAnalysisPrescription = 'generateAiAnalysisPrescription'; static const loadingAIAnalysisPrescription = 'loadingAIAnalysisPrescription'; static const thisAboveInfoPrescription = 'thisAboveInfoPrescription'; + static const liveCareNotificationPermissionsMessage = 'liveCareNotificationPermissionsMessage'; } diff --git a/lib/presentation/book_appointment/livecare/immediate_livecare_payment_details.dart b/lib/presentation/book_appointment/livecare/immediate_livecare_payment_details.dart index 81d232fa..528f262f 100644 --- a/lib/presentation/book_appointment/livecare/immediate_livecare_payment_details.dart +++ b/lib/presentation/book_appointment/livecare/immediate_livecare_payment_details.dart @@ -384,7 +384,7 @@ class ImmediateLiveCarePaymentDetails extends StatelessWidget { if (permanent.isNotEmpty) { final names = permanent.map((p) => LiveCarePermissionService.instance.friendlyName(p)).join(' and '); // final message = permanent.length == 1 ? '$names permission is permanently denied. Open app settings to allow it.' : '$names permissions are permanently denied. Open app settings to allow them.'; - final message = LocaleKeys.liveCarePermissions.tr(); + final message = LocaleKeys.liveCareNotificationPermissionsMessage.tr(); await LiveCarePermissionService.instance.showOpenSettingsDialog( context, title: LocaleKeys.permissionsProfile.tr(), diff --git a/lib/presentation/book_appointment/livecare/immediate_livecare_pending_request_page.dart b/lib/presentation/book_appointment/livecare/immediate_livecare_pending_request_page.dart index 0d42f7e5..ed524ab6 100644 --- a/lib/presentation/book_appointment/livecare/immediate_livecare_pending_request_page.dart +++ b/lib/presentation/book_appointment/livecare/immediate_livecare_pending_request_page.dart @@ -41,7 +41,7 @@ class _ImmediateLiveCarePendingRequestPageState extends State