fix: Avoid double scan to get and present #2668

TalaoDAO · Jul 9, 2024 · 5b7dd05 · 5b7dd05
1 parent d1c7724
commit 5b7dd05
Show file tree

Hide file tree

Showing 21 changed files with 221 additions and 88 deletions.
diff --git a/lib/credentials/cubit/credentials_cubit.dart b/lib/credentials/cubit/credentials_cubit.dart
@@ -112,6 +112,7 @@ class CredentialsCubit extends Cubit<CredentialsState> {
 
   Future<void> addWalletCredential({
     required BlockchainType? blockchainType,
+    required QRCodeScanCubit qrCodeScanCubit,
   }) async {
     final log = getLogger('addRequiredCredentials');
 
@@ -175,6 +176,7 @@ class CredentialsCubit extends Cubit<CredentialsState> {
         credential: walletCredential,
         showMessage: false,
         blockchainType: blockchainType,
+        qrCodeScanCubit: qrCodeScanCubit,
       );
     }
   }
@@ -261,6 +263,7 @@ class CredentialsCubit extends Cubit<CredentialsState> {
   Future<void> insertCredential({
     required CredentialModel credential,
     required BlockchainType? blockchainType,
+    required QRCodeScanCubit qrCodeScanCubit,
     bool showMessage = true,
     bool showStatus = true,
     bool isPendingCredential = false,
@@ -335,6 +338,10 @@ class CredentialsCubit extends Cubit<CredentialsState> {
             : null,
       ),
     );
+
+    if (qrCodeScanCubit.missingCredentialCompleter != null) {
+      qrCodeScanCubit.missingCredentialCompleter!.complete(true);
+    }
   }
 
   void enableCredentialCategory({required CredentialCategory category}) {
@@ -503,6 +510,7 @@ class CredentialsCubit extends Cubit<CredentialsState> {
 
   Future<void> insertAssociatedWalletCredential({
     required CryptoAccountData cryptoAccountData,
+    required QRCodeScanCubit qrCodeScanCubit,
   }) async {
     final supportAssociatedCredential =
         supportCryptoCredential(profileCubit.state.model);
@@ -549,6 +557,7 @@ class CredentialsCubit extends Cubit<CredentialsState> {
       await insertCredential(
         credential: credential,
         blockchainType: cryptoAccountData.blockchainType,
+        qrCodeScanCubit: qrCodeScanCubit,
       );
     }
   }

diff --git a/lib/dashboard/ai_age_verification/verify_age/view/camera_page.dart b/lib/dashboard/ai_age_verification/verify_age/view/camera_page.dart
@@ -127,6 +127,7 @@ class _CameraViewState extends State<CameraView> {
                       .currentAccount!
                       .blockchainType,
                   vcFormatType: customOidc4vcProfile.vcFormatType,
+                  qrCodeScanCubit: context.read<QRCodeScanCubit>(),
                 );
             LoadingView().hide();
             await Navigator.pushReplacement<void, void>(

diff --git a/lib/dashboard/home/home/cubit/home_cubit.dart b/lib/dashboard/home/home/cubit/home_cubit.dart
@@ -5,6 +5,7 @@ import 'package:altme/app/app.dart';
 import 'package:altme/credentials/credentials.dart';
 import 'package:altme/dashboard/dashboard.dart';
 import 'package:altme/dashboard/home/tab_bar/credentials/models/activity/activity.dart';
+import 'package:altme/dashboard/qr_code/qr_code.dart';
 import 'package:bloc/bloc.dart';
 import 'package:credential_manifest/credential_manifest.dart';
 import 'package:crypto/crypto.dart';
@@ -44,6 +45,7 @@ class HomeCubit extends Cubit<HomeState> {
     required OIDC4VCIDraftType oidc4vciDraftType,
     required BlockchainType blockchainType,
     required VCFormatType vcFormatType,
+    required QRCodeScanCubit qrCodeScanCubit,
   }) async {
     // launch url to get Over18, Over15, Over13,Over21,Over50,Over65,
     // AgeRange Credentials
@@ -101,6 +103,7 @@ class HomeCubit extends Cubit<HomeState> {
         oidc4vciDraftType: oidc4vciDraftType,
         blockchainType: blockchainType,
         vcFormatType: vcFormatType,
+        qrCodeScanCubit: qrCodeScanCubit,
       );
 
       await ageEstimate(
@@ -160,6 +163,7 @@ class HomeCubit extends Cubit<HomeState> {
     required OIDC4VCIDraftType oidc4vciDraftType,
     required BlockchainType blockchainType,
     required VCFormatType vcFormatType,
+    required QRCodeScanCubit qrCodeScanCubit,
   }) async {
     /// if credential of this type is already in the wallet do nothing
     /// Ensure credentialType = name of credential type in CredentialModel
@@ -216,6 +220,7 @@ class HomeCubit extends Cubit<HomeState> {
           credential: credentialModel,
           showMessage: true,
           blockchainType: blockchainType,
+          qrCodeScanCubit: qrCodeScanCubit,
         );
         await cameraCubit.incrementAcquiredCredentialsQuantity();
         emit(state.copyWith(status: AppStatus.success));

diff --git a/lib/dashboard/home/tab_bar/credentials/detail/view/credentials_details_page.dart b/lib/dashboard/home/tab_bar/credentials/detail/view/credentials_details_page.dart
@@ -468,6 +468,8 @@ class _CredentialsDetailsViewState extends State<CredentialsDetailsView> {
                                   .read<QRCodeScanCubit>()
                                   .startOIDC4VCDeferedCredentialIssuance(
                                     credentialModel: widget.credentialModel,
+                                    qrCodeScanCubit:
+                                        context.read<QRCodeScanCubit>(),
                                   );
                             },
                           ),

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
@@ -15,12 +15,14 @@ Future<void> discoverCredential({
   if (dummyCredential.credentialSubjectType.isBlockchainAccount) {
     final credentialCubit = context.read<CredentialsCubit>();
     final walletCubit = context.read<WalletCubit>();
+    final qrCodeScanCubit = context.read<QRCodeScanCubit>();
 
     final cryptoAccountData = walletCubit.state.currentAccount;
 
     if (cryptoAccountData != null) {
       await credentialCubit.insertAssociatedWalletCredential(
         cryptoAccountData: cryptoAccountData,
+        qrCodeScanCubit: qrCodeScanCubit,
       );
     }
 

diff --git a/...redentials/oid4c4vc_pick/oid4c4vc_credential_pick/view/oid4c4vc_credential_pick_page.dart b/...redentials/oid4c4vc_pick/oid4c4vc_credential_pick/view/oid4c4vc_credential_pick_page.dart
@@ -199,6 +199,8 @@ class Oidc4vcCredentialPickView extends StatelessWidget {
                                 preAuthorizedCode: preAuthorizedCode,
                                 isEBSIV3: isEBSIV3,
                                 credentialOfferJson: credentialOfferJson,
+                                qrCodeScanCubit:
+                                    context.read<QRCodeScanCubit>(),
                               );
                         },
                   text: l10n.proceed,

diff --git a/...entials/polygon_id/polygon_id_credential_offer/view/polygon_id_credential_offer_view.dart b/...entials/polygon_id/polygon_id_credential_offer/view/polygon_id_credential_offer_view.dart
@@ -146,7 +146,9 @@ class PolygonIdCredentialOfferPage extends StatelessWidget {
                   context: context,
                   localAuthApi: LocalAuthApi(),
                   onSuccess: () {
-                    context.read<PolygonIdCubit>().addPolygonIdCredentials();
+                    context.read<PolygonIdCubit>().addPolygonIdCredentials(
+                          qrCodeScanCubit: context.read<QRCodeScanCubit>(),
+                        );
                   },
                 );
               },

diff --git a/lib/dashboard/home/tab_bar/credentials/receive/view/credentials_receive_page.dart b/lib/dashboard/home/tab_bar/credentials/receive/view/credentials_receive_page.dart
@@ -143,12 +143,13 @@ class _CredentialsReceivePageState extends State<CredentialsReceivePage> {
                       );
                     } else {
                       context.read<ScanCubit>().credentialOfferOrPresent(
-                        uri: widget.uri,
-                        credentialModel: credentialModel,
-                        keyId: SecureStorageKeys.ssiKey,
-                        issuer: widget.issuer,
-                        credentialsToBePresented: [],
-                      );
+                            uri: widget.uri,
+                            credentialModel: credentialModel,
+                            keyId: SecureStorageKeys.ssiKey,
+                            issuer: widget.issuer,
+                            credentialsToBePresented: [],
+                            qrCodeScanCubit: context.read<QRCodeScanCubit>(),
+                          );
                     }
                   },
                 ),

diff --git a/lib/dashboard/missing_creentials/view/missing_credentials_page.dart b/lib/dashboard/missing_creentials/view/missing_credentials_page.dart
@@ -62,7 +62,6 @@ class MissingCredentialsView extends StatelessWidget {
   Widget build(BuildContext context) {
     final l10n = context.l10n;
 
-
     return BlocBuilder<MissingCredentialsCubit, MissingCredentialsState>(
       builder: (context, state) {
         return BasePage(
@@ -123,7 +122,7 @@ class MissingCredentialsView extends StatelessWidget {
                       ),
                     );
                   }
-                  Navigator.pop(context);
+                  Navigator.pop(context, true);
                 },
                 text: l10n.getItNow,
               ),