From 8c7f4afe762ca99c80af8a9f96e325eb39829d84 Mon Sep 17 00:00:00 2001 From: aamir-csol Date: Tue, 27 Jan 2026 11:35:07 +0300 Subject: [PATCH 1/2] family file button fix --- assets/langs/ar-SA.json | 3 ++- assets/langs/en-US.json | 4 +++- .../authentication/authentication_view_model.dart | 9 +++++++++ lib/generated/locale_keys.g.dart | 1 + lib/presentation/my_family/my_family.dart | 2 ++ lib/presentation/my_family/widget/family_cards.dart | 5 +++-- 6 files changed, 20 insertions(+), 4 deletions(-) diff --git a/assets/langs/ar-SA.json b/assets/langs/ar-SA.json index 90103c0..7a9b34c 100644 --- a/assets/langs/ar-SA.json +++ b/assets/langs/ar-SA.json @@ -1524,7 +1524,8 @@ "medicalServices": "الخدمات الطبية", "insuranceAndPayments": "التأمين والمدفوعات", "trackerAndOthers": "المتتبع وأخرى", - "bmi": "مؤشر كتلة الجسم" + "bmi": "مؤشر كتلة الجسم", + "unableToSendOTP": "تعذر إرسال رمز التحقق لمرة واحدة" } diff --git a/assets/langs/en-US.json b/assets/langs/en-US.json index 50d4481..afcb598 100644 --- a/assets/langs/en-US.json +++ b/assets/langs/en-US.json @@ -1515,7 +1515,9 @@ "medicalServices": "Medical Services", "insuranceAndPayments": "Insurance & Payments", "trackerAndOthers": "Tracker & Others", - "bmi": "BMI" + "bmi": "BMI", + "unableToSendOTP": "Unable to send Verification OTP" + } diff --git a/lib/features/authentication/authentication_view_model.dart b/lib/features/authentication/authentication_view_model.dart index f1182e0..8206160 100644 --- a/lib/features/authentication/authentication_view_model.dart +++ b/lib/features/authentication/authentication_view_model.dart @@ -432,6 +432,15 @@ class AuthenticationViewModel extends ChangeNotifier { } else { // TODO: Handle isSMSSent false // navigateToOTPScreen(otpTypeEnum: otpTypeEnum, phoneNumber: phoneNumber); + if (isFormFamilyFile) { + LoaderBottomSheet.hideLoader(); + await _dialogService.showCommonBottomSheetWithoutH( + message: LocaleKeys.unableToSendOTP.tr(), + label: LocaleKeys.notice.tr(), + onOkPressed: () { + _navigationService.pop(); + }); + } } } }, diff --git a/lib/generated/locale_keys.g.dart b/lib/generated/locale_keys.g.dart index 41cb64f..cccad9e 100644 --- a/lib/generated/locale_keys.g.dart +++ b/lib/generated/locale_keys.g.dart @@ -1512,5 +1512,6 @@ abstract class LocaleKeys { static const insuranceAndPayments = 'insuranceAndPayments'; static const trackerAndOthers = 'trackerAndOthers'; static const bmi = 'bmi'; + static const unableToSendOTP = 'unableToSendOTP'; } diff --git a/lib/presentation/my_family/my_family.dart b/lib/presentation/my_family/my_family.dart index b16c587..ea19c67 100644 --- a/lib/presentation/my_family/my_family.dart +++ b/lib/presentation/my_family/my_family.dart @@ -42,6 +42,8 @@ class _FamilyMedicalScreenState extends State { medicalVM = context.read(); WidgetsBinding.instance.addPostFrameCallback((_) { medicalVM?.onFamilyFileTabChange(0); + medicalVM?.getAllPendingRecordsByResponseId(); + }); } diff --git a/lib/presentation/my_family/widget/family_cards.dart b/lib/presentation/my_family/widget/family_cards.dart index f76f3c1..175cfb1 100644 --- a/lib/presentation/my_family/widget/family_cards.dart +++ b/lib/presentation/my_family/widget/family_cards.dart @@ -321,7 +321,7 @@ class _FamilyCardsState extends State { : Expanded( child: CustomButton( height: 40.h, - text: LocaleKeys.confirm.tr(), + text: LocaleKeys.acceptLbl.tr(), onPressed: () { navigationService.pop(); widget.onSelect(profile); @@ -329,6 +329,7 @@ class _FamilyCardsState extends State { backgroundColor: AppColors.lightGreenButtonColor, borderColor: AppColors.lightGreenButtonColor, textColor: AppColors.textGreenColor, + borderWidth: 0, icon: null, ), ), @@ -336,7 +337,7 @@ class _FamilyCardsState extends State { Expanded( child: CustomButton( height: 40.h, - text: profile.status == FamilyFileEnum.active.toInt ? LocaleKeys.removeMember.tr() : LocaleKeys.cancel.tr(), + text: profile.status == FamilyFileEnum.active.toInt ? LocaleKeys.removeMember.tr() : LocaleKeys.rejectView.tr(), onPressed: () { navigationService.pop(); widget.onRemove(profile); From 2c2cb8bb99df91482b7c9ae0787cf92d5ec3b042 Mon Sep 17 00:00:00 2001 From: aamir-csol Date: Tue, 27 Jan 2026 11:39:32 +0300 Subject: [PATCH 2/2] family file button fix --- lib/presentation/my_family/my_family.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/presentation/my_family/my_family.dart b/lib/presentation/my_family/my_family.dart index ea19c67..8383ce7 100644 --- a/lib/presentation/my_family/my_family.dart +++ b/lib/presentation/my_family/my_family.dart @@ -75,7 +75,7 @@ class _FamilyMedicalScreenState extends State { icon: AppAssets.add_icon, fontSize: 16.f, borderRadius: 12.r, - fontWeight: FontWeight.w500)) + fontWeight: FontWeight.w500)).paddingOnly(bottom: 20.h) : SizedBox(), child: Column( mainAxisSize: MainAxisSize.min,