Merge branch 'main' into CW-781-improve-logging

cake-tech · Oct 8, 2024 · 923a183 · 923a183
2 parents a7de0ee + 62f55ae
commit 923a183
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/lib/di.dart b/lib/di.dart
@@ -378,7 +378,11 @@ Future<void> setup({
   getIt.registerFactory<NewWalletTypeViewModel>(() => NewWalletTypeViewModel(_walletInfoSource));
 
   getIt.registerFactory<WalletManager>(
-    () => WalletManager(_walletInfoSource, getIt.get<SharedPreferences>()),
+    () {
+      final instance = WalletManager(_walletInfoSource, getIt.get<SharedPreferences>());
+      instance.updateWalletGroups();
+      return instance;
+    },
   );
 
   getIt.registerFactoryParam<WalletGroupsDisplayViewModel, WalletType, void>(

diff --git a/lib/src/screens/wallet/wallet_edit_page.dart b/lib/src/screens/wallet/wallet_edit_page.dart
@@ -18,7 +18,6 @@ import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 
-
 class WalletEditPage extends BasePage {
   WalletEditPage({
     required this.pageArguments,
@@ -86,8 +85,9 @@ class WalletEditPage extends BasePage {
                         child: LoadingPrimaryButton(
                           onPressed: () async {
                             if (_formKey.currentState?.validate() ?? false) {
-                              if (pageArguments.walletNewVM!
-                                  .nameExists(walletEditViewModel.newName)) {
+                              if (!pageArguments.isWalletGroup &&
+                                  pageArguments.walletNewVM!
+                                      .nameExists(walletEditViewModel.newName)) {
                                 showPopUp<void>(
                                   context: context,
                                   builder: (_) {