fix merge conflicts

7 years ago · cebbe9dd52
1 changed files with 1 additions and 4 deletions
--- a/app/routes/app/components/App.js
+++ b/app/routes/app/components/App.js
@ -45,10 +45,7 @@ class App extends Component {
      children
    } = this.props
-
+    if (!currentTicker || balance.balanceLoading) { return <LoadingBolt /> }
    if (!currentTicker || balance.balanceLoading) { 
      return <LoadingBolt />
    }
    return (
      <div>