diff --git a/app/lib/common/asset_utils.js b/app/lib/common/asset_utils.js index 9a6b622fe9..57ee833725 100644 --- a/app/lib/common/asset_utils.js +++ b/app/lib/common/asset_utils.js @@ -107,27 +107,19 @@ export default class AssetUtils { * - Settlement Price: feed price * force settlement offset factor * */ - if (!!asset.bitasset) { - return asset.bitasset.current_feed.settlement_price; - } - if (!!asset.current_feed) { - return asset.current_feed.settlement_price; - } - if (!!asset.settlement_price) { - return asset.settlement_price; - } + let ret; + if (!!asset.get("bitasset")) { - return asset.getIn([ - "bitasset", - "current_feed", - "settlement_price" - ]); + asset = asset.get("bitasset"); } - if (!!asset.get("settlement_price")) { - return asset.getIn(["settlement_price"]); + if (!!asset.get("individual_settlement_debt")) { + ret = asset.get("median_feed").get("settlement_price"); + } else { + ret = asset.get("current_feed").get("settlement_price"); } - if (!!asset.get("current_feed")) { - return asset.getIn(["current_feed", "settlement_price"]); + + if (!!ret) { + return ret; } throw "Feed price not found!"; }