From 77927da284ade42b318bbe2e310d53fb01c548c4 Mon Sep 17 00:00:00 2001 From: Anthony Laibe Date: Mon, 23 Aug 2021 09:52:31 +0200 Subject: [PATCH] fix(@desktop/wallet2): Ensure app not crash when loading collectibles fails --- src/app/wallet/v2/views/collectibles.nim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/wallet/v2/views/collectibles.nim b/src/app/wallet/v2/views/collectibles.nim index 5ea5af1605..e828d7254d 100644 --- a/src/app/wallet/v2/views/collectibles.nim +++ b/src/app/wallet/v2/views/collectibles.nim @@ -88,7 +88,7 @@ QtObject: proc setCollectionsList(self: CollectiblesView, raw: string) {.slot.} = var newData: seq[OpenseaCollection] = @[] let collectionsJSON = parseJson(raw) - if collectionsJSON["result"].kind != JNull: + if not collectionsJSON{"result"}.isNil and collectionsJSON{"result"}.kind != JNull: for jsonOpenseaCollection in collectionsJSON{"result"}: let collection = jsonOpenseaCollection.toOpenseaCollection() newData.add(collection) @@ -110,7 +110,7 @@ QtObject: proc setAssetsList(self: CollectiblesView, raw: string) {.slot.} = var newData: seq[OpenseaAsset] = @[] let assetsJSON = parseJson(raw) - if assetsJSON{"assets"}{"result"}.kind != JNull: + if not assetsJSON{"assets"}{"result"}.isNil and assetsJSON{"assets"}{"result"}.kind != JNull: for jsonOpenseaAsset in assetsJSON{"assets"}{"result"}: newData.add(jsonOpenseaAsset.toOpenseaAsset())