Merge pull request #3058 from TalaoDAO/tmp

Tmp
TalaoDAO · Nov 1, 2024 · 8671546 · 8671546
2 parents c5418bc + 3a2fb4b
commit 8671546
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 69 deletions.
diff --git a/lib/app/shared/helper_functions/helper_functions.dart b/lib/app/shared/helper_functions/helper_functions.dart
@@ -1883,16 +1883,20 @@ List<VCFormatType> getPresentVCDetails({
       final vpFormats = clientMetaData['vp_formats'] as Map<String, dynamic>;
 
       /// ldp_vc
-      presentLdpVc = vpFormats.containsKey('ldp_vc');
+      presentLdpVc =
+          vpFormats.containsKey('ldp_vc') || vpFormats.containsKey('ldp_vp');
 
       /// jwt_vc
-      presentJwtVc = vpFormats.containsKey('jwt_vc');
+      presentJwtVc =
+          vpFormats.containsKey('jwt_vc') || vpFormats.containsKey('jwt_vp');
 
       /// jwt_vc_json
-      presentJwtVcJson = vpFormats.containsKey('jwt_vc_json');
+      presentJwtVcJson = vpFormats.containsKey('jwt_vc_json') ||
+          vpFormats.containsKey('jwt_vp_json');
 
       /// jwt_vc_json-ld
-      presentJwtVcJsonLd = vpFormats.containsKey('jwt_vc_json-ld');
+      presentJwtVcJsonLd = vpFormats.containsKey('jwt_vc_json-ld') ||
+          vpFormats.containsKey('jwt_vp_json-ld');
 
       /// vc+sd-jwt
       presentVcSdJwt = vpFormats.containsKey('vc+sd-jwt');

diff --git a/lib/dashboard/drawer/ssi/manage_did/view/did_menu.dart b/lib/dashboard/drawer/ssi/manage_did/view/did_menu.dart
@@ -1,9 +1,7 @@
 import 'package:altme/app/app.dart';
 import 'package:altme/dashboard/dashboard.dart';
 import 'package:altme/l10n/l10n.dart';
-import 'package:altme/polygon_id/polygon_id.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
 
 class DidMenu extends StatelessWidget {
   const DidMenu({super.key});
@@ -73,32 +71,6 @@ class DidView extends StatelessWidget {
                     );
                   },
                 ),
-                // DrawerItem(
-                //   title: l10n.polygonDecentralizedID,
-                //   onTap: () async {
-                //     LoadingView().show(context: context);
-                //     try {
-                //       final polygonIdCubit = context.read<PolygonIdCubit>();
-                //       await polygonIdCubit.initialise();
-                //       LoadingView().hide();
-                //       await Navigator.of(context)
-                //           .push<void>(ManageDidPolygonIdPage.route());
-                //     } catch (e) {
-                //       LoadingView().hide();
-                //       AlertMessage.showStateMessage(
-                //         context: context,
-                //         stateMessage: StateMessage.error(
-                //           showDialog: true,
-                //           //stringMessage: e.toString(),
-                //           messageHandler: ResponseMessage(
-                //             message: ResponseString
-                //                 .RESPONSE_STRING_deviceIncompatibilityMessage,
-                //           ),
-                //         ),
-                //       );
-                //     }
-                //   },
-                // ),
                 DrawerItem(
                   title: l10n.jwkThumbprintP256Key,
                   onTap: () {

diff --git a/...b_bar/credentials/models/binance_associated_address/binance_associated_address_model.dart b/...b_bar/credentials/models/binance_associated_address/binance_associated_address_model.dart
@@ -9,15 +9,12 @@ class BinanceAssociatedAddressModel extends CredentialSubjectModel {
   BinanceAssociatedAddressModel({
     this.associatedAddress,
     this.accountName,
-    required String id,
-    required String type,
-    required Author issuedBy,
+    required String super.id,
+    required String super.type,
+    required Author super.issuedBy,
   }) : super(
-          id: id,
-          type: type,
           credentialSubjectType: CredentialSubjectType.binanceAssociatedWallet,
           credentialCategory: CredentialCategory.blockchainAccountsCards,
-          issuedBy: issuedBy,
         );
 
   factory BinanceAssociatedAddressModel.fromJson(Map<String, dynamic> json) =>

diff --git a/...bar/credentials/models/ethereum_associated_address/ethereum_associated_address_model.dart b/...bar/credentials/models/ethereum_associated_address/ethereum_associated_address_model.dart
@@ -9,15 +9,12 @@ class EthereumAssociatedAddressModel extends CredentialSubjectModel {
   EthereumAssociatedAddressModel({
     this.associatedAddress,
     this.accountName,
-    required String id,
-    required String type,
-    required Author issuedBy,
+    required String super.id,
+    required String super.type,
+    required Author super.issuedBy,
   }) : super(
-          id: id,
-          type: type,
           credentialSubjectType: CredentialSubjectType.ethereumAssociatedWallet,
           credentialCategory: CredentialCategory.blockchainAccountsCards,
-          issuedBy: issuedBy,
         );
 
   factory EthereumAssociatedAddressModel.fromJson(Map<String, dynamic> json) =>

diff --git a/...r/credentials/models/etherlink_associated_address/etherlink_associated_address_model.dart b/...r/credentials/models/etherlink_associated_address/etherlink_associated_address_model.dart
@@ -9,16 +9,13 @@ class EtherlinkAssociatedAddressModel extends CredentialSubjectModel {
   EtherlinkAssociatedAddressModel({
     this.associatedAddress,
     this.accountName,
-    required String id,
-    required String type,
-    required Author issuedBy,
+    required String super.id,
+    required String super.type,
+    required Author super.issuedBy,
   }) : super(
-          id: id,
-          type: type,
           credentialSubjectType:
               CredentialSubjectType.etherlinkAssociatedWallet,
           credentialCategory: CredentialCategory.blockchainAccountsCards,
-          issuedBy: issuedBy,
         );
 
   factory EtherlinkAssociatedAddressModel.fromJson(Map<String, dynamic> json) =>

diff --git a/...tab_bar/credentials/models/fantom_associated_address/fantom_associated_address_model.dart b/...tab_bar/credentials/models/fantom_associated_address/fantom_associated_address_model.dart
@@ -9,15 +9,12 @@ class FantomAssociatedAddressModel extends CredentialSubjectModel {
   FantomAssociatedAddressModel({
     this.associatedAddress,
     this.accountName,
-    required String id,
-    required String type,
-    required Author issuedBy,
+    required String super.id,
+    required String super.type,
+    required Author super.issuedBy,
   }) : super(
-          id: id,
-          type: type,
           credentialSubjectType: CredentialSubjectType.fantomAssociatedWallet,
           credentialCategory: CredentialCategory.blockchainAccountsCards,
-          issuedBy: issuedBy,
         );
 
   factory FantomAssociatedAddressModel.fromJson(Map<String, dynamic> json) =>

diff --git a/...b_bar/credentials/models/polygon_associated_address/polygon_associated_address_model.dart b/...b_bar/credentials/models/polygon_associated_address/polygon_associated_address_model.dart
@@ -9,15 +9,12 @@ class PolygonAssociatedAddressModel extends CredentialSubjectModel {
   PolygonAssociatedAddressModel({
     this.associatedAddress,
     this.accountName,
-    required String id,
-    required String type,
-    required Author issuedBy,
+    required String super.id,
+    required String super.type,
+    required Author super.issuedBy,
   }) : super(
-          id: id,
-          type: type,
           credentialSubjectType: CredentialSubjectType.polygonAssociatedWallet,
           credentialCategory: CredentialCategory.blockchainAccountsCards,
-          issuedBy: issuedBy,
         );
 
   factory PolygonAssociatedAddressModel.fromJson(Map<String, dynamic> json) =>

diff --git a/...e/tab_bar/credentials/models/tezos_associated_address/tezos_associated_address_model.dart b/...e/tab_bar/credentials/models/tezos_associated_address/tezos_associated_address_model.dart
@@ -9,15 +9,12 @@ class TezosAssociatedAddressModel extends CredentialSubjectModel {
   TezosAssociatedAddressModel({
     this.associatedAddress,
     this.accountName,
-    required String id,
-    required String type,
-    required Author issuedBy,
+    required String super.id,
+    required String super.type,
+    required Author super.issuedBy,
   }) : super(
-          id: id,
-          type: type,
           credentialSubjectType: CredentialSubjectType.tezosAssociatedWallet,
           credentialCategory: CredentialCategory.blockchainAccountsCards,
-          issuedBy: issuedBy,
         );
 
   factory TezosAssociatedAddressModel.fromJson(Map<String, dynamic> json) =>

diff --git a/lib/dashboard/profile/models/profile.dart b/lib/dashboard/profile/models/profile.dart
@@ -363,7 +363,7 @@ class ProfileModel extends Equatable {
               clientType: ClientType.did,
               clientId: clientId,
               clientSecret: clientSecret,
-              vcFormatType: VCFormatType.vcSdJWT,
+              vcFormatType: VCFormatType.auto,
               proofType: ProofType.jwt,
             ),
           ),