Allow Wallet Group Names to be the same as Wallet Names (#1730)
* fix: Issues with imaging * fix: Allow group names to be the same as wallet names * fix: Bug with wallet grouping when a wallet is minimized * fix: Bug with wallet grouping when a wallet is minimized
David Adegoke committed
Oct 8, 2024 at 01:07 UTC
62f55ae8f51d6697f658c38e541dd055b392ec41
2 files changed
+8
-4
lib/di.dart
+5
-1
@@ -378,7 +378,11 @@ Future<void> setup({
378
getIt.registerFactory<NewWalletTypeViewModel>(() => NewWalletTypeViewModel(_walletInfoSource));
379
380
getIt.registerFactory<WalletManager>(
381
- () => WalletManager(_walletInfoSource, getIt.get<SharedPreferences>()),
381
+ () {
382
+ final instance = WalletManager(_walletInfoSource, getIt.get<SharedPreferences>());
383
+ instance.updateWalletGroups();
384
+ return instance;
385
+ },
386
);
387
388
getIt.registerFactoryParam<WalletGroupsDisplayViewModel, WalletType, void>(
lib/src/screens/wallet/wallet_edit_page.dart
+3
-3
@@ -18,7 +18,6 @@ import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
18
import 'package:cake_wallet/src/screens/base_page.dart';
19
import 'package:flutter_mobx/flutter_mobx.dart';
20
21
-
21
class WalletEditPage extends BasePage {
22
WalletEditPage({
23
required this.pageArguments,
@@ -86,8 +85,9 @@ class WalletEditPage extends BasePage {
85
child: LoadingPrimaryButton(
86
onPressed: () async {
87
if (_formKey.currentState?.validate() ?? false) {
89
- if (pageArguments.walletNewVM!
90
- .nameExists(walletEditViewModel.newName)) {
88
+ if (!pageArguments.isWalletGroup &&
89
+ pageArguments.walletNewVM!
90
+ .nameExists(walletEditViewModel.newName)) {
91
showPopUp<void>(
92
context: context,
93
builder: (_) {