diff --git a/assets/langs/ar-SA.json b/assets/langs/ar-SA.json index 49b03c9..178b4c0 100644 --- a/assets/langs/ar-SA.json +++ b/assets/langs/ar-SA.json @@ -1527,4 +1527,7 @@ "bmi": "مؤشر كتلة الجسم", "yesPleaseINeedHelp": "نعم، من فضلك أريد المساعدة", "noThanksIKnowTheClinic": "لا شكراً، أعرف العيادة" + "unableToSendOTP": "تعذر إرسال رمز التحقق لمرة واحدة" + + } diff --git a/assets/langs/en-US.json b/assets/langs/en-US.json index e2e3f14..d6f5228 100644 --- a/assets/langs/en-US.json +++ b/assets/langs/en-US.json @@ -1518,5 +1518,8 @@ "bmi": "BMI", "yesPleaseINeedHelp": "Yes, Please I need help", "noThanksIKnowTheClinic": "No, Thanks. I Know the clinic" + "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 44951a5..416d2a4 100644 --- a/lib/generated/locale_keys.g.dart +++ b/lib/generated/locale_keys.g.dart @@ -1514,5 +1514,6 @@ abstract class LocaleKeys { static const bmi = 'bmi'; static const yesPleaseINeedHelp = 'yesPleaseINeedHelp'; static const noThanksIKnowTheClinic = 'noThanksIKnowTheClinic'; + static const unableToSendOTP = 'unableToSendOTP'; } diff --git a/lib/presentation/my_family/my_family.dart b/lib/presentation/my_family/my_family.dart index cd727da..bac6f77 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(); + }); } @@ -73,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, 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);