From 36edf6caa5d64570295f0daf5496774c09c81d5a Mon Sep 17 00:00:00 2001
From: Brandon Berhent <bbedward@gmail.com>
Date: Thu, 7 Mar 2024 13:57:35 -0500
Subject: [PATCH] Change default account name

---
 lib/localization.dart                              |  2 +-
 lib/model/db/appdb.dart                            | 12 ++----------
 lib/ui/accounts/import_external_account_sheet.dart |  2 +-
 lib/util/nanoutil.dart                             |  3 +++
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/lib/localization.dart b/lib/localization.dart
index e506016..ba01ac1 100644
--- a/lib/localization.dart
+++ b/lib/localization.dart
@@ -882,7 +882,7 @@ class AppLocalization {
   }
 
   String get defaultNewAccountNameAdHoc {
-    return Intl.message("Imported Account %1",
+    return Intl.message("Imported Account",
         desc:
             "Default new account name for accounts imported with a different seed - e.g. Imported 1",
         name: 'defaultNewAccountNameAdHoc');
diff --git a/lib/model/db/appdb.dart b/lib/model/db/appdb.dart
index 6096797..984a35b 100644
--- a/lib/model/db/appdb.dart
+++ b/lib/model/db/appdb.dart
@@ -285,24 +285,16 @@ ORDER BY
   }
 
   Future<Account> addAccountWithPrivateKey(
-      {String nameBuilder, String privateKey}) async {
+      {String accountName, String privateKey}) async {
     var dbClient = await db;
     Account account;
     int newAccountId;
     await dbClient.transaction((Transaction txn) async {
-      int nextID = 1;
-      var result = await txn.rawQuery('SELECT MAX(id) AS max_id FROM Accounts');
-      if (result[0]["max_id"] != null) {
-        int maxId = result[0]["max_id"];
-        nextID = maxId + 1;
-      }
-
-      String nextName = nameBuilder.replaceAll("%1", "${nextID.toString()}");
       String address = NanoUtil.privateToAddress(privateKey);
       account = Account(
           id: 0,
           index: -1,
-          name: nextName,
+          name: accountName,
           lastAccess: 0,
           selected: false,
           address: address);
diff --git a/lib/ui/accounts/import_external_account_sheet.dart b/lib/ui/accounts/import_external_account_sheet.dart
index 64756b5..ddc01a8 100644
--- a/lib/ui/accounts/import_external_account_sheet.dart
+++ b/lib/ui/accounts/import_external_account_sheet.dart
@@ -102,7 +102,7 @@ class _ImportExternalAccountSheetState
     // Add account
     try {
       Account acct = await sl.get<DBHelper>().addAccountWithPrivateKey(
-          nameBuilder: AppLocalization.of(context).defaultNewAccountNameAdHoc,
+          accountName: AppLocalization.of(context).defaultNewAccountNameAdHoc,
           privateKey: privateKey);
       widget.accountAddedCallback(acct);
       Navigator.of(context).pop();
diff --git a/lib/util/nanoutil.dart b/lib/util/nanoutil.dart
index 2d8f582..331b4ca 100644
--- a/lib/util/nanoutil.dart
+++ b/lib/util/nanoutil.dart
@@ -8,6 +8,8 @@ import 'package:kalium_wallet_flutter/model/db/account.dart';
 import 'package:kalium_wallet_flutter/appstate_container.dart';
 import 'package:kalium_wallet_flutter/localization.dart';
 
+import '../model/vault.dart';
+
 class NanoUtil {
   static String seedToPrivate(String seed, int index) {
     return NanoKeys.seedToPrivate(seed, index);
@@ -30,6 +32,7 @@ class NanoUtil {
           index: 0,
           lastAccess: 0,
           name: AppLocalization.of(context).defaultAccountName,
+          address: NanoUtil.seedToAddress(await sl.get<Vault>().getSeed(), 0),
           selected: true);
       await sl.get<DBHelper>().saveAccount(selectedAcct);
     }