From d5ee0faa1eda8788f18c468cb0d0ac9eca015d2c Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Wed, 11 Nov 2026 16:57:39 +0300 Subject: [PATCH 1/2] Updates to share link message --- assets/langs/ar-SA.json | 2 +- assets/langs/en-US.json | 2 +- lib/generated/codegen_loader.g.dart | 4 +-- lib/ui/mazaya/retailers_list_screen.dart | 36 +++++++++---------- lib/ui/profile/dependent_details_screen.dart | 2 +- .../profile/mazaya_access_result_screen.dart | 2 +- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/assets/langs/ar-SA.json b/assets/langs/ar-SA.json index e38e3efa..c6146cff 100644 --- a/assets/langs/ar-SA.json +++ b/assets/langs/ar-SA.json @@ -606,7 +606,7 @@ "confirmRevokeMazayaAccess": "هل أنت متأكد أنك تريد إلغاء صلاحية مزايا لـ \"{}\"؟", "yes": "نعم", "no": "لا", - "mazayaInviteInstructions": "يرجى تحميل تطبيق مهمم من الرابط أعلاه واستخدام بيانات الاعتماد التالية لتسجيل الدخول", + "mazayaInviteInstructions": "يُرجى تحميل تطبيق مهمم من الرابط أعلاه، واستخدام رقم هويتك الوطنية وتاريخ ميلادك لتسجيل الدخول.", "cameraPermissionRequiredToScan": "يرجى منح صلاحية الكاميرا لمسح رمز الاستجابة السريعة", "cameraPermissionPermanentlyDenied": "يرجى تفعيل صلاحية الكاميرا من إعدادات التطبيق > الصلاحيات", "openSettings": "فتح الإعدادات", diff --git a/assets/langs/en-US.json b/assets/langs/en-US.json index 63d4c7e0..1358b0fb 100644 --- a/assets/langs/en-US.json +++ b/assets/langs/en-US.json @@ -553,7 +553,7 @@ "confirmRevokeMazayaAccess": "Are you sure you want to revoke Mazaya access to \"{}\"?", "yes": "Yes", "no": "No", - "mazayaInviteInstructions": "Please download the MoheM app from the above link and use the following credentials to login", + "mazayaInviteInstructions": "Please download the MoheM app from the above link and use your National ID & Date of birth to login.", "cameraPermissionRequiredToScan": "Please grant camera permission to scan the QR code", "cameraPermissionPermanentlyDenied": "Please allow camera permission from the app settings > Permissions", "openSettings": "Open Settings", diff --git a/lib/generated/codegen_loader.g.dart b/lib/generated/codegen_loader.g.dart index 4302c5b1..8b18e192 100644 --- a/lib/generated/codegen_loader.g.dart +++ b/lib/generated/codegen_loader.g.dart @@ -622,7 +622,7 @@ class CodegenLoader extends AssetLoader{ "confirmRevokeMazayaAccess": "هل أنت متأكد أنك تريد إلغاء صلاحية مزايا لـ \"{}\"؟", "yes": "نعم", "no": "لا", - "mazayaInviteInstructions": "يرجى تحميل تطبيق مهمم من الرابط أعلاه واستخدام بيانات الاعتماد التالية لتسجيل الدخول", + "mazayaInviteInstructions": "يُرجى تحميل تطبيق مهمم من الرابط أعلاه، واستخدام رقم هويتك الوطنية وتاريخ ميلادك لتسجيل الدخول.", "cameraPermissionRequiredToScan": "يرجى منح صلاحية الكاميرا لمسح رمز الاستجابة السريعة", "cameraPermissionPermanentlyDenied": "يرجى تفعيل صلاحية الكاميرا من إعدادات التطبيق > الصلاحيات", "openSettings": "فتح الإعدادات", @@ -1458,7 +1458,7 @@ static const Map _en_US = { "confirmRevokeMazayaAccess": "Are you sure you want to revoke Mazaya access to \"{}\"?", "yes": "Yes", "no": "No", - "mazayaInviteInstructions": "Please download the MoheM app from the above link and use the following credentials to login", + "mazayaInviteInstructions": "Please download the MoheM app from the above link and use your National ID & Date of birth to login.", "cameraPermissionRequiredToScan": "Please grant camera permission to scan the QR code", "cameraPermissionPermanentlyDenied": "Please allow camera permission from the app settings > Permissions", "openSettings": "Open Settings", diff --git a/lib/ui/mazaya/retailers_list_screen.dart b/lib/ui/mazaya/retailers_list_screen.dart index e39f9b85..38d5e921 100644 --- a/lib/ui/mazaya/retailers_list_screen.dart +++ b/lib/ui/mazaya/retailers_list_screen.dart @@ -2119,24 +2119,24 @@ class WalaPlusRetailerCard extends StatelessWidget { ), ), ), - if (item.isExclusive == true) - PositionedDirectional( - bottom: 7, - start: 8, - child: Container( - padding: const EdgeInsets.symmetric( - horizontal: 7, - vertical: 4, - ), - decoration: BoxDecoration( - color: const Color(0xFF143F36), - borderRadius: BorderRadius.circular(6), - ), - child: LocaleKeys.mazayaExclusive.tr().toText10( - color: const Color(0xFFF1EBDD), - ), - ), - ), + // if (item.isExclusive == true) + // PositionedDirectional( + // bottom: 7, + // start: 8, + // child: Container( + // padding: const EdgeInsets.symmetric( + // horizontal: 7, + // vertical: 4, + // ), + // decoration: BoxDecoration( + // color: const Color(0xFF143F36), + // borderRadius: BorderRadius.circular(6), + // ), + // child: LocaleKeys.mazayaExclusive.tr().toText10( + // color: const Color(0xFFF1EBDD), + // ), + // ), + // ), ], ), ), diff --git a/lib/ui/profile/dependent_details_screen.dart b/lib/ui/profile/dependent_details_screen.dart index 8b7d1506..74f2b8b8 100644 --- a/lib/ui/profile/dependent_details_screen.dart +++ b/lib/ui/profile/dependent_details_screen.dart @@ -333,7 +333,7 @@ class _DependentDetailsScreenState extends State { (nationalId == null || nationalId.isEmpty) ? LocaleKeys.nationalIdOrIqamaFallback.tr() : "${LocaleKeys.nationalId.tr()}: ${nationalId.replaceAll('-', '')}"; - return "$linkToShare\n\n${LocaleKeys.mazayaInviteInstructions.tr()}\n\n$nationalIdLine\n${LocaleKeys.dateOfBirth.tr()}: ${_formatDobForShare()}"; + return "$linkToShare\n\n${LocaleKeys.mazayaInviteInstructions.tr()}"; } // Shares the invite text together with the language-appropriate steps PDF from assets. diff --git a/lib/ui/profile/mazaya_access_result_screen.dart b/lib/ui/profile/mazaya_access_result_screen.dart index dfb1ad1b..11058a42 100644 --- a/lib/ui/profile/mazaya_access_result_screen.dart +++ b/lib/ui/profile/mazaya_access_result_screen.dart @@ -470,7 +470,7 @@ class MazayaAccessResultScreen extends StatelessWidget { // carry identical content, so this is the single source of truth for it. String _buildMazayaInviteMessage(String linkToShare, String nationalId, String dateOfBirth) { String nationalIdLine = nationalId.trim().isEmpty ? LocaleKeys.nationalIdOrIqamaFallback.tr() : "${LocaleKeys.nationalId.tr()}: ${nationalId.replaceAll('-', '')}"; - return "$linkToShare\n\n${LocaleKeys.mazayaInviteInstructions.tr()}\n\n$nationalIdLine\n${LocaleKeys.dateOfBirth.tr()}: ${_formatDob(dateOfBirth)}"; + return "$linkToShare\n\n${LocaleKeys.mazayaInviteInstructions.tr()}"; } // Text-only share (the invite message + link). Kept separate from the guide share below From 150f4bf3c7f5ed1bfe9c949ff93fd8987a0ef228 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Wed, 11 Nov 2026 17:22:48 +0300 Subject: [PATCH 2/2] Share link content update --- lib/ui/profile/dependent_details_screen.dart | 6 ++++-- lib/ui/profile/mazaya_access_result_screen.dart | 9 ++++++--- pubspec.yaml | 4 ++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/lib/ui/profile/dependent_details_screen.dart b/lib/ui/profile/dependent_details_screen.dart index 74f2b8b8..3c5733a6 100644 --- a/lib/ui/profile/dependent_details_screen.dart +++ b/lib/ui/profile/dependent_details_screen.dart @@ -316,6 +316,7 @@ class _DependentDetailsScreenState extends State { // Full (unmasked) DOB for the share message - distinct from _formatDob/_formatNationalId // above, which are for the masked on-screen Key Details display. String _formatDobForShare() { + return "**/**/****"; DateTime? dob = _parseBirthDate(_contact?.dATEOFBIRTH); if (dob != null) return DateFormat('dd-MM-yyyy').format(dob); String raw = _contact?.dATEOFBIRTH?.trim() ?? ""; @@ -332,8 +333,9 @@ class _DependentDetailsScreenState extends State { String nationalIdLine = (nationalId == null || nationalId.isEmpty) ? LocaleKeys.nationalIdOrIqamaFallback.tr() - : "${LocaleKeys.nationalId.tr()}: ${nationalId.replaceAll('-', '')}"; - return "$linkToShare\n\n${LocaleKeys.mazayaInviteInstructions.tr()}"; + // : "${LocaleKeys.nationalId.tr()}: ${nationalId.replaceAll('-', '')}"; + : "${LocaleKeys.nationalId.tr()}: *****"; + return "$linkToShare\n\n${LocaleKeys.mazayaInviteInstructions.tr()}\n\n$nationalIdLine\n${LocaleKeys.dateOfBirth.tr()}: ${_formatDobForShare()}"; } // Shares the invite text together with the language-appropriate steps PDF from assets. diff --git a/lib/ui/profile/mazaya_access_result_screen.dart b/lib/ui/profile/mazaya_access_result_screen.dart index 11058a42..f3af6073 100644 --- a/lib/ui/profile/mazaya_access_result_screen.dart +++ b/lib/ui/profile/mazaya_access_result_screen.dart @@ -430,6 +430,7 @@ class MazayaAccessResultScreen extends StatelessWidget { // The raw value can come in as the API's "/Date(ms+tz)/" wrapper or a plain ISO datetime string // with a time component - either way we only want the date part. String _formatDob(String raw) { + return "**/**/****"; String s = raw.trim(); if (s.isEmpty) return ""; @@ -463,14 +464,16 @@ class MazayaAccessResultScreen extends StatelessWidget { // string we couldn't otherwise parse, rather than showing it as-is with the time attached. if (s.contains('T')) return s.split('T').first.replaceAll('/', '-'); if (s.contains(' ')) return s.split(' ').first.replaceAll('/', '-'); - return s.replaceAll('/', '-'); + // return s.replaceAll('/', '-'); + // return "**/**/****"; } // Same message built for both "Share Download Link" and "Copy Link" - they must always // carry identical content, so this is the single source of truth for it. String _buildMazayaInviteMessage(String linkToShare, String nationalId, String dateOfBirth) { - String nationalIdLine = nationalId.trim().isEmpty ? LocaleKeys.nationalIdOrIqamaFallback.tr() : "${LocaleKeys.nationalId.tr()}: ${nationalId.replaceAll('-', '')}"; - return "$linkToShare\n\n${LocaleKeys.mazayaInviteInstructions.tr()}"; + // String nationalIdLine = nationalId.trim().isEmpty ? LocaleKeys.nationalIdOrIqamaFallback.tr() : "${LocaleKeys.nationalId.tr()}: ${nationalId.replaceAll('-', '')}"; + String nationalIdLine = nationalId.trim().isEmpty ? LocaleKeys.nationalIdOrIqamaFallback.tr() : "${LocaleKeys.nationalId.tr()}: *****"; + return "$linkToShare\n\n${LocaleKeys.mazayaInviteInstructions.tr()}\n\n$nationalIdLine\n${LocaleKeys.dateOfBirth.tr()}: ${_formatDob(dateOfBirth)}"; } // Text-only share (the invite message + link). Kept separate from the guide share below diff --git a/pubspec.yaml b/pubspec.yaml index 761e6c81..d1d36b3e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -17,8 +17,8 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 3.8.1+300091 -#version: 3.9.10+1 +#version: 3.8.2+300092 +version: 3.9.11+1 environment: sdk: ^3.7.0