From 2c0b47edf2ba79d47c11a5fe11ca322eed0f1438 Mon Sep 17 00:00:00 2001
From: Alex Liebowitz <alex@alexliebowitz.com>
Date: Thu, 23 Feb 2017 03:17:12 -0500
Subject: [PATCH] On load screen, always show Cancel link if a previous page is
 available

Before, it was only showing if a load attempt timed out, and would show
even if there was no previous page to go back to.
---
 CHANGELOG.md                | 2 +-
 js/component/load_screen.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ccf9c3afd..22cc03a52 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,7 +18,7 @@ Web UI version numbers should always match the corresponding version of LBRY App
   *
 
 ### Fixed
-  *
+  * On load screen, always show Cancel link if a previous page is available
   *
   *
 
diff --git a/js/component/load_screen.js b/js/component/load_screen.js
index d8dedbe3d..ad013030c 100644
--- a/js/component/load_screen.js
+++ b/js/component/load_screen.js
@@ -34,7 +34,7 @@ var LoadScreen = React.createClass({
             <BusyMessage message={this.props.message} />
           </h3>
           {this.props.isWarning ? <Icon icon="icon-warning" /> : null} <span className={'load-screen__details ' + (this.props.isWarning ? 'load-screen__details--warning' : '')}>{this.props.details}</span>
-          {this.props.isWarning
+          {window.history.length > 1
             ? <div><Link label="Cancel" onClick={this.handleCancelClick} className='load-screen__cancel-link button-text' /></div>
             : null}
         </div>