From 112830e73ba8ee7dbcdca1ca026f74c075e79052 Mon Sep 17 00:00:00 2001 From: hawkbee1 Date: Tue, 12 Mar 2024 16:25:37 +0000 Subject: [PATCH] SD-JWT: display labels with app language, or english, or first found --- .../detail/widgets/claims_data.dart | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/lib/dashboard/home/tab_bar/credentials/detail/widgets/claims_data.dart b/lib/dashboard/home/tab_bar/credentials/detail/widgets/claims_data.dart index 7e207a8a4..62bc9c572 100644 --- a/lib/dashboard/home/tab_bar/credentials/detail/widgets/claims_data.dart +++ b/lib/dashboard/home/tab_bar/credentials/detail/widgets/claims_data.dart @@ -83,18 +83,39 @@ class ClaimsData extends StatelessWidget { if (displays is! List) return Container(); if (displays.isEmpty) return Container(); - final display = displays.where((element) { + final displaySelectedLanguage = displays.where((element) { if (element is Map && element.containsKey('locale')) { if (element['locale'].toString().contains(languageCode)) { return true; - } else if (element['locale'] == 'en-US') { + } + return false; + } + return false; + }).firstOrNull; + + final displayEnglish = displays.where((element) { + if (element is Map && + element.containsKey('locale')) { + if (element['locale'].toString().contains('en')) { return true; } + return false; } return false; }).firstOrNull; + final displayFirst = displays.where((element) { + if (element is Map && + element.containsKey('locale')) { + return true; + } + return false; + }).firstOrNull; + + final display = + displaySelectedLanguage ?? displayEnglish ?? displayFirst; + if (display == null) return Container(); if (credentialSubjectData.isNotEmpty &&