Merge branch 'main' into TALAO

TalaoDAO · Feb 8, 2025 · 7624957 · 7624957
2 parents 98f27eb + 43f52a4
commit 7624957
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 15 deletions.
diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift
@@ -1,7 +1,7 @@
 import UIKit
 import Flutter
 
-@UIApplicationMain
+@main
 @objc class AppDelegate: FlutterAppDelegate {
   override func application(
     _ application: UIApplication,

diff --git a/lib/credentials/cubit/credentials_cubit.dart b/lib/credentials/cubit/credentials_cubit.dart
@@ -999,7 +999,7 @@ List<DiscoverDummyCredential> getDummiesFromExternalIssuerList(
       .map(
         (e) => DiscoverDummyCredential(
           credentialSubjectType: CredentialSubjectType.defaultCredential,
-          link: e.redirect,
+          link: e.url,
           image: e.background_url,
           display: Display(
             backgroundColor: e.background_color,

diff --git a/lib/dashboard/profile/cubit/profile_cubit.dart b/lib/dashboard/profile/cubit/profile_cubit.dart
@@ -131,9 +131,14 @@ class ProfileCubit extends Cubit<ProfileState> {
       }
       final oidc4VCIStackJsonString =
           await secureStorageProvider.get(SecureStorageKeys.oidc4VCIStack);
-      final oidc4VCIStack = Oidc4VCIStack.fromJson(
-        json.decode(oidc4VCIStackJsonString ?? '[]') as Map<String, dynamic>,
-      );
+      late Oidc4VCIStack oidc4VCIStack;
+      if (oidc4VCIStackJsonString == null) {
+        oidc4VCIStack = Oidc4VCIStack();
+      } else {
+        oidc4VCIStack = Oidc4VCIStack.fromJson(
+          json.decode(oidc4VCIStackJsonString) as Map<String, dynamic>,
+        );
+      }
 
       String? enterpriseWalletName;
 

diff --git a/lib/dashboard/profile/models/display_external_issuer.dart b/lib/dashboard/profile/models/display_external_issuer.dart
@@ -22,6 +22,7 @@ class DisplayExternalIssuer extends Equatable {
     this.website,
     this.why_get_this_card,
     this.title,
+    this.url,
   });
 
   factory DisplayExternalIssuer.fromJson(Map<String, dynamic> json) =>
@@ -43,6 +44,7 @@ class DisplayExternalIssuer extends Equatable {
   final String? why_get_this_card;
   final String? website;
   final String? title;
+  final String? url;
 
   Map<String, dynamic> toJson() => _$DisplayExternalIssuerToJson(this);
 
@@ -63,6 +65,7 @@ class DisplayExternalIssuer extends Equatable {
     String? why_get_this_card,
     String? website,
     String? title,
+    String? url,
   }) =>
       DisplayExternalIssuer(
         name: name ?? this.name,
@@ -81,6 +84,7 @@ class DisplayExternalIssuer extends Equatable {
         why_get_this_card: why_get_this_card ?? this.why_get_this_card,
         website: website ?? this.website,
         title: title ?? this.title,
+        url: url ?? this.url,
       );
 
   @override
@@ -101,5 +105,6 @@ class DisplayExternalIssuer extends Equatable {
         why_get_this_card,
         website,
         title,
+        url,
       ];
 }
diff --git a/lib/dashboard/profile/models/display_external_issuer.g.dart b/lib/dashboard/profile/models/display_external_issuer.g.dart
diff --git a/lib/scan/cubit/scan_cubit.dart b/lib/scan/cubit/scan_cubit.dart
@@ -561,9 +561,7 @@ class ScanCubit extends Cubit<ScanState> {
         final customOidc4vcProfile = profileCubit.state.model.profileSetting
             .selfSovereignIdentityOptions.customOidc4vcProfile;
 
-        final clientId = getClientIdForPresentation(
-          uri.queryParameters['client_id'],
-        );
+        final clientId = uri.queryParameters['client_id'];
 
         final didKeyType = customOidc4vcProfile.defaultDid;
 
@@ -861,9 +859,7 @@ class ScanCubit extends Cubit<ScanState> {
     final customOidc4vcProfile = profileCubit.state.model.profileSetting
         .selfSovereignIdentityOptions.customOidc4vcProfile;
 
-    final clientId = getClientIdForPresentation(
-      uri.queryParameters['client_id'],
-    );
+    final clientId = uri.queryParameters['client_id'];
 
     if (formatFromPresentationSubmission == VCFormatType.vcSdJWT) {
       final credentialListJwt = getStringCredentialsForToken(
@@ -874,7 +870,7 @@ class ScanCubit extends Cubit<ScanState> {
       if (credentialListJwt.length == 1) {
         return credentialListJwt.first;
       } else {
-        return credentialListJwt.toString();
+        return jsonEncode(credentialListJwt);
       }
     } else if (formatFromPresentationSubmission == VCFormatType.jwtVc ||
         formatFromPresentationSubmission == VCFormatType.jwtVcJson ||

diff --git a/lib/splash/view/splash_page.dart b/lib/splash/view/splash_page.dart
@@ -5,7 +5,6 @@ import 'package:altme/connection_bridge/connection_bridge.dart';
 import 'package:altme/dashboard/dashboard.dart';
 import 'package:altme/deep_link/deep_link.dart';
 import 'package:altme/enterprise/enterprise.dart';
-import 'package:altme/l10n/l10n.dart';
 import 'package:altme/splash/splash.dart';
 import 'package:app_links/app_links.dart';
 import 'package:flutter/material.dart';
@@ -68,7 +67,6 @@ class _SplashViewState extends State<SplashView> {
   String? _deeplink;
 
   Future<void> processIncomingUri(Uri? uri) async {
-    final l10n = context.l10n;
     String beaconData = '';
     bool isBeaconRequest = false;
 

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: altme
 description: AltMe Flutter App
 
-version: 2.20.5+5607
+version: 2.20.7+5609
 
 publish_to: "none" # Remove this line if you wish to publish to pub.dev
 environment: