fix: manual backup flow (#663)

* fix: manual backup flow * chore: fix format & analyze --------- Co-authored-by: Egor Komarov <egor.komarov@bf.rocks>
broxus · Dec 3, 2024 · 351a575 · 351a575
1 parent eb6c13b
commit 351a575
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 54 deletions.
diff --git a/lib/feature/profile/manage_seeds_accounts/cubit/manage_seeds_accounts_cubit.dart b/lib/feature/profile/manage_seeds_accounts/cubit/manage_seeds_accounts_cubit.dart
@@ -60,17 +60,14 @@ class ManageSeedsAccountsCubit extends Cubit<ManageSeedsAccountsState> {
         final list = seeds.seeds;
         list.sort((a, b) => a.addedAt.compareTo(b.addedAt));
         if (list.isNotEmpty && list.first.addedAt != 0) {
-          final masterPublicKey = list.last.masterKey.publicKey;
-
-          final isShowBackup = storageService.getValue<bool>(
-            StorageKey.showingManualBackupBadge(masterPublicKey.publicKey),
+          final seed = list.last;
+          final key = StorageKey.showingManualBackupBadge(
+            seed.masterKey.publicKey.publicKey,
           );
+          final isShowBackup = storageService.getValue<bool>(key);
 
-          if (isShowBackup ?? false) {
-            storageService.addValue(
-              StorageKey.showingManualBackupBadge(masterPublicKey.publicKey),
-              list.last.addType == SeedAddType.create,
-            );
+          if (isShowBackup == null) {
+            storageService.addValue(key, seed.addType == SeedAddType.create);
           }
 
           emit(

diff --git a/lib/feature/wallet/view/wallet_page_model.dart b/lib/feature/wallet/view/wallet_page_model.dart
@@ -20,15 +20,15 @@ class WalletPageModel extends ElementaryModel {
   Stream<TransportStrategy> get transportStrategy =>
       _nekotonRepository.currentTransportStream;
 
-  Future<bool?> isNewUser() async {
+  bool? isNewUser() {
     return _storageService.getValue(StorageKey.userWithNewWallet());
   }
 
-  Future<void> resetValueNewUser() async {
-    return _storageService.delete(StorageKey.userWithNewWallet());
+  void resetValueNewUser() {
+    _storageService.delete(StorageKey.userWithNewWallet());
   }
 
-  Future<bool?> isShowingBadge(KeyAccount account) async {
+  bool? isShowingBadge(KeyAccount account) {
     final masterPublicKey = _nekotonRepository.seedList
         .findSeedByAnyPublicKey(account.publicKey)
         ?.masterPublicKey;
@@ -40,15 +40,15 @@ class WalletPageModel extends ElementaryModel {
     );
   }
 
-  Future<bool?> isShowingNewTokens(KeyAccount account) async {
+  bool? isShowingNewTokens(KeyAccount account) {
     final address = account.address;
 
     return _storageService.getValue(
       StorageKey.showingNewTokensLabel(address.address),
     );
   }
 
-  Future<void> hideShowingBadge(KeyAccount account) async {
+  void hideShowingBadge(KeyAccount account) {
     final masterPublicKey = _nekotonRepository.seedList
         .findSeedByAnyPublicKey(account.publicKey)
         ?.masterPublicKey;
@@ -61,7 +61,7 @@ class WalletPageModel extends ElementaryModel {
     );
   }
 
-  Future<void> hideNewTokenLabels(KeyAccount account) async {
+  void hideNewTokenLabels(KeyAccount account) {
     final address = account.address;
 
     return _storageService.addValue(

diff --git a/lib/feature/wallet/view/wallet_page_widget.dart b/lib/feature/wallet/view/wallet_page_widget.dart
@@ -1,10 +1,8 @@
 import 'package:app/feature/wallet/view/wallet_page_wm.dart';
 import 'package:app/feature/wallet/wallet.dart';
-import 'package:app/utils/utils.dart';
 import 'package:elementary/elementary.dart';
 import 'package:elementary_helper/elementary_helper.dart';
 import 'package:flutter/material.dart';
-import 'package:nekoton_repository/nekoton_repository.dart';
 
 class WalletPageWidget extends ElementaryWidget<WalletPageWidgetModel> {
   const WalletPageWidget({
@@ -15,27 +13,27 @@ class WalletPageWidget extends ElementaryWidget<WalletPageWidgetModel> {
   @override
   Widget build(WalletPageWidgetModel wm) {
     return Scaffold(
-      body: TripleSourceBuilder<KeyAccount?, bool, TransportStrategy>(
-        firstSource: wm.currentAccount,
-        secondSource: wm.isShowingNewTokens,
-        thirdSource: wm.transportStrategy,
-        builder: (_, currentAccount, isShowingNewTokens, transport) {
-          return currentAccount?.let(
-                (value) => StateNotifierBuilder(
-                  listenableState: wm.isShowingBadge,
-                  builder: (_, isShowingBadge) => WalletView(
-                    key: ValueKey(value),
-                    currentAccount: value,
-                    scrollController: wm.scrollController,
-                    isShowingBadge: isShowingBadge ?? false,
-                    isShowingNewTokens: isShowingNewTokens ?? false,
-                    finishedBackupCallback: wm.hideShowingBadge,
-                    confirmImportCallback: wm.hideNewTokensLabel,
-                    manifestUrl: transport?.manifestUrl ?? '',
-                  ),
-                ),
-              ) ??
-              const SizedBox.shrink();
+      body: StateNotifierBuilder(
+        listenableState: wm.currentAccount,
+        builder: (_, account) {
+          if (account == null) return const SizedBox.shrink();
+          return TripleSourceBuilder(
+            firstSource: wm.isShowingBadge,
+            secondSource: wm.isShowingNewTokens,
+            thirdSource: wm.transportStrategy,
+            builder: (_, isShowingBadge, isShowingNewTokens, transport) {
+              return WalletView(
+                key: ValueKey(account),
+                currentAccount: account,
+                scrollController: wm.scrollController,
+                isShowingBadge: isShowingBadge ?? false,
+                isShowingNewTokens: isShowingNewTokens ?? false,
+                finishedBackupCallback: wm.hideShowingBadge,
+                confirmImportCallback: wm.hideNewTokensLabel,
+                manifestUrl: transport?.manifestUrl ?? '',
+              );
+            },
+          );
         },
       ),
     );

diff --git a/lib/feature/wallet/view/wallet_page_wm.dart b/lib/feature/wallet/view/wallet_page_wm.dart
@@ -94,30 +94,29 @@ class WalletPageWidgetModel
     _checkBadge();
   }
 
-  Future<void> _checkBadge() async {
+  void _checkBadge() {
     //check user create new wallet or login
     final account = _currentAccount.value;
-    final isNewUser = await model.isNewUser();
-    if (isNewUser != null && account != null) {
+    final isNewUser = model.isNewUser();
+
+    if (account == null) return;
+
+    if (isNewUser != null) {
       if (isNewUser) {
         _isShowingNewTokensNotifier.accept(true);
         _isShowingBadgeNotifier.accept(true);
       } else {
         _isShowingBadgeNotifier.accept(false);
-        unawaited(model.hideShowingBadge(account));
+        model.hideShowingBadge(account);
       }
-      unawaited(model.resetValueNewUser());
+
+      model.resetValueNewUser();
       return;
     }
-    if (account != null) {
-      _isShowingBadgeNotifier.accept(
-        await model.isShowingBadge(account) ?? true,
-      );
-      _isShowingNewTokensNotifier
-          .accept(await model.isShowingNewTokens(account) ?? true);
-    } else {
-      _isShowingBadgeNotifier.accept(true);
-      _isShowingNewTokensNotifier.accept(true);
-    }
+
+    _isShowingBadgeNotifier.accept(model.isShowingBadge(account) ?? true);
+    _isShowingNewTokensNotifier.accept(
+      model.isShowingNewTokens(account) ?? true,
+    );
   }
 }