From bd67eec7771a60a90cd17d9f5687091c25f697c3 Mon Sep 17 00:00:00 2001
From: softsimon <softsimon@protonmail.com>
Date: Mon, 23 Nov 2020 11:46:04 +0700
Subject: [PATCH] correcting merge

---
 backend/src/api/websocket-handler.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/api/websocket-handler.ts b/backend/src/api/websocket-handler.ts
index b7f8b167e..76fb91583 100644
--- a/backend/src/api/websocket-handler.ts
+++ b/backend/src/api/websocket-handler.ts
@@ -126,7 +126,7 @@ class WebsocketHandler {
       'vBytesPerSecond': memPool.getVBytesPerSecond(),
       'lastDifficultyAdjustment': blocks.getLastDifficultyAdjustmentTime(),
       'blocks': _blocks,
-      'conversions': fiatConversion.getTickers()['BTCUSD'],
+      'conversions': fiatConversion.getConversionRates(),
       'mempool-blocks': mempoolBlocks.getMempoolBlocks(),
       'transactions': memPool.getLatestTransactions(),
       'git-commit': backendInfo.gitCommitHash,