Merge branch 'october'

lib/app/shared/constants/parameters.dart

@@ -1,3 +1,4 @@
+import 'package:altme/app/shared/enum/enum.dart';
 import 'package:altme/dashboard/dashboard.dart';
 
 class Parameters {
@@ -67,4 +68,9 @@ class Parameters {
   static const int maxEntries = 3;
 
   static const String appName = 'Altme';
+
+  static const DidKeyType didKeyTypeForEbsiV3 = DidKeyType.ebsiv3;
+  static const DidKeyType didKeyTypeForDefault = DidKeyType.edDSA;
+  static const DidKeyType didKeyTypeForDutch = DidKeyType.jwkP256;
+  static const DidKeyType didKeyTypeForOwfBaselineProfile = DidKeyType.jwkP256;
 }

lib/app/shared/constants/urls.dart

@@ -55,6 +55,8 @@ class Urls {
       'https://issuer.talao.co/passbase/endpoint/verifiableid/';
   static const String identityCardUrlJWTVCJSON =
       'https://talao.co/id360/oidc4vc/';
+  static const String identityCardUrlVCSDJWT =
+      'https://talao.co/id360/oidc4vc?format=vcsd-jwt&type=identitycredential';
 
   static const String over18JWTVCJSON =
       'https://talao.co/id360/oidc4vc?type=over18';

lib/app/shared/enum/type/credential_subject_type/credential_subject_type_extension.dart

@@ -645,6 +645,12 @@ extension CredentialSubjectTypeExtension on CredentialSubjectType {
         return [VCFormatType.ldpVc];
 
       case CredentialSubjectType.verifiableIdCard:
+        return [
+          VCFormatType.ldpVc,
+          VCFormatType.jwtVcJson,
+          VCFormatType.vcSdJWT,
+        ];
+
       case CredentialSubjectType.over18:
       case CredentialSubjectType.livenessCard:
       case CredentialSubjectType.emailPass:
@@ -839,8 +845,9 @@ extension CredentialSubjectTypeExtension on CredentialSubjectType {
             link = Urls.identityCardUrlJWTVCJSON;
           case VCFormatType.jwtVc:
           case VCFormatType.jwtVcJsonLd:
-          case VCFormatType.vcSdJWT:
             link = '';
+          case VCFormatType.vcSdJWT:
+            link = Urls.identityCardUrlVCSDJWT;
         }
 
         whyGetThisCard =

lib/app/shared/enum/type/profile/profile.dart

@@ -1,4 +1,3 @@
 export 'did_key_type.dart';
 export 'profile_type.dart';
-export 'subject_syntax.dart';
 export 'wallet_app_type.dart';

lib/app/shared/enum/type/profile/profile_type.dart

@@ -1,6 +1,13 @@
 import 'package:altme/l10n/l10n.dart';
 
-enum ProfileType { custom, ebsiV3, dutch, enterprise, owfBaselineProfile }
+enum ProfileType {
+  custom,
+  ebsiV3,
+  dutch,
+  enterprise,
+  owfBaselineProfile,
+  defaultOne
+}
 
 extension ProfileTypeX on ProfileType {
   String getTitle({
@@ -15,15 +22,18 @@ extension ProfileTypeX on ProfileType {
       case ProfileType.dutch:
         return l10n.decentralizedIdentityInteropProfile;
       case ProfileType.enterprise:
-        return name.isEmpty ? 'Enterprise' : name;
+        return name.isEmpty ? l10n.enterprise : name;
       case ProfileType.owfBaselineProfile:
-        return 'OWF Baseline Profile';
+        return l10n.oWFBaselineProfile;
+      case ProfileType.defaultOne:
+        return l10n.defaultProfile;
     }
   }
 
   bool get showSponseredBy {
     switch (this) {
       case ProfileType.custom:
+      case ProfileType.defaultOne:
       case ProfileType.dutch:
         return false;
       case ProfileType.ebsiV3:

lib/app/shared/widget/wallet_logo.dart

@@ -26,6 +26,7 @@ class WalletLogo extends StatelessWidget {
     switch (profileModel.profileType) {
       case ProfileType.custom:
       case ProfileType.dutch:
+      case ProfileType.defaultOne:
         image = flavorCubit.state == FlavorMode.development
             ? ImageStrings.appLogoDev
             : flavorCubit.state == FlavorMode.staging

lib/app/view/app.dart

@@ -242,10 +242,18 @@ class MaterialAppDefinition extends StatelessWidget {
       create: (context) => LangCubit(),
       child: BlocBuilder<LangCubit, Locale>(
         builder: (context, lang) {
-          context.read<LangCubit>().fetchLocale();
+          if (isStaging) {
+            final locale = DevicePreview.locale(context);
+            if (locale != null) {
+              context.read<LangCubit>().setLocale(locale);
+            }
+          } else {
+            context.read<LangCubit>().fetchLocale();
+          }
+
           return MaterialApp(
             builder: isStaging ? DevicePreview.appBuilder : null,
-            locale: isStaging ? DevicePreview.locale(context) : lang,
+            locale: lang,
             title: 'AltMe',
             darkTheme: AppTheme.darkThemeData,
             navigatorObservers: [MyRouteObserver(context)],

lib/chat_room/cubit/chat_room_cubit.dart

@@ -273,8 +273,10 @@ abstract class ChatRoomCubit extends Cubit<ChatRoomState> {
         privateKey: jsonDecode(p256KeyForWallet) as Map<String, dynamic>,
         did: '', // just added as it is required field
         mediaType: MediaType.basic, // just added as it is required field
-        useJWKThumbPrint: true, // just added as it is required field
+        clientType:
+            ClientType.jwkThumbprint, // just added as it is required field
         proofHeaderType: customOidc4vcProfile.proofHeader,
+        clientId: customOidc4vcProfile.clientId ?? '',
       );
 
       final helpCenterOptions =

lib/credentials/cubit/credentials_cubit.dart

@@ -632,7 +632,8 @@ class CredentialsCubit extends Cubit<CredentialsState> {
               final displayVerifiableId = vcFormatType == VCFormatType.ldpVc &&
                   discoverCardsOptions.displayVerifiableId;
               final displayVerifiableIdJwt =
-                  vcFormatType == VCFormatType.jwtVcJson &&
+                  (vcFormatType == VCFormatType.jwtVcJson ||
+                          vcFormatType == VCFormatType.vcSdJWT) &&
                       discoverCardsOptions.displayVerifiableIdJwt;
 
               if (displayVerifiableId || displayVerifiableIdJwt) {

lib/dashboard/drawer/ssi/oidc4vc_settngs/view/oidc4vc_settings_menu.dart

@@ -42,11 +42,11 @@ class Oidc4vcSettingMenuView extends StatelessWidget {
           const SecurityLevelWidget(),
           const DidKeyTypeWidget(),
           const DraftTypeWidget(),
-          const SubjectSyntaxTypeWidget(),
           const CredentialManifestSupportWidget(),
           const CryptographicHolderBindingWidget(),
           const ScopeParameterWidget(),
           const ClientAuthenticationWidget(),
+          const ClientTypeWidget(),
           const ClientCredentialsWidget(),
           const VCFormatWidget(),
           const ProofHeaderWidget(),

lib/dashboard/drawer/ssi/oidc4vc_settngs/widget/client_type_widget.dart

@@ -0,0 +1,73 @@
+import 'package:altme/app/app.dart';
+import 'package:altme/dashboard/dashboard.dart';
+import 'package:altme/l10n/l10n.dart';
+import 'package:altme/theme/theme.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:oidc4vc/oidc4vc.dart';
+
+class ClientTypeWidget extends StatelessWidget {
+  const ClientTypeWidget({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final l10n = context.l10n;
+    return BlocBuilder<ProfileCubit, ProfileState>(
+      builder: (context, state) {
+        return OptionContainer(
+          title: l10n.clientTypeTitle,
+          subtitle: l10n.clientTypeSubtitle,
+          body: ListView.builder(
+            itemCount: ClientType.values.length,
+            shrinkWrap: true,
+            physics: const ScrollPhysics(),
+            padding: EdgeInsets.zero,
+            itemBuilder: (context, index) {
+              final clientType = ClientType.values[index];
+              return Column(
+                children: [
+                  if (index != 0)
+                    Padding(
+                      padding: const EdgeInsets.symmetric(horizontal: 8),
+                      child: Divider(
+                        height: 0,
+                        color: Theme.of(context).colorScheme.borderColor,
+                      ),
+                    ),
+                  ListTile(
+                    onTap: () {
+                      context.read<ProfileCubit>().updateProfileSetting(
+                            clientType: clientType,
+                          );
+                    },
+                    shape: const RoundedRectangleBorder(
+                      side: BorderSide(
+                        color: Color(0xFFDDDDEE),
+                        width: 0.5,
+                      ),
+                    ),
+                    title: Text(
+                      clientType.getTitle,
+                      style: Theme.of(context).textTheme.bodyLarge?.copyWith(
+                            color: Theme.of(context).colorScheme.onPrimary,
+                          ),
+                    ),
+                    trailing: Icon(
+                      state.model.profileSetting.selfSovereignIdentityOptions
+                                  .customOidc4vcProfile.clientType ==
+                              clientType
+                          ? Icons.radio_button_checked
+                          : Icons.radio_button_unchecked,
+                      size: Sizes.icon2x,
+                      color: Theme.of(context).colorScheme.onPrimary,
+                    ),
+                  ),
+                ],
+              );
+            },
+          ),
+        );
+      },
+    );
+  }
+}

lib/dashboard/drawer/ssi/oidc4vc_settngs/widget/widget.dart

@@ -1,5 +1,6 @@
 export 'client_authentication_widget.dart';
 export 'client_credentials_widget.dart';
+export 'client_type_widget.dart';
 export 'credential_manifest_support.dart';
 export 'cryptograhic_holder_binding.dart';
 export 'did_key_type_widget.dart';
@@ -8,5 +9,4 @@ export 'option_container.dart';
 export 'proof_header_widget.dart';
 export 'scope_parameter.dart';
 export 'security_level_widget.dart';
-export 'subject_syntax_type_widget.dart';
 export 'vc_format_widget.dart';

lib/dashboard/home/tab_bar/credentials/detail/widgets/claims_data.dart

@@ -51,9 +51,7 @@ class ClaimsData extends StatelessWidget {
       }
     }
 
-    final locale = context.read<LangCubit>().state;
-
-    final localeString = '${locale.languageCode}-${locale.countryCode}';
+    final languageCode = context.read<LangCubit>().state.languageCode;
 
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
@@ -83,7 +81,7 @@ class ClaimsData extends StatelessWidget {
           final display = displays.where((element) {
             if (element is Map<String, dynamic> &&
                 element.containsKey('locale')) {
-              if (element['locale'] == localeString) {
+              if (element['locale'].toString().contains(languageCode)) {
                 return true;
               } else if (element['locale'] == 'en-US') {
                 return true;

lib/dashboard/home/tab_bar/credentials/detail/widgets/credential_subject_data.dart

@@ -31,9 +31,7 @@ class CredentialSubjectData extends StatelessWidget {
     if (credentialSubjectData == null) return Container();
     if (credentialSubjectData is! Map<String, dynamic>) return Container();
 
-    final locale = context.read<LangCubit>().state;
-
-    final localeString = '${locale.languageCode}-${locale.countryCode}';
+    final languageCode = context.read<LangCubit>().state.languageCode;
 
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
@@ -63,7 +61,7 @@ class CredentialSubjectData extends StatelessWidget {
           final display = displays.where((element) {
             if (element is Map<String, dynamic> &&
                 element.containsKey('locale')) {
-              if (element['locale'] == localeString) {
+              if (element['locale'].toString().contains(languageCode)) {
                 return true;
               } else if (element['locale'] == 'en-US') {
                 return true;