From f3c4ed7850a1647ba49870db6f2b6193436d7cf9 Mon Sep 17 00:00:00 2001
From: hawkbee1 <googandads@gmail.com>
Date: Thu, 12 Dec 2024 14:35:51 +0000
Subject: [PATCH 1/2] Infinite loop when restoring backup file #3188

---
 .../cubit/restore_credential_cubit.dart       | 49 ++++++-------------
 .../view/restore_credential_page.dart         |  4 +-
 2 files changed, 16 insertions(+), 37 deletions(-)

diff --git a/lib/dashboard/drawer/wallet_security/restore/restore_credential/cubit/restore_credential_cubit.dart b/lib/dashboard/drawer/wallet_security/restore/restore_credential/cubit/restore_credential_cubit.dart
index 5b67c368a..08d8f51e7 100644
--- a/lib/dashboard/drawer/wallet_security/restore/restore_credential/cubit/restore_credential_cubit.dart
+++ b/lib/dashboard/drawer/wallet_security/restore/restore_credential/cubit/restore_credential_cubit.dart
@@ -39,38 +39,23 @@ class RestoreCredentialCubit extends Cubit<RestoreCredentialState> {
     emit(state.copyWith(backupFilePath: filePath));
   }
 
-  Future<void> recoverWallet({
-    required bool isFromOnBoarding,
-  }) async {
+  Future<void> recoverWallet() async {
     if (state.backupFilePath == null) return;
     await Future<void>.delayed(const Duration(milliseconds: 500));
     emit(state.loading());
 
     late String stringForBackup;
 
-    if (Parameters.importAndRestoreAtOnboarding) {
-      final String? recoveryMnemonic = await secureStorageProvider
-          .get(SecureStorageKeys.recoverCredentialMnemonics);
+    final String? ssiMnemonic =
+        await secureStorageProvider.get(SecureStorageKeys.ssiMnemonic);
 
-      if (recoveryMnemonic == null) {
-        throw ResponseMessage(
-          message: ResponseString
-              .RESPONSE_STRING_SOMETHING_WENT_WRONG_TRY_AGAIN_LATER,
-        );
-      }
-      stringForBackup = recoveryMnemonic;
-    } else {
-      final String? ssiMnemonic =
-          await secureStorageProvider.get(SecureStorageKeys.ssiMnemonic);
-
-      if (ssiMnemonic == null) {
-        throw ResponseMessage(
-          message: ResponseString
-              .RESPONSE_STRING_SOMETHING_WENT_WRONG_TRY_AGAIN_LATER,
-        );
-      }
-      stringForBackup = ssiMnemonic;
+    if (ssiMnemonic == null) {
+      throw ResponseMessage(
+        message:
+            ResponseString.RESPONSE_STRING_SOMETHING_WENT_WRONG_TRY_AGAIN_LATER,
+      );
     }
+    stringForBackup = ssiMnemonic;
 
     try {
       final file = File(state.backupFilePath!);
@@ -190,16 +175,12 @@ class RestoreCredentialCubit extends Cubit<RestoreCredentialState> {
 
       await activityLogManager.saveLog(LogData(type: LogType.restoreWallet));
 
-      if (isFromOnBoarding) {
-        emit(
-          state.copyWith(
-            status: AppStatus.restoreWallet,
-            recoveredCredentialLength: credentialList.length,
-          ),
-        );
-      } else {
-        emit(state.success(recoveredCredentialLength: credentialList.length));
-      }
+      emit(
+        state.copyWith(
+          status: AppStatus.restoreWallet,
+          recoveredCredentialLength: credentialList.length,
+        ),
+      );
     } catch (e) {
       if (e is MessageHandler) {
         emit(state.error(messageHandler: e));
diff --git a/lib/dashboard/drawer/wallet_security/restore/restore_credential/view/restore_credential_page.dart b/lib/dashboard/drawer/wallet_security/restore/restore_credential/view/restore_credential_page.dart
index ca98d447e..22d6e7141 100644
--- a/lib/dashboard/drawer/wallet_security/restore/restore_credential/view/restore_credential_page.dart
+++ b/lib/dashboard/drawer/wallet_security/restore/restore_credential/view/restore_credential_page.dart
@@ -179,9 +179,7 @@ class _RestoreCredentialViewState extends State<RestoreCredentialView> {
                         ? null
                         : () => context
                             .read<RestoreCredentialCubit>()
-                            .recoverWallet(
-                              isFromOnBoarding: widget.fromOnBoarding,
-                            ),
+                            .recoverWallet(),
                     text: l10n.loadFile,
                   );
                 },

From 9a7e59c5d84476ef6f8d17a725100493eaa4cab6 Mon Sep 17 00:00:00 2001
From: hawkbee1 <googandads@gmail.com>
Date: Thu, 12 Dec 2024 14:42:58 +0000
Subject: [PATCH 2/2] version: 2.18.10+5583

---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index a77df902b..738d0b9c7 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: altme
 description: AltMe Flutter App
 
-version: 2.18.8+5581
+version: 2.18.10+5583
 
 publish_to: "none" # Remove this line if you wish to publish to pub.dev
 environment: