Merge branch 'main' into main_android

TalaoDAO · Oct 12, 2023 · 32f9bb2 · 32f9bb2
2 parents 8e20660 + 2f3380c
commit 32f9bb2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/lib/app/shared/helper_functions/helper_functions.dart b/lib/app/shared/helper_functions/helper_functions.dart
@@ -509,7 +509,8 @@ Future<OIDC4VCType?> getOIDC4VCTypeForIssuance({
   if (keys.contains('issuer')) {
     /// issuance case 1
     issuer = uri.queryParameters['issuer'].toString();
-  } else if (keys.contains('credential_offer') ||
+  }
+  if (keys.contains('credential_offer') ||
       keys.contains('credential_offer_uri')) {
     ///  issuance case 2
     final dynamic credentialOfferJson = await getCredentialOfferJson(

diff --git a/lib/dashboard/qr_code/qr_code_scan/cubit/qr_code_scan_cubit.dart b/lib/dashboard/qr_code/qr_code_scan/cubit/qr_code_scan_cubit.dart
@@ -64,6 +64,7 @@ class QRCodeScanCubit extends Cubit<QRCodeScanState> {
   final OIDC4VC oidc4vc;
 
   final log = getLogger('QRCodeScanCubit');
+  late dynamic encodedData;
 
   @override
   Future<void> close() async {
@@ -213,8 +214,6 @@ class QRCodeScanCubit extends Cubit<QRCodeScanState> {
     }
   }
 
-  late dynamic encodedData;
-
   Future<void> accept({
     required Issuer issuer,
     required QRCodeScanCubit qrCodeScanCubit,

diff --git a/lib/dashboard/src/widgets/what_is_new_dialog.dart b/lib/dashboard/src/widgets/what_is_new_dialog.dart
@@ -76,6 +76,12 @@ class WhatIsNewDialog extends StatelessWidget {
                             NewContent(
                               version: versionNumber,
                               features: const [
+                                'Bug correction',
+                              ],
+                            ),
+                            const NewContent(
+                              version: '1.21.8',
+                              features: [
                                 'Developper mode',
                                 'New splash screen',
                                 'extended OIDC4VC options',

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: altme
 description: AltMe Flutter App
-version: 1.21.8+294
+version: 1.21.10+295
 
 environment:
   sdk: ">=3.1.0 <4.0.0"