fix: emit wallet2 event
fixes #3659 Wallet2 needs its own event otherwise they wallet1/2 mixes and as not everything is implemented in wallet2, it crashes In this particular case, the account is added into wallet1 but trigger an event intercepted by wallet2, wallet2 doesn't have the new account and crash
This commit is contained in:
parent
cdb06facdd
commit
fbda20256f
|
@ -73,10 +73,10 @@ proc init*(self: StatusWalletController) =
|
|||
self.initAccounts()
|
||||
|
||||
proc initEvents*(self: StatusWalletController) =
|
||||
self.events.on("currencyChanged") do(e: Args):
|
||||
self.events.emit("accountsUpdated", Args())
|
||||
self.events.on("wallet2_currencyChanged") do(e: Args):
|
||||
self.events.emit("wallet2_accountsUpdated", Args())
|
||||
|
||||
self.events.on("newAccountAdded") do(e: Args):
|
||||
self.events.on("wallet2_newAccountAdded") do(e: Args):
|
||||
self.calculateTotalFiatBalance()
|
||||
|
||||
proc getAccounts*(self: StatusWalletController): seq[WalletAccount] =
|
||||
|
@ -134,7 +134,7 @@ proc addNewGeneratedAccount(self: StatusWalletController, generatedAccount: Gene
|
|||
# wallet_checkRecentHistory populates the status-go db that
|
||||
# wallet_getTransfersByAddress reads from
|
||||
discard status_wallet.checkRecentHistory(self.accounts.map(account => account.address))
|
||||
self.events.emit("newAccountAdded", wallet_account.AccountArgs(account: account))
|
||||
self.events.emit("wallet2_newAccountAdded", wallet_account.AccountArgs(account: account))
|
||||
except Exception as e:
|
||||
raise newException(StatusGoException, fmt"Error adding new account: {e.msg}")
|
||||
|
||||
|
@ -216,7 +216,7 @@ proc onAsyncFetchCryptoServices*(self: StatusWalletController, response: string)
|
|||
let responseArray = response.parseJson
|
||||
if (responseArray.kind != JArray):
|
||||
info "received crypto services is not a json array"
|
||||
self.events.emit("cryptoServicesFetched", CryptoServicesArg())
|
||||
self.events.emit("wallet2_cryptoServicesFetched", CryptoServicesArg())
|
||||
return
|
||||
|
||||
self.events.emit("cryptoServicesFetched", CryptoServicesArg(services: responseArray))
|
||||
self.events.emit("wallet2_cryptoServicesFetched", CryptoServicesArg(services: responseArray))
|
Loading…
Reference in New Issue