Merge pull request #2997 from TalaoDAO/october

October
TalaoDAO · Oct 25, 2024 · 5ae88ce · 5ae88ce
2 parents 27cf548 + b72d09e
commit 5ae88ce
Show file tree

Hide file tree

Showing 31 changed files with 483 additions and 256 deletions.
diff --git a/lib/app/shared/constants/constants_json.dart b/lib/app/shared/constants/constants_json.dart
@@ -303,21 +303,18 @@ abstract class ConstantsJson {
   };
 
   static const walletMetadataForIssuers = <String, dynamic>{
+    'client_name': Parameters.walletName,
+    'authorization_endpoint': Parameters.authorizationEndPoint,
+    'response_types_supported': ['vp_token', 'id_token'],
     'vp_formats_supported': {
-      'jwt_vp': {
-        'alg': ['ES256', 'ES256K', 'EdDSA'],
-      },
-      'jwt_vc': {
-        'alg': ['ES256', 'ES256K', 'EdDSA'],
+      'jwt_vc_json': {
+        'alg_values_supported': ['ES256', 'ES256K', 'EdDSA'],
       },
       'jwt_vp_json': {
-        'alg': ['ES256', 'ES256K', 'EdDSA'],
-      },
-      'jwt_vc_json': {
-        'alg': ['ES256', 'ES256K', 'EdDSA'],
+        'alg_values_supported': ['ES256', 'ES256K', 'EdDSA'],
       },
       'vc+sd-jwt': {
-        'alg': ['ES256', 'ES256K', 'EdDSA'],
+        'alg_values_supported': ['ES256', 'ES256K', 'EdDSA'],
       },
       'ldp_vp': {
         'proof_type': [
@@ -336,23 +333,15 @@ abstract class ConstantsJson {
         ],
       },
     },
-    'grant_types': ['authorization code', 'pre-authorized_code'],
-    'redirect_uris': [Parameters.authorizationEndPoint],
-    'subject_syntax_types_supported': ['did:key', 'did:jwk'],
-    'subject_syntax_types_discriminations': [
-      'did:key:jwk_jcs-pub',
-      'did:ebsi:v1',
-    ],
-    'token_endpoint_auth_method_supported': [
-      'none',
-      'client_id',
-      'client_secret_post',
-      'client_secret_basic',
-      'client_secret_jwt',
+    'client_id_schemes_supported': [
+      'did',
+      'redirect_uri',
+      'x509_san_dns',
+      'verifier_attestation'
     ],
-    'credential_offer_endpoint': ['openid-credential-offer://', 'haip://'],
-    'client_name': '${Parameters.appName} wallet',
-    'contacts': ['contact@talao.io'],
+    'request_object_signing_alg_values_supported': ['ES256', 'ES256K', 'EdDSA'],
+    'presentation_definition_uri_supported': true,
+    'contacts': ['contact@talao.io']
   };
 
   static const walletMetadataForVerifiers = <String, dynamic>{

diff --git a/lib/app/shared/constants/parameters.dart b/lib/app/shared/constants/parameters.dart
@@ -86,7 +86,7 @@ class Parameters {
 
   // 'false' for talao
   // 'true' for altme
-  static const bool importAtOnboarding = true;
+  static const bool importAndRestoreAtOnboarding = true;
 
   // false for talao
   // 'true' for altme
@@ -105,19 +105,14 @@ class Parameters {
   // true for altme
   static const bool showTezotopiaCard = true;
 
-  //'https://app.talao.co/app/download/authorize' for Talao
-  // 'https://app.altme.io/app/download/authorize' for altme
-  static const String redirectUri =
-      'https://app.altme.io/app/download/authorize';
-
   //'https://app.talao.co/app/download/callback' for Talao
   // 'https://app.altme.io/app/download/callback' for altme
   static const String authorizationEndPoint =
       'https://app.altme.io/app/download/callback';
 
-  // 'talao_wallet'for talao
-  // 'altme_wallet' for altme
-  static const String walletName = 'altme_wallet';
+  // 'Talao_wallet'for talao
+  // 'Altme_wallet' for altme
+  static const String walletName = 'Altme_wallet';
 
   // 'https://app.talao.co/wallet_issuer'for talao
   // 'https://app.altme.io/wallet_issuer' for altme

diff --git a/lib/app/shared/enum/type/restore_type.dart b/lib/app/shared/enum/type/restore_type.dart
@@ -0,0 +1 @@
+enum RestoreType { cryptoWallet, appBackup }
diff --git a/lib/app/shared/enum/type/type.dart b/lib/app/shared/enum/type/type.dart
@@ -8,6 +8,7 @@ export 'message_type/message_type.dart';
 export 'oidc4vc_type.dart';
 export 'profile/did_key_type.dart';
 export 'profile/profile.dart';
+export 'restore_type.dart';
 export 'wallet_protection_type.dart';
 export 'wallet_provider_type.dart';
 export 'wallet_route_type.dart';

diff --git a/lib/app/shared/helper_functions/helper_functions.dart b/lib/app/shared/helper_functions/helper_functions.dart
@@ -1417,7 +1417,7 @@ Future<String> getFormattedStringOIDC4VPSIOPV2({
   final data = '''
 <b>SCHEME :</b> ${getSchemeFromUrl(url)}\n
 <b>AUTHORIZATION REQUEST :</b>
-${response != null ? const JsonEncoder.withIndent('  ').convert(response) : 'None'}\n
+${response != null ? const JsonEncoder.withIndent('  ').convert(response) : Uri.decodeComponent(url)}\n
 <b>CLIENT METADATA  :</b>  
 ${clientMetaData != null ? const JsonEncoder.withIndent('  ').convert(clientMetaData) : 'None'}\n
 <b>PRESENTATION DEFINITION  :</b> 

diff --git a/lib/dashboard/drawer/help_center/help_center/view/help_center_menu.dart b/lib/dashboard/drawer/help_center/help_center/view/help_center_menu.dart
@@ -104,17 +104,23 @@ class HelpCenterView extends StatelessWidget {
             ),
           ],
           DrawerItem(
-            title: l10n.faqs,
             onTap: () {
-              Navigator.of(context).push<void>(FAQsPage.route());
+              LaunchUrl.launch('https://doc.wallet-provider.io/welcome');
             },
+            title: l10n.documentation,
           ),
-          DrawerItem(
-            onTap: () {
-              LaunchUrl.launch('https://${AltMeStrings.appContactWebsiteName}');
-            },
-            title: l10n.officialWebsite,
-          ),
+          // DrawerItem(
+          //   title: l10n.faqs,
+          //   onTap: () {
+          //     Navigator.of(context).push<void>(FAQsPage.route());
+          //   },
+          // ),
+          // DrawerItem(
+          //   onTap: () {
+          //     LaunchUrl.launch('https://${AltMeStrings.appContactWebsiteName}');
+          //   },
+          //   title: l10n.officialWebsite,
+          // ),
         ],
       ),
     );

diff --git a/lib/dashboard/drawer/src/view/drawer_page.dart b/lib/dashboard/drawer/src/view/drawer_page.dart
@@ -170,15 +170,18 @@ class DrawerView extends StatelessWidget {
                         },
                       ),
                       const SizedBox(height: Sizes.spaceSmall),
-                      DrawerCategoryItem(
-                        title: l10n.activityLog,
-                        subTitle: l10n.activityLogDescription,
-                        onClick: () {
-                          Navigator.of(context)
-                              .push<void>(ActivityLogPage.route());
-                        },
-                      ),
-                      const SizedBox(height: Sizes.spaceSmall),
+                      if (profileModel
+                          .profileSetting.settingsMenu.displayActivityLog) ...[
+                        DrawerCategoryItem(
+                          title: l10n.activityLog,
+                          subTitle: l10n.activityLogDescription,
+                          onClick: () {
+                            Navigator.of(context)
+                                .push<void>(ActivityLogPage.route());
+                          },
+                        ),
+                        const SizedBox(height: Sizes.spaceSmall),
+                      ],
                       DrawerCategoryItem(
                         title: l10n.resetWallet,
                         subTitle: l10n.resetWalletDescription,

diff --git a/...ashboard/drawer/wallet_security/backup/backup_credential/view/backup_credential_page.dart b/...ashboard/drawer/wallet_security/backup/backup_credential/view/backup_credential_page.dart
@@ -103,7 +103,7 @@ class BackupCredentialView extends StatelessWidget {
               ),
               const SizedBox(height: Sizes.spaceXLarge),
               Text(
-                Parameters.importAtOnboarding
+                Parameters.importAndRestoreAtOnboarding
                     ? l10n.saveBackupCredentialSubtitle
                     : l10n.saveBackupCredentialSubtitle2,
                 textAlign: TextAlign.center,

diff --git a/...ard/drawer/wallet_security/restore/restore_credential/cubit/restore_credential_cubit.dart b/...ard/drawer/wallet_security/restore/restore_credential/cubit/restore_credential_cubit.dart
@@ -48,7 +48,7 @@ class RestoreCredentialCubit extends Cubit<RestoreCredentialState> {
 
     late String stringForBackup;
 
-    if (Parameters.importAtOnboarding) {
+    if (Parameters.importAndRestoreAtOnboarding) {
       final String? recoveryMnemonic = await secureStorageProvider
           .get(SecureStorageKeys.recoverCredentialMnemonics);