status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(wallet): naming of first and subsequent wallet accounts 

Closes #12693
This commit is contained in:
Sale Djenic 2024-03-04 09:57:40 +01:00 committed by saledjenic
parent d12490ab18
commit cbfbce3f62
6 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/Onboarding/src/Onboarding/Accounts/AccountsService.cpp
View File

@ -256,7 +256,7 @@ QJsonArray AccountsService::prepareSubaccountJsonObject(const GeneratedMultiAcco
{"color", "#4360df"}, {"color", "#4360df"},
{"wallet", true}, {"wallet", true},
{"path", Constants::General::PathDefaultWallet.get()}, {"path", Constants::General::PathDefaultWallet.get()},
{"name", "Status account"}, {"name", "Account 1"},
{"derived-from", account.address}}, {"derived-from", account.address}},
QJsonObject{{"public-key", account.derivedAccounts.whisper.publicKey}, QJsonObject{{"public-key", account.derivedAccounts.whisper.publicKey},
{"address", account.derivedAccounts.whisper.address}, {"address", account.derivedAccounts.whisper.address},

5
src/app_service/service/accounts/service.nim
View File

@ -25,6 +25,7 @@ export dto_generated_accounts
logScope: logScope:
topics = "accounts-service" topics = "accounts-service"
const DEFAULT_WALLET_ACCOUNT_NAME = "Account 1"
const PATHS = @[PATH_WALLET_ROOT, PATH_EIP_1581, PATH_WHISPER, PATH_DEFAULT_WALLET, PATH_ENCRYPTION] const PATHS = @[PATH_WALLET_ROOT, PATH_EIP_1581, PATH_WHISPER, PATH_DEFAULT_WALLET, PATH_ENCRYPTION]
const ACCOUNT_ALREADY_EXISTS_ERROR* = "account already exists" const ACCOUNT_ALREADY_EXISTS_ERROR* = "account already exists"
const KDF_ITERATIONS* {.intdefine.} = 256_000 const KDF_ITERATIONS* {.intdefine.} = 256_000
@ -240,7 +241,7 @@ QtObject:
"colorId": DEFAULT_COLORID_FOR_DEFAULT_WALLET_ACCOUNT, "colorId": DEFAULT_COLORID_FOR_DEFAULT_WALLET_ACCOUNT,
"wallet": true, "wallet": true,
"path": PATH_DEFAULT_WALLET, "path": PATH_DEFAULT_WALLET,
"name": "Status account", "name": DEFAULT_WALLET_ACCOUNT_NAME,
"derived-from": account.address, "derived-from": account.address,
"emoji": self.defaultWalletEmoji "emoji": self.defaultWalletEmoji
}, },
@ -493,7 +494,7 @@ QtObject:
"colorId": DEFAULT_COLORID_FOR_DEFAULT_WALLET_ACCOUNT, "colorId": DEFAULT_COLORID_FOR_DEFAULT_WALLET_ACCOUNT,
"wallet": true, "wallet": true,
"path": PATH_DEFAULT_WALLET, "path": PATH_DEFAULT_WALLET,
"name": "Status account", "name": DEFAULT_WALLET_ACCOUNT_NAME,
"derived-from": address, "derived-from": address,
"emoji": self.defaultWalletEmoji, "emoji": self.defaultWalletEmoji,
}, },

2
test/ui-test/src/constants/wallet.py
View File

@ -1,7 +1,7 @@
from collections import namedtuple from collections import namedtuple
from enum import Enum from enum import Enum
DEFAULT_ACCOUNT_NAME = 'Status account' DEFAULT_ACCOUNT_NAME = 'Account 1'
account_list_item = namedtuple('AccountListItem', ['name', 'color', 'emoji']) account_list_item = namedtuple('AccountListItem', ['name', 'color', 'emoji'])

4
test/ui-test/testSuites/suite_wallet/tst_wallet_accountsManagement/test.feature
View File

@ -14,8 +14,8 @@ Feature: Status Desktop Wallet Section Wallet Account Management
And the user edits an account with "<name>" to "<new_name>" with color "#<new_color>" and emoji "<new_emoji>" And the user edits an account with "<name>" to "<new_name>" with color "#<new_color>" and emoji "<new_emoji>"
Then the account is correctly displayed with "<new_name>" and "#<new_color>" and emoji unicode "<new_emoji_unicode>" in accounts list Then the account is correctly displayed with "<new_name>" and "#<new_color>" and emoji unicode "<new_emoji_unicode>" in accounts list
Examples: Examples:
| name | new_name | new_color | new_emoji | new_emoji_unicode | | name | new_name | new_color | new_emoji | new_emoji_unicode |
| Status account | MyPrimaryAccount | 216266 | sunglasses | 1f60e | | Account 1 | MyPrimaryAccount | 216266 | sunglasses | 1f60e |
Scenario Outline: The user can add, edit and remove a watch only account Scenario Outline: The user can add, edit and remove a watch only account
When the user adds a watch only account "<address>" with "<name>" color "#<color>" and emoji "<emoji>" When the user adds a watch only account "<address>" with "<name>" color "#<color>" and emoji "<emoji>"

2
test/ui-test/testSuites/suite_wallet/tst_wallet_transactions/test.feature
View File

@ -17,7 +17,7 @@ Feature: Status Desktop Transaction
@mayfail @mayfail
Scenario Outline: The user sends a transaction Scenario Outline: The user sends a transaction
When the user sends a transaction to himself from account "Status account" of "<amount>" "<token>" on "<chain_name>" with password "qqqqqqqqqq" When the user sends a transaction to himself from account "Account 1" of "<amount>" "<token>" on "<chain_name>" with password "qqqqqqqqqq"
Then the transaction is in progress Then the transaction is in progress
Examples: Examples:

2
ui/imports/shared/popups/addaccount/states/Main.qml
View File

@ -102,7 +102,7 @@ Item {
id: accountName id: accountName
objectName: "AddAccountPopup-AccountName" objectName: "AddAccountPopup-AccountName"
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
placeholderText: qsTr("Enter an account name...") placeholderText: qsTr("Account name")
label: qsTr("Name") label: qsTr("Name")
charLimit: 20 charLimit: 20
text: root.store.addAccountModule.accountName text: root.store.addAccountModule.accountName