From 260f9e4ea3dfbcf18fc80bcc24a8d7be1363a503 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= <tim.daubenschuetz@gmail.com>
Date: Fri, 5 Jul 2019 14:33:02 +0200
Subject: [PATCH] Resolve conflicts and add currencyDisplay

---
 src/App.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/App.js b/src/App.js
index 12e1dae2c..9c67b05fd 100644
--- a/src/App.js
+++ b/src/App.js
@@ -938,8 +938,8 @@ export default class App extends Component {
                               selected={selected}
                               text={"ETH"}
                               amount={parseFloat(this.state.ethBalance) * parseFloat(this.state.ethprice)}
-                              address={account}
-                              dollarDisplay={dollarDisplay} />
+                              currencyDisplay={this.currencyDisplay}
+                              address={account} />
                           </div>
                           <Bity
                             address={this.state.account}