account merge bug fix from upstream

This commit is contained in:
Lex Berezhny 2022-08-01 09:40:40 -04:00
parent 14037c9b2f
commit 020487b6a0

View file

@ -1431,8 +1431,8 @@ class Daemon(metaclass=JSONRPCServerType):
print("passwordless use is not implemented yet") print("passwordless use is not implemented yet")
else: else:
wallet = self.wallet_manager.get_wallet_or_default(wallet_id) wallet = self.wallet_manager.get_wallet_or_default(wallet_id)
added_accounts = wallet.merge(self.wallet_manager, password, data) added_accounts, merged_accounts = wallet.merge(self.wallet_manager, password, data)
for new_account in added_accounts: for new_account in itertools.chain(added_accounts, merged_accounts):
await new_account.maybe_migrate_certificates() await new_account.maybe_migrate_certificates()
if added_accounts and self.ledger.network.is_connected: if added_accounts and self.ledger.network.is_connected:
if blocking: if blocking: