Merge branch 'master' into ab-use-seconds-to-update-transaction-cache

CHANGELOG.md

@@ -15,7 +15,8 @@
  - [#1692](https://github.com/poanetwork/blockscout/pull/1692) - exclude decompiled smart contract from encoding
  - [#1684](https://github.com/poanetwork/blockscout/pull/1684) - Discard child block with parent_hash not matching hash of imported block
  - [#1699](https://github.com/poanetwork/blockscout/pull/1699) - use seconds as transaction cache period measure
-
+ - [#1697](https://github.com/poanetwork/blockscout/pull/1697) - fix failing in rpc if balance is empty
+ 
 ### Chore
 
 

apps/block_scout_web/lib/block_scout_web/views/api/rpc/address_view.ex

@@ -9,7 +9,7 @@ defmodule BlockScoutWeb.API.RPC.AddressView do
   end
 
   def render("balance.json", %{addresses: [address]}) do
-    RPCView.render("show.json", data: "#{address.fetched_coin_balance.value}")
+    RPCView.render("show.json", data: balance(address))
   end
 
   def render("balance.json", assigns) do
@@ -21,7 +21,7 @@ defmodule BlockScoutWeb.API.RPC.AddressView do
       Enum.map(addresses, fn address ->
         %{
           "account" => "#{address.hash}",
-          "balance" => "#{address.fetched_coin_balance.value}"
+          "balance" => balance(address)
         }
       end)
 
@@ -157,4 +157,8 @@ defmodule BlockScoutWeb.API.RPC.AddressView do
       "symbol" => token.symbol
     }
   end
+
+  defp balance(address) do
+    address.fetched_coin_balance && address.fetched_coin_balance.value && "#{address.fetched_coin_balance.value}"
+  end
 end