dev mod is not working well #2823

TalaoDAO · Jul 31, 2024 · eb0eae1 · eb0eae1
1 parent 309e700
commit eb0eae1
Show file tree

Hide file tree

Showing 3 changed files with 108 additions and 113 deletions.
diff --git a/lib/dashboard/home/tab_bar/credentials/models/credential/credential.dart b/lib/dashboard/home/tab_bar/credentials/models/credential/credential.dart
@@ -59,7 +59,7 @@ class Credential {
   final String issuer;
   @JsonKey(fromJson: _fromJsonTranslations)
   final List<Translation> description;
-  @JsonKey(defaultValue: <Translation>[])
+  @JsonKey(defaultValue: <Translation>[], fromJson: _fromJsonTranslations)
   final List<Translation> name;
   @JsonKey(defaultValue: '')
   final String expirationDate;
@@ -126,6 +126,9 @@ class Credential {
           .map((dynamic e) => Translation.fromJson(e as Map<String, dynamic>))
           .toList();
     }
+    if (json is String) {
+      return [Translation('en', json)];
+    }
     return [Translation.fromJson(json as Map<String, dynamic>)];
   }
 

diff --git a/lib/dashboard/home/tab_bar/credentials/widgets/display_name_card.dart b/lib/dashboard/home/tab_bar/credentials/widgets/display_name_card.dart
@@ -23,15 +23,15 @@ class DisplayNameCard extends StatelessWidget {
   }
 
   String getName(BuildContext context) {
-    var nameValue = GetTranslation.getTranslation(
-      credentialModel.credentialPreview.name,
-      context.l10n,
-    );
+    var nameValue = credentialModel.display?.name ?? '';
     if (nameValue == '') {
-      nameValue = credentialModel.display?.name ?? '';
+      nameValue = credentialModel.credentialPreview.type.last;
     }
     if (nameValue == '') {
-      nameValue = credentialModel.credentialPreview.type.last;
+      nameValue = GetTranslation.getTranslation(
+        credentialModel.credentialPreview.name,
+        context.l10n,
+      );
     }
 
     return nameValue;