Merge branch 'main' into TALAO

TalaoDAO · Mar 6, 2024 · e3608b5 · e3608b5
2 parents 3ee1968 + 5ec65a0
commit e3608b5
Show file tree

Hide file tree

Showing 120 changed files with 5,440 additions and 5,998 deletions.
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -94,6 +94,12 @@
 				<category android:name="android.intent.category.BROWSABLE" />
 				<data android:scheme="wc-altme" />
 			</intent-filter>
+            <intent-filter android:autoVerify="true">
+				<action android:name="android.intent.action.VIEW" />
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+				<data android:scheme="configuration" />
+			</intent-filter>
             <intent-filter android:autoVerify="true">
 				<action android:name="android.intent.action.VIEW" />
 				<category android:name="android.intent.category.DEFAULT" />

diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
@@ -136,6 +136,16 @@
 				<string>wc-altme</string>
 			</array>
 		</dict>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLName</key>
+			<string>configuration</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>configuration</string>
+			</array>
+		</dict>
 		<dict>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>

diff --git a/lib/app/shared/constants/constants.dart b/lib/app/shared/constants/constants.dart
@@ -1,7 +1,6 @@
 export 'accentuations.dart';
 export 'altme_strings.dart';
 export 'constants_json.dart';
-export 'enterprise.dart';
 export 'icon_strings.dart';
 export 'image_strings.dart';
 export 'parameters.dart';

diff --git a/lib/app/shared/constants/enterprise.dart b/lib/app/shared/constants/enterprise.dart
diff --git a/lib/app/shared/constants/secure_storage_keys.dart b/lib/app/shared/constants/secure_storage_keys.dart
@@ -68,5 +68,8 @@ class SecureStorageKeys {
   static const String customProfileSettings = 'customProfileSettings';
   static const String enterpriseProfileSetting = 'enterpriseProfileSetting';
 
-  static const String walletProviderType = 'walletProviderType';
+  static const String enterpriseEmail = 'enterpriseEmail';
+  static const String enterprisePassword = 'enterprisePassword';
+  static const String enterpriseWalletProvider = 'enterpriseWalletProvider';
+  static const String language = 'language';
 }
