From 5194f8b1fda1d60fff9582a270bc3a3397660787 Mon Sep 17 00:00:00 2001 From: Sultan khan Date: Thu, 22 Oct 2026 16:57:56 +0300 Subject: [PATCH 1/2] no message --- lib/generated/locale_keys.g.dart | 20 ++++++++++++++++++++ lib/ui/login/verify_last_login_screen.dart | 2 +- lib/ui/login/verify_login_screen.dart | 2 +- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/lib/generated/locale_keys.g.dart b/lib/generated/locale_keys.g.dart index 1114961..f1ee6c4 100644 --- a/lib/generated/locale_keys.g.dart +++ b/lib/generated/locale_keys.g.dart @@ -819,5 +819,25 @@ abstract class LocaleKeys { static const locationPermissionRequiredForNearestOffers = 'locationPermissionRequiredForNearestOffers'; static const favoriteMerchant = 'favoriteMerchant'; static const favoriteOffers = 'favoriteOffers'; + static const goodToKnow = 'goodToKnow'; + static const goodToKnowDesc = 'goodToKnowDesc'; + static const termsAndConditions = 'termsAndConditions'; + static const haveAQuestionAboutOffer = 'haveAQuestionAboutOffer'; + static const getHelp = 'getHelp'; + static const redeemOffer = 'redeemOffer'; + static const merchantContact = 'merchantContact'; + static const website = 'website'; + static const phone = 'phone'; + static const viewAll = 'viewAll'; + static const moreCitiesCount = 'moreCitiesCount'; + static const mazayaDeals = 'mazayaDeals'; + static const exploreYourBenefits = 'exploreYourBenefits'; + static const findAnEscapeOrAnExperience = 'findAnEscapeOrAnExperience'; + static const allOffers = 'allOffers'; + static const sampleAvailability = 'sampleAvailability'; + static const offersCount = 'offersCount'; + static const mazayaExclusive = 'mazayaExclusive'; + static const youAreAllCaughtUp = 'youAreAllCaughtUp'; + static const selectCity = 'selectCity'; } diff --git a/lib/ui/login/verify_last_login_screen.dart b/lib/ui/login/verify_last_login_screen.dart index 6234a95..20bc28f 100644 --- a/lib/ui/login/verify_last_login_screen.dart +++ b/lib/ui/login/verify_last_login_screen.dart @@ -387,7 +387,7 @@ class _VerifyLastLoginScreenState extends State { Future performDirectApiCall(String _title, String _icon, int _flag, String value, TextEditingController? _pinPutController, {bool isDirectLogin = false}) async { try { - GenericResponseModel? genericResponseModel = await LoginApiClient().checkActivationCode(true, AppState().memberLoginList?.pMOBILENUMBER, value, AppState().getUserName); + GenericResponseModel? genericResponseModel = await LoginApiClient().checkActivationCode(true, AppState().memberLoginList?.pMOBILENUMBER, value, AppState().getUserName,_flag.toString()); String devToken = AppState().getIsHuawei ? AppState().getHuaweiPushToken : ((mobileLoginInfoListModel?.deviceToken != null && mobileLoginInfoListModel!.deviceToken!.isNotEmpty && mobileLoginInfoListModel!.deviceToken != "null") diff --git a/lib/ui/login/verify_login_screen.dart b/lib/ui/login/verify_login_screen.dart index 9fb1c7f..cc485cb 100644 --- a/lib/ui/login/verify_login_screen.dart +++ b/lib/ui/login/verify_login_screen.dart @@ -652,7 +652,7 @@ class _VerifyLoginScreenState extends State { (value, TextEditingController _pinPutController) async { Utils.showLoading(context); try { - GenericResponseModel? genericResponseModel = await LoginApiClient().checkActivationCode(true, AppState().memberLoginList?.pMOBILENUMBER, value, AppState().getUserName); + GenericResponseModel? genericResponseModel = await LoginApiClient().checkActivationCode(true, AppState().memberLoginList?.pMOBILENUMBER, value, AppState().getUserName, _flag.toString()); String devToken = AppState().getIsHuawei ? AppState().getHuaweiPushToken : ((firebaseToken != null && firebaseToken!.isNotEmpty && firebaseToken != "null") From e6cc2491b4a0691fbf38641934e6f6d61868426f Mon Sep 17 00:00:00 2001 From: Sultan khan Date: Thu, 22 Oct 2026 16:58:09 +0300 Subject: [PATCH 2/2] no message --- lib/generated/codegen_loader.g.dart | 64 +++++++++++++++++++++++------ 1 file changed, 52 insertions(+), 12 deletions(-) diff --git a/lib/generated/codegen_loader.g.dart b/lib/generated/codegen_loader.g.dart index 29df44b..6b8457e 100644 --- a/lib/generated/codegen_loader.g.dart +++ b/lib/generated/codegen_loader.g.dart @@ -824,16 +824,16 @@ class CodegenLoader extends AssetLoader{ "multipleCities": "مدن متعددة", "filters": "الفلاتر", "availability": "التوفر", - "chooseOneOrBoth": "اختر واحدًا أو كليهما", - "sortBy": "ترتيب حسب", - "recommended": "موصى به", + "chooseOneOrBoth": "اختر أحد الخيارين أو كليهما", + "sortBy": "الترتيب حسب", + "recommended": "الموصى بها", "nearest": "الأقرب", - "highestDiscount": "أعلى خصم", + "highestDiscount": "الأعلى خصمًا", "newest": "الأحدث", "distance": "المسافة", "fromYourCurrentLocation": "من موقعك الحالي", "any": "الكل", - "minimumDiscount": "الحد الأدنى للخصم", + "minimumDiscount": "أقل نسبة خصم", "reset": "إعادة تعيين", "applyFilters": "تطبيق الفلاتر", "distanceKm": "{} كم", @@ -841,12 +841,32 @@ class CodegenLoader extends AssetLoader{ "visitMerchantWebsite": "زيارة موقع التاجر", "favoriteAddedSuccess": "تمت إضافة التاجر إلى المفضلة بنجاح", "favoriteRemovedSuccess": "تمت إزالة التاجر من المفضلة بنجاح", - "favoriteError": "حدث خطأ أثناء تحديث المفضلة", - "merchantWebsiteNotAvailable": "موقع التاجر غير متوفر", - "locationServicesRequiredForNearestOffers": "يجب تفعيل خدمة الموقع لعرض العروض القريبة", - "locationPermissionRequiredForNearestOffers": "يجب منح إذن الموقع لعرض العروض القريبة", + "favoriteError": "تعذّر تحديث المفضلة. يُرجى المحاولة مرة أخرى.", + "merchantWebsiteNotAvailable": "الموقع الإلكتروني للتاجر غير متاح", + "locationServicesRequiredForNearestOffers": "فعّل خدمات الموقع لعرض العروض القريبة منك", + "locationPermissionRequiredForNearestOffers": "اسمح للتطبيق بالوصول إلى موقعك لعرض العروض القريبة منك", "favoriteMerchant": "العروض المفضلة", - "favoriteOffers": "العروض المفضلة" + "favoriteOffers": "العروض المفضلة", + "goodToKnow": "معلومات مهمة", + "goodToKnowDesc": "احتفظ بعضوية مزايا في متناول يدك. تحقق من توفر التاجر والأنشطة المؤهلة والشروط الكاملة قبل الحجز.", + "termsAndConditions": "الشروط والأحكام", + "haveAQuestionAboutOffer": "هل لديك سؤال حول هذا العرض؟", + "getHelp": "الحصول على المساعدة", + "redeemOffer": "استرداد العرض", + "merchantContact": "بيانات التواصل مع التاجر", + "website": "الموقع الإلكتروني", + "phone": "الهاتف", + "viewAll": "عرض الكل", + "moreCitiesCount": "+ {} مدن أخرى", + "mazayaDeals": "عروض مزايا", + "exploreYourBenefits": "استكشف مزاياك", + "findAnEscapeOrAnExperience": "ابحث عن تجربة أو عطلة", + "allOffers": "جميع العروض", + "sampleAvailability": "حسب التوفر", + "offersCount": "{} عروض", + "mazayaExclusive": "حصري لمزايا", + "youAreAllCaughtUp": "لقد شاهدت كل العروض. المزيد قريباً.", + "selectCity": "اختر المدينة" }; static const Map _en_US = { "mohemm": "Mohemm", @@ -1549,7 +1569,7 @@ static const Map _en_US = { "copyLink": "Copy Link", "done": "Done", "linkCopied": "Link copied to clipboard", - "mazayaAccessRevoked": "Mazaya access revoked", + "mazayaAccessRevoked": "Mazaya Access", "mazayaAccessRevokedDesc": "You are not authorized to access the Mazaya Program.", "contactYourSponsor": "Contact your sponsor", "contactYourSponsorDesc": "Ask your sponsor to allow Mazaya access again from Dependent Details. Only the sponsor can restore access.", @@ -1680,7 +1700,27 @@ static const Map _en_US = { "favoriteRemovedSuccess": "Removed from favorites successfully", "favoriteError": "An error occurred while updating favorites", "favoriteMerchant": "Favorite Offers", - "favoriteOffers": "Favorite Offers" + "favoriteOffers": "Favorite Offers", + "goodToKnow": "Good to know", + "goodToKnowDesc": "Keep your Mazaya membership handy. Check the merchant's availability, eligible activities and full terms before you book.", + "termsAndConditions": "Terms & conditions", + "haveAQuestionAboutOffer": "Have a question about this offer?", + "getHelp": "Get help", + "redeemOffer": "Redeem offer", + "merchantContact": "Merchant contact", + "website": "Website", + "phone": "Phone", + "viewAll": "View all", + "moreCitiesCount": "+ {} more cities", + "mazayaDeals": "Mazaya Deals", + "exploreYourBenefits": "Explore your benefits", + "findAnEscapeOrAnExperience": "Find an escape or an experience", + "allOffers": "All offers", + "sampleAvailability": "sample availability", + "offersCount": "{} offers", + "mazayaExclusive": "MAZAYA EXCLUSIVE", + "youAreAllCaughtUp": "You're all caught up. More little extras soon.", + "selectCity": "Select City" }; static const Map> mapLocales = {"ar_SA": _ar_SA, "en_US": _en_US}; }