From 013e226c66fc9de26575b5bd55acc64c45a5566e Mon Sep 17 00:00:00 2001 From: Pascal Precht <445106+PascalPrecht@users.noreply.github.com> Date: Thu, 13 Oct 2022 13:13:28 +0200 Subject: [PATCH] fix(signals_manager): ensure `savedAddresses` event has `JNull` check There's something off with the `savedAddresses` signal data, which causes it to be `JNull` instead of an empty array (`JArray`) and breaks signal decoding. Ultimately this should be fixed in status-go, but this unblocks Desktop. --- src/app/core/signals/remote_signals/messages.nim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/core/signals/remote_signals/messages.nim b/src/app/core/signals/remote_signals/messages.nim index 709b07ae93..6721774db2 100644 --- a/src/app/core/signals/remote_signals/messages.nim +++ b/src/app/core/signals/remote_signals/messages.nim @@ -120,7 +120,7 @@ proc fromEvent*(T: type MessageSignal, event: JsonNode): MessageSignal = for jsonVerificationRequest in event["event"]["verificationRequests"]: signal.verificationRequests.add(jsonVerificationRequest.toVerificationRequest()) - if event["event"]{"savedAddresses"} != nil: + if event["event"]{"savedAddresses"} != nil and event["event"]{"savedAddresses"}.kind != JNull: for jsonSavedAddress in event["event"]["savedAddresses"]: signal.savedAddresses.add(jsonSavedAddress.toSavedAddressDto())