diff --git a/lib/app/shared/constants/urls.dart b/lib/app/shared/constants/urls.dart
@@ -21,8 +21,6 @@ class Urls {
 
   /// email pass
   static const String emailPassUrl = 'https://issuer.talao.co/emailpass';
-  static const String emailPassUrlJWTVCJSON =
-      'https://issuer.talao.co/emailpass?format=jwt_vc_json';
 
   /// tezotopia voucher
   static const String tezotopiaVoucherUrl =
@@ -32,11 +30,8 @@ class Urls {
   static const String tezotopiaMembershipCardUrl =
       'https://issuer.talao.co/tezotopia/membershipcard/';
 
-  /// liveness
-  static const String livenessCardUrl =
-      'https://talao.co/id360/oidc4vc?format=ldp_vc&type=liveness';
-  static const String livenessCardJWTVCJSON =
-      'https://talao.co/id360/oidc4vc?format=jwt_vc_json&type=liveness';
+  /// id360 url
+  static const String id360Url = 'https://talao.co/id360/oidc4vc';
 
   /// polygon
   static const String defaultPolygonIdCardUrl =
@@ -65,52 +60,6 @@ class Urls {
   /// twitter card
   static const String twitterCardUrl = 'https://issuer.talao.co/twitter/';
 
-  /// verifiableIdCard
-  static const String verifiableIdCardUrlLDPVC =
-      'https://talao.co/id360/oidc4vc?format=ldp_vc&type=verifiableid';
-
-  static const String verifiableIdCardUrlJWTVCJSON =
-      'https://talao.co/id360/oidc4vc?format=jwt_vc_json&type=verifiableid';
-
-  static const String verifiableIdCardUrlVCSDJWT =
-      'https://talao.co/id360/oidc4vc?format=vcsd-jwt&type=identitycredential';
-
-  /// over 13
-  static const String over13Url =
-      'https://talao.co/id360/oidc4vc?format=ldp_vc&type=over13';
-  static const String over13JWTVCJSON =
-      'https://talao.co/id360/oidc4vc?format=jwt_vc_json&type=over13';
-
-  /// over 15
-  static const String over15Url =
-      'https://talao.co/id360/oidc4vc?format=ldp_vc&type=over15';
-  static const String over15JWTVCJSON =
-      'https://talao.co/id360/oidc4vc?format=jwt_vc_json&type=over15';
-
-  /// over 18
-  static const String over18Url =
-      'https://talao.co/id360/oidc4vc?format=ldp_vc&type=over18';
-  static const String over18JWTVCJSON =
-      'https://talao.co/id360/oidc4vc?format=jwt_vc_json&type=over18';
-
-  /// over 21
-  static const String over21Url =
-      'https://talao.co/id360/oidc4vc?format=ldp_vc&type=over21';
-  static const String over21JWTVCJSON =
-      'https://talao.co/id360/oidc4vc?format=jwt_vc_json&type=over21';
-
-  /// over 50
-  static const String over50Url =
-      'https://talao.co/id360/oidc4vc?format=ldp_vc&type=over50';
-  static const String over50JWTVCJSON =
-      'https://talao.co/id360/oidc4vc?format=jwt_vc_json&type=over50';
-
-  /// over 65
-  static const String over65Url =
-      'https://talao.co/id360/oidc4vc?format=ldp_vc&type=over65';
-  static const String over65JWTVCJSON =
-      'https://talao.co/id360/oidc4vc?format=jwt_vc_json&type=over65';
-
   /// linkedin card
   static const String linkedinCardUrl =
       'https://issuer.talao.co/passbase/endpoint/linkedincard/';

diff --git a/lib/app/shared/enum/credential_category.dart b/lib/app/shared/enum/credential_category.dart
@@ -62,10 +62,10 @@ extension CredentialCategoryX on CredentialCategory {
 
   bool get showInHomeIfListEmpty {
     switch (this) {
-      case CredentialCategory.advantagesCards:
       case CredentialCategory.identityCards:
         return true;
       case CredentialCategory.professionalCards:
+      case CredentialCategory.advantagesCards:
       case CredentialCategory.contactInfoCredentials:
       case CredentialCategory.blockchainAccountsCards:
       case CredentialCategory.educationCards:
@@ -115,8 +115,8 @@ extension CredentialCategoryX on CredentialCategory {
         return CredentialCategoryConfig(
           homeTitle: '${l10n.my} ${l10n.blockchainAccounts.toLowerCase()}',
           homeSubTitle: l10n.blockchainAccountsCredentialHomeSubtitle,
-          discoverTitle: '${l10n.get} ${l10n.blockchainAccounts.toLowerCase()}',
-          discoverSubTitle: '',
+          discoverTitle: l10n.blockchainCardsDiscoverTitle,
+          discoverSubTitle: l10n.blockchainCardsDiscoverSubtitle,
         );
       case CredentialCategory.educationCards:
         return CredentialCategoryConfig(

diff --git a/lib/app/shared/enum/message/response_string/response_string.dart b/lib/app/shared/enum/message/response_string/response_string.dart
@@ -155,4 +155,7 @@ enum ResponseString {
   RESPONSE_STRING_theCredentialOfferIsInvalid,
   RESPONSE_STRING_theServiceIsNotAvailable,
   RESPONSE_STRING_theIssuanceOfThisCredentialIsPending,
+  RESPONSE_STRING_successfullyAddedEnterpriseAccount,
+  RESPONSE_STRING_successfullyUpdatedEnterpriseAccount,
+  RESPONSE_STRING_thisWalleIsAlreadyConfigured,
 }
diff --git a/lib/app/shared/enum/message/response_string/response_string_extension.dart b/lib/app/shared/enum/message/response_string/response_string_extension.dart
@@ -490,6 +490,16 @@ extension ResponseStringX on ResponseString {
       case ResponseString.RESPONSE_STRING_theIssuanceOfThisCredentialIsPending:
         return globalMessage
             .RESPONSE_STRING_theIssuanceOfThisCredentialIsPending;
+
+      case ResponseString.RESPONSE_STRING_successfullyAddedEnterpriseAccount:
+        return globalMessage.RESPONSE_STRING_successfullyAddedEnterpriseAccount;
+
+      case ResponseString.RESPONSE_STRING_successfullyUpdatedEnterpriseAccount:
+        return globalMessage
+            .RESPONSE_STRING_successfullyUpdatedEnterpriseAccount;
+
+      case ResponseString.RESPONSE_STRING_thisWalleIsAlreadyConfigured:
+        return globalMessage.RESPONSE_STRING_thisWalleIsAlreadyConfigured;
     }
   }
 }
diff --git a/lib/app/shared/enum/status/qr_scan_status.dart b/lib/app/shared/enum/status/qr_scan_status.dart
@@ -8,4 +8,5 @@ enum QrScanStatus {
   error,
   success,
   goBack,
+  pauseForDialog,
 }
diff --git a/lib/app/shared/enum/type/credential_subject_type/credential_subject_type.dart b/lib/app/shared/enum/type/credential_subject_type/credential_subject_type.dart
@@ -1,5 +1,5 @@
 import 'package:altme/app/app.dart';
-import 'package:altme/dashboard/home/home.dart';
+import 'package:altme/dashboard/dashboard.dart';
 import 'package:flutter/material.dart';
 import 'package:oidc4vc/oidc4vc.dart';