Merge branch 'main' into ALTME

TalaoDAO · Dec 12, 2024 · 4df9f61 · 4df9f61
2 parents 60f4489 + 9a7e59c
commit 4df9f61
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 38 deletions.
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
@@ -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/...board/drawer/wallet_security/restore/restore_credential/view/restore_credential_page.dart b/...board/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,
                   );
                 },

diff --git 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: