From 5f2193b2c5658cc6d6007b1bf6539cef9182e542 Mon Sep 17 00:00:00 2001 From: Michal Iskierko Date: Fri, 5 Apr 2024 16:09:53 +0200 Subject: [PATCH] fix(@desktop/communitytokens): fix converting json to dto Fix #14307 --- src/app_service/service/transaction/dto.nim | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/app_service/service/transaction/dto.nim b/src/app_service/service/transaction/dto.nim index fa3ea5a887..04929a277d 100644 --- a/src/app_service/service/transaction/dto.nim +++ b/src/app_service/service/transaction/dto.nim @@ -196,7 +196,8 @@ proc decodeSuggestedFeesDto*(jsonObj: JsonNode): SuggestedFeesDto = result.maxFeePerGasL = jsonObj{"maxFeePerGasL"}.getFloat result.maxFeePerGasM = jsonObj{"maxFeePerGasM"}.getFloat result.maxFeePerGasH = jsonObj{"maxFeePerGasH"}.getFloat - result.l1GasFee = jsonObj{"l1GasFee"}.getFloat + if jsonObj.hasKey("l1GasFee"): + result.l1GasFee = jsonObj{"l1GasFee"}.getFloat result.eip1559Enabled = jsonObj{"eip1559Enabled"}.getbool proc toSuggestedFeesDto*(jsonObj: JsonNode): SuggestedFeesDto = @@ -207,7 +208,8 @@ proc toSuggestedFeesDto*(jsonObj: JsonNode): SuggestedFeesDto = result.maxFeePerGasL = parseFloat(jsonObj{"maxFeePerGasLow"}.getStr) result.maxFeePerGasM = parseFloat(jsonObj{"maxFeePerGasMedium"}.getStr) result.maxFeePerGasH = parseFloat(jsonObj{"maxFeePerGasHigh"}.getStr) - result.l1GasFee = parseFloat(jsonObj{"l1GasFee"}.getStr) + if jsonObj.hasKey("l1GasFee"): + result.l1GasFee = parseFloat(jsonObj{"l1GasFee"}.getStr) result.eip1559Enabled = jsonObj{"eip1559Enabled"}.getbool proc `$`*(self: SuggestedFeesDto): string =