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(@desktop/wallet): adding derived wallet account fixed 

An issue with adding wallet account was happening only for a new user,
the reason for that was incorrectly set keystore path and keystore file couldn't
be found on the statusgo side because of that.
This commit is contained in:
Sale Djenic 2022-11-08 14:15:24 +01:00 committed by saledjenic
parent 6237d3c7c1
commit 3da62c9092
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -345,6 +345,7 @@ proc setupAccount*(self: Service, accountId, password, displayName: string): str
try: try:
let installationId = $genUUID() let installationId = $genUUID()
var accountDataJson = self.getAccountDataForAccountId(accountId, displayName) var accountDataJson = self.getAccountDataForAccountId(accountId, displayName)
self.setKeyStoreDir(accountDataJson{"key-uid"}.getStr) # must be called before `getDefaultNodeConfig`
let subaccountDataJson = self.getSubaccountDataForAccountId(accountId, displayName) let subaccountDataJson = self.getSubaccountDataForAccountId(accountId, displayName)
var settingsJson = self.getAccountSettings(accountId, installationId, displayName) var settingsJson = self.getAccountSettings(accountId, installationId, displayName)
let nodeConfigJson = self.getDefaultNodeConfig(installationId) let nodeConfigJson = self.getDefaultNodeConfig(installationId)
@ -355,7 +356,6 @@ proc setupAccount*(self: Service, accountId, password, displayName: string): str
error "error: ", procName="setupAccount", errDesription = description error "error: ", procName="setupAccount", errDesription = description
return description return description
self.setKeyStoreDir(accountDataJson{"key-uid"}.getStr)
let hashedPassword = hashString(password) let hashedPassword = hashString(password)
discard self.storeAccount(accountId, hashedPassword) discard self.storeAccount(accountId, hashedPassword)
discard self.storeDerivedAccounts(accountId, hashedPassword, PATHS) discard self.storeDerivedAccounts(accountId, hashedPassword, PATHS)

6
ui/app/AppLayouts/Wallet/popups/AddAccountModal.qml
View File

@ -96,10 +96,10 @@ StatusModal {
&& !!advancedSelection.expandableItem.mnemonicText) { && !!advancedSelection.expandableItem.mnemonicText) {
RootStore.getDerivedAddressListForMnemonic(advancedSelection.expandableItem.mnemonicText, RootStore.getDerivedAddressListForMnemonic(advancedSelection.expandableItem.mnemonicText,
advancedSelection.expandableItem.path, numOfItems, pageNumber) advancedSelection.expandableItem.path, numOfItems, pageNumber)
} else if(!!advancedSelection.expandableItem.path && !!advancedSelection.expandableItem.derivedFromAddress } else if(!!d.selectedPath && !!d.selectedAccountDerivedFromAddress
&& (d.password.length > 0)) { && (d.password.length > 0)) {
RootStore.getDerivedAddressList(d.password, advancedSelection.expandableItem.derivedFromAddress, RootStore.getDerivedAddressList(d.password, d.selectedAccountDerivedFromAddress,
advancedSelection.expandableItem.path, numOfItems, pageNumber) d.selectedPath, numOfItems, pageNumber)
} }
} }