diff --git a/assets/icons/ic_add_dependents.png b/assets/icons/ic_add_dependents.png index 5202f1f2..81fd3dd0 100644 Binary files a/assets/icons/ic_add_dependents.png and b/assets/icons/ic_add_dependents.png differ diff --git a/lib/classes/consts.dart b/lib/classes/consts.dart index da567f79..ed298155 100644 --- a/lib/classes/consts.dart +++ b/lib/classes/consts.dart @@ -96,7 +96,7 @@ class ApiConsts { // Notification Center GUIDs for OTP static String notificationCenterAppGUID = "VDZreDY5TTNmTDVudzc4aDkwU3ZqcW9OcmI0"; static String notificationCenterLoginServiceGUID = "D8BD5C76-4B50-4122-81D0-C3AA25DB08A2"; - static String notificationCenterForgotPasswordServiceGUID = "5CCCC2C9-EEA0-4207-9BE9-EE1FBBFFE8D0"; + static String notificationCenterForgotPasswordServiceGUID = "15AA0C70-8DA3-430B-8881-EAFBB508F296"; static MemberType selectedMemberType = MemberType.employee; diff --git a/lib/ui/landing/dashboard_screen_for_dependet.dart b/lib/ui/landing/dashboard_screen_for_dependet.dart index 95f92710..cdeceaf0 100644 --- a/lib/ui/landing/dashboard_screen_for_dependet.dart +++ b/lib/ui/landing/dashboard_screen_for_dependet.dart @@ -146,6 +146,10 @@ class _DashboardScreenForDependetState extends State } } + String _cleanDependentName(String name) { + return name.replaceAll(RegExp(r'\s*-\s*'), ' ').replaceAll(RegExp(r'\s+'), ' ').trim(); + } + @override void dispose() { _debounceTimer?.cancel(); @@ -518,14 +522,11 @@ class _DashboardScreenForDependetState extends State }, child: Padding( padding: const EdgeInsets.all(3), - child: Image.asset( - 'assets/icons/ic_add_dependents.png', + child: SvgPicture.asset( + 'assets/icons/ic_dependents_top.svg', width: 24, height: 24, - color: const Color(0xFF1E293B), - errorBuilder: - (context, error, stackTrace) => - SvgPicture.asset('assets/icons/ic_dependents_top.svg', width: 24, height: 24, colorFilter: const ColorFilter.mode(Color(0xFF1E293B), BlendMode.srcIn)), + colorFilter: const ColorFilter.mode(Color(0xFF1E293B), BlendMode.srcIn), ), ), ), @@ -577,7 +578,7 @@ class _DashboardScreenForDependetState extends State // on the last-login screen, shown for dependent logins only. if (ApiConsts.isDependetLogin && (AppState().dependentName ?? "").isNotEmpty) ...[ LocaleKeys.welcomeBack.tr().toText12(), - AppState().dependentName!.toText24(isBold: true), + _cleanDependentName(AppState().dependentName!).toText18(isBold: true), const SizedBox(height: 16), ], diff --git a/lib/ui/login/login_screen.dart b/lib/ui/login/login_screen.dart index 9b94420e..e637e933 100644 --- a/lib/ui/login/login_screen.dart +++ b/lib/ui/login/login_screen.dart @@ -304,8 +304,9 @@ class _LoginScreenState extends State { } if (info.dependentName != null && info.dependentName!.isNotEmpty) { - AppState().setDependentName = info.dependentName; - Utils.saveStringFromPrefs("P_DEPENDENT_NAME", info.dependentName!); + String cleanedName = info.dependentName!.replaceAll(RegExp(r'\s*-\s*'), ' ').replaceAll(RegExp(r'\s+'), ' ').trim(); + AppState().setDependentName = cleanedName; + Utils.saveStringFromPrefs("P_DEPENDENT_NAME", cleanedName); } } @@ -669,8 +670,9 @@ class _LoginScreenState extends State { AppState().setWalaplusDepInfoModel = depLoginResponse!.getWalaplusDepInfoModel; String? depName = depLoginResponse.getWalaplusDepInfoModel?.pDependentName; if (depName != null && depName.trim().isNotEmpty) { - AppState().setDependentName = depName.trim(); - Utils.saveStringFromPrefs("P_DEPENDENT_NAME", depName.trim()); + String cleanedName = depName.replaceAll(RegExp(r'\s*-\s*'), ' ').replaceAll(RegExp(r'\s+'), ' ').trim(); + AppState().setDependentName = cleanedName; + Utils.saveStringFromPrefs("P_DEPENDENT_NAME", cleanedName); } } diff --git a/lib/ui/profile/dependent_details_screen.dart b/lib/ui/profile/dependent_details_screen.dart index 9cb0fa6e..ea76079e 100644 --- a/lib/ui/profile/dependent_details_screen.dart +++ b/lib/ui/profile/dependent_details_screen.dart @@ -409,7 +409,7 @@ class _DependentDetailsScreenState extends State { ), // Verified badge on right - only when NHIC has actually verified this contact - if (_isNhicVerified) ...[const SizedBox(width: 8), const Icon(Icons.verified_outlined, color: Color(0xFF059669), size: 24)], + if (_isNhicVerified) ...[const SizedBox(width: 8), const Icon(Icons.verified_rounded, color: Color(0xFF059669), size: 24)], ], ), ), diff --git a/lib/ui/profile/family_members.dart b/lib/ui/profile/family_members.dart index b41bd502..ed90415e 100644 --- a/lib/ui/profile/family_members.dart +++ b/lib/ui/profile/family_members.dart @@ -396,7 +396,7 @@ class _FamilyMembersState extends State { style: const TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Color(0xFF1E293B)), ), ), - if (_isNhicVerified(item)) ...[const SizedBox(width: 8), const Icon(Icons.verified_outlined, color: Color(0xFF059669), size: 20)], + if (_isNhicVerified(item)) ...[const SizedBox(width: 8), const Icon(Icons.verified_rounded, color: Color(0xFF059669), size: 20)], ], ), const SizedBox(height: 3),