Resolve conflicts and add currencyDisplay

leapdao · Jul 5, 2019 · 260f9e4 · 260f9e4
1 parent 47e5144
commit 260f9e4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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}