Merge branch 'main' into TALAO

TalaoDAO · Feb 23, 2024 · 8cb997c · 8cb997c
2 parents a9ce0d1 + 2ec8671
commit 8cb997c
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 13 deletions.
diff --git a/lib/dashboard/home/tab_bar/credentials/helper_functions/discover_credential.dart b/lib/dashboard/home/tab_bar/credentials/helper_functions/discover_credential.dart
@@ -12,8 +12,8 @@ Future<void> discoverCredential({
 }) async {
   final profileCubit = context.read<ProfileCubit>();
 
-  final vcFormatType = profileCubit.state.model.profileSetting
-      .selfSovereignIdentityOptions.customOidc4vcProfile.vcFormatType;
+  final customOidc4vcProfile = profileCubit.state.model.profileSetting
+      .selfSovereignIdentityOptions.customOidc4vcProfile;
 
   final List<CredentialSubjectType> credentialSubjectTypeListForCheck = [
     CredentialSubjectType.defiCompliance,
@@ -34,9 +34,8 @@ Future<void> discoverCredential({
 
     /// here check for over18, over15, age range and over13 to take photo for
     /// AI KYC
-    if (vcFormatType == VCFormatType.ldpVc &&
+    if (customOidc4vcProfile.vcFormatType == VCFormatType.ldpVc &&
         dummyCredential.credentialSubjectType.checkForAIKYC) {
-
       /// For DefiCompliance, it is not necessary to use Yoti. Instead,
       /// we can directly proceed with Id360.
       if (dummyCredential.credentialSubjectType ==
@@ -50,6 +49,23 @@ Future<void> discoverCredential({
         return;
       }
 
+      if (profileCubit.state.model.walletType == WalletType.enterprise) {
+        final discoverCardsOptions =
+            profileCubit.state.model.profileSetting.discoverCardsOptions;
+
+        if (discoverCardsOptions != null) {
+          if (discoverCardsOptions.displayOver13 ||
+              discoverCardsOptions.displayOver15 ||
+              discoverCardsOptions.displayOver18 ||
+              discoverCardsOptions.displayOver21 ||
+              discoverCardsOptions.displayOver50 ||
+              discoverCardsOptions.displayOver65) {
+            await LaunchUrl.launch(dummyCredential.link!);
+            return;
+          }
+        }
+      }
+
       await Navigator.push<void>(
         context,
         ChooseVerificationMethodPage.route(

diff --git a/pubspec.lock b/pubspec.lock
@@ -1385,6 +1385,30 @@ packages:
       relative: true
     source: path
     version: "1.0.0+1"
+  leak_tracker:
+    dependency: transitive
+    description:
+      name: leak_tracker
+      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
+      url: "https://pub.dev"
+    source: hosted
+    version: "10.0.0"
+  leak_tracker_flutter_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_flutter_testing
+      sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
+  leak_tracker_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_testing
+      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
   linkify:
     dependency: transitive
     description:
@@ -1469,18 +1493,18 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
+      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.16"
+    version: "0.12.16+1"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
+      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.0"
+    version: "0.8.0"
   matrix:
     dependency: "direct main"
     description:
@@ -1509,10 +1533,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
+      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
       url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.11.0"
   mime:
     dependency: "direct main"
     description:
@@ -1660,10 +1684,10 @@ packages:
     dependency: "direct main"
     description:
       name: path
-      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.3"
+    version: "1.9.0"
   path_drawing:
     dependency: transitive
     description:

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: altme
 description: AltMe Flutter App
-version: 2.3.3+391
+version: 2.3.4+394
 
 environment:
   sdk: ">=3.1.0 <4.0.0"