Fix: All constraints considered #2882 and organise cred list alphabat…

…ically #2782
TalaoDAO · Sep 18, 2024 · 875ca72 · 875ca72
1 parent e3b0ece
commit 875ca72
Showing 1 changed file with 23 additions and 4 deletions.
diff --git a/...redentials/present/pick/credential_manifest/helpers/get_credentials_from_filter_list.dart b/...redentials/present/pick/credential_manifest/helpers/get_credentials_from_filter_list.dart
@@ -13,8 +13,10 @@ List<CredentialModel> getCredentialsFromFilterList({
     /// remove ldp_vp if jwt_vp is required
 
     final selectedCredential = <CredentialModel>[];
-    for (final field in filterList) {
-      for (final credential in credentialList) {
+
+    for (final credential in credentialList) {
+      fieldLoop:
+      for (final field in filterList) {
         for (final path in field.path) {
           final credentialData = createJsonByDecryptingSDValues(
             encryptedJson: credential.data,
@@ -63,12 +65,29 @@ List<CredentialModel> getCredentialsFromFilterList({
           if (searchList.isNotEmpty) {
             selectedCredential.add(credential);
           } else {
-            break;
+            break fieldLoop;
           }
         }
       }
     }
-    return selectedCredential.toSet().toList();
+
+    final credentials = selectedCredential.toSet().toList();
+
+    credentials.sort(
+      (a, b) {
+        final firstCredName = a.display?.name ??
+            a.credentialPreview.credentialSubjectModel.credentialSubjectType
+                .name;
+        final secondCredName = b.display?.name ??
+            b.credentialPreview.credentialSubjectModel.credentialSubjectType
+                .name;
+
+        return firstCredName.compareTo(secondCredName);
+      },
+    );
+
+    return credentials;
   }
+
   return credentialList;
 }