From 0e7a46fe7ceb20c524c8aff4ae83c912e124b37d Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Mon, 13 Aug 2018 12:23:01 -0400
Subject: [PATCH 01/14] update daemon startup process

---
 package.json                                  |   2 +-
 src/renderer/component/spinner/view.jsx       |   4 +-
 .../component/splash/internal/load-screen.jsx |   2 +
 src/renderer/component/splash/view.jsx        | 104 ++++++++++--------
 src/renderer/scss/component/_spinner.scss     |   8 ++
 5 files changed, 70 insertions(+), 50 deletions(-)

diff --git a/package.json b/package.json
index dfae48926..8cede53fe 100644
--- a/package.json
+++ b/package.json
@@ -132,7 +132,7 @@
     "yarn": "^1.3"
   },
   "lbrySettings": {
-    "lbrynetDaemonVersion": "0.20.4",
+    "lbrynetDaemonVersion": "0.21.1rc1",
     "lbrynetDaemonUrlTemplate": "https://github.com/lbryio/lbry/releases/download/vDAEMONVER/lbrynet-daemon-vDAEMONVER-OSNAME.zip",
     "lbrynetDaemonDir": "static/daemon",
     "lbrynetDaemonFileName": "lbrynet-daemon"
diff --git a/src/renderer/component/spinner/view.jsx b/src/renderer/component/spinner/view.jsx
index bb44ee6f7..836971041 100644
--- a/src/renderer/component/spinner/view.jsx
+++ b/src/renderer/component/spinner/view.jsx
@@ -7,16 +7,18 @@ type Props = {
   dark?: boolean, // always a dark spinner
   light?: boolean, // always a light spinner
   theme: string,
+  type: ?string,
 };
 
 const Spinner = (props: Props) => {
-  const { dark, light, theme } = props;
+  const { dark, light, theme, type } = props;
 
   return (
     <div
       className={classnames('spinner', {
         'spinner--dark': !light && (dark || theme === LIGHT_THEME),
         'spinner--light': !dark && (light || theme === DARK_THEME),
+        'spinner--splash': type === 'splash',
       })}
     >
       <div className="rect rect1" />
diff --git a/src/renderer/component/splash/internal/load-screen.jsx b/src/renderer/component/splash/internal/load-screen.jsx
index 9aff326e4..97d141c9a 100644
--- a/src/renderer/component/splash/internal/load-screen.jsx
+++ b/src/renderer/component/splash/internal/load-screen.jsx
@@ -2,6 +2,7 @@
 import * as React from 'react';
 import Icon from 'component/common/icon';
 import * as icons from 'constants/icons';
+import Spinner from 'component/spinner';
 
 type Props = {
   message: string,
@@ -33,6 +34,7 @@ class LoadScreen extends React.PureComponent<Props> {
         )}
 
         {details && <div className="load-screen__details">{details}</div>}
+        <Spinner type="splash" />
       </div>
     );
   }
diff --git a/src/renderer/component/splash/view.jsx b/src/renderer/component/splash/view.jsx
index 504eced07..667ab8c53 100644
--- a/src/renderer/component/splash/view.jsx
+++ b/src/renderer/component/splash/view.jsx
@@ -1,3 +1,4 @@
+// @flow
 import * as React from 'react';
 import { Lbry, MODALS } from 'lbry-redux';
 import LoadScreen from './internal/load-screen';
@@ -5,10 +6,13 @@ import ModalWalletUnlock from 'modal/modalWalletUnlock';
 import ModalIncompatibleDaemon from 'modal/modalIncompatibleDaemon';
 import ModalUpgrade from 'modal/modalUpgrade';
 import ModalDownloading from 'modal/modalDownloading';
+import LoadScreen from './internal/load-screen';
 
 type Props = {
   checkDaemonVersion: () => Promise<any>,
   notifyUnlockWallet: () => Promise<any>,
+  daemonVersionMatched: boolean,
+  onReadyToLaunch: () => void,
   notification: ?{
     id: string,
   },
@@ -18,7 +22,6 @@ type State = {
   details: string,
   message: string,
   isRunning: boolean,
-  isLagging: boolean,
   launchedModal: boolean,
 };
 
@@ -30,31 +33,56 @@ export class SplashScreen extends React.PureComponent<Props, State> {
       details: __('Starting daemon'),
       message: __('Connecting'),
       isRunning: false,
-      isLagging: false,
       launchedModal: false,
     };
   }
 
+  componentDidMount() {
+    const { checkDaemonVersion } = this.props;
+
+    Lbry.connect()
+      .then(checkDaemonVersion)
+      .then(() => {
+        this.updateStatus();
+      })
+      .catch(() => {
+        this.setState({
+          message: __('Connection Failure'),
+          details: __(
+            'Try closing all LBRY processes and starting again. If this still happens, your anti-virus software or firewall may be preventing LBRY from connecting. Contact hello@lbry.io if you think this is a software bug.'
+          ),
+        });
+      });
+  }
+
   updateStatus() {
     Lbry.status().then(status => {
-      this._updateStatusCallback(status);
+      this.updateStatusCallback(status);
     });
   }
 
-  _updateStatusCallback(status) {
+  updateStatusCallback(status) {
     const { notifyUnlockWallet } = this.props;
     const { launchedModal } = this.state;
+    if (!status.wallet.is_unlocked) {
+      this.setState({
+        message: __('Unlock Wallet'),
+        details: __('Please unlock your wallet to proceed.'),
+        isRunning: true,
+      });
+    
+      if (launchedModal === false) {
+        this.setState({ launchedModal: true }, () => notifyUnlockWallet());
+      }
+      return;
+    }
 
-    const startupStatus = status.startup_status;
-    if (startupStatus.code === 'started') {
+    if (status.is_running) {
       // Wait until we are able to resolve a name before declaring
       // that we are done.
       // TODO: This is a hack, and the logic should live in the daemon
       // to give us a better sense of when we are actually started
       this.setState({
-        message: __('Testing Network'),
-        details: __('Waiting for name resolution'),
-        isLagging: false,
         isRunning: true,
       });
 
@@ -69,30 +97,28 @@ export class SplashScreen extends React.PureComponent<Props, State> {
       return;
     }
 
-    if (status.blockchain_status && status.blockchain_status.blocks_behind > 0) {
-      const format =
-        status.blockchain_status.blocks_behind == 1 ? '%s block behind' : '%s blocks behind';
+    if (status.blockchain_headers && status.blockchain_headers.download_progress < 100) {
       this.setState({
         message: __('Blockchain Sync'),
-        details: __(format, status.blockchain_status.blocks_behind),
-        isLagging: startupStatus.is_lagging,
+        details: `${__('Catching up with the blockchain')} (${
+          status.blockchain_headers.download_progress
+        }%)`,
       });
-    } else if (startupStatus.code === 'waiting_for_wallet_unlock') {
+    } else if (status.wallet && status.wallet.blocks_behind > 0) {
+      const format = status.wallet.blocks_behind === 1 ? '%s block behind' : '%s blocks behind';
       this.setState({
-        message: __('Unlock Wallet'),
-        details: __('Please unlock your wallet to proceed.'),
-        isLagging: false,
-        isRunning: true,
+        message: __('Blockchain Sync'),
+        details: __(format, status.wallet.blocks_behind),
       });
-
-      if (launchedModal === false) {
-        this.setState({ launchedModal: true }, () => notifyUnlockWallet());
-      }
-    } else {
+    } else if (
+      status.blockchain_headers &&
+      status.blockchain_headers.download_progress === 100 &&
+      status.wallet &&
+      status.wallet.blocks_behind === 0
+    ) {
       this.setState({
-        message: __('Network Loading'),
-        details: startupStatus.message + (startupStatus.is_lagging ? '' : '...'),
-        isLagging: startupStatus.is_lagging,
+        message: 'Network Loading',
+        details: 'Initializing LBRY service...',
       });
     }
     setTimeout(() => {
@@ -100,34 +126,16 @@ export class SplashScreen extends React.PureComponent<Props, State> {
     }, 500);
   }
 
-  componentDidMount() {
-    const { checkDaemonVersion } = this.props;
-
-    Lbry.connect()
-      .then(checkDaemonVersion)
-      .then(() => {
-        this.updateStatus();
-      })
-      .catch(() => {
-        this.setState({
-          isLagging: true,
-          message: __('Connection Failure'),
-          details: __(
-            'Try closing all LBRY processes and starting again. If this still happens, your anti-virus software or firewall may be preventing LBRY from connecting. Contact hello@lbry.io if you think this is a software bug.'
-          ),
-        });
-      });
-  }
-
   render() {
     const { notification } = this.props;
-    const { message, details, isLagging, isRunning } = this.state;
+    const { message, details, isRunning } = this.state;
 
     const notificationId = notification && notification.id;
 
+    // {notificationId === MODALS.WALLET_UNLOCK && <ModalWalletUnlock />}
     return (
       <React.Fragment>
-        <LoadScreen message={message} details={details} isWarning={isLagging} />
+        <LoadScreen message={message} details={details} />
         {/* Temp hack: don't show any modals on splash screen daemon is running;
             daemon doesn't let you quit during startup, so the "Quit" buttons
             in the modals won't work. */}
diff --git a/src/renderer/scss/component/_spinner.scss b/src/renderer/scss/component/_spinner.scss
index bdeda87ab..d6e4cb937 100644
--- a/src/renderer/scss/component/_spinner.scss
+++ b/src/renderer/scss/component/_spinner.scss
@@ -42,6 +42,14 @@
   }
 }
 
+.spinner--splash {
+  margin-top: $spacing-vertical;
+
+  .rect {
+    background-color: var(--color-white);
+  }
+}
+
 @keyframes sk-stretchdelay {
   0%,
   40%,
-- 
2.45.3


From 41e5277fbd60386ef13bca024dea5b4f804bb1de Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Mon, 13 Aug 2018 12:37:02 -0400
Subject: [PATCH 02/14] change copy to 'Starting up'

---
 src/renderer/component/splash/view.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/component/splash/view.jsx b/src/renderer/component/splash/view.jsx
index 667ab8c53..07c1deec6 100644
--- a/src/renderer/component/splash/view.jsx
+++ b/src/renderer/component/splash/view.jsx
@@ -30,7 +30,7 @@ export class SplashScreen extends React.PureComponent<Props, State> {
     super(props);
 
     this.state = {
-      details: __('Starting daemon'),
+      details: __('Starting up'),
       message: __('Connecting'),
       isRunning: false,
       launchedModal: false,
-- 
2.45.3


From 6dc87a9c76ba9ad75ad3ea2b28a0c69e004200f9 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Mon, 13 Aug 2018 12:38:52 -0400
Subject: [PATCH 03/14] remove session_status param from lbry.status call

---
 src/renderer/page/help/view.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/page/help/view.jsx b/src/renderer/page/help/view.jsx
index ce92cc1e3..80f72bf0c 100644
--- a/src/renderer/page/help/view.jsx
+++ b/src/renderer/page/help/view.jsx
@@ -65,7 +65,7 @@ class HelpPage extends React.PureComponent<Props, State> {
         versionInfo: info,
       });
     });
-    Lbry.status({ session_status: true }).then(info => {
+    Lbry.status().then(info => {
       this.setState({
         lbryId: info.lbry_id,
       });
-- 
2.45.3


From 1ec373aa51441d7cba2eb39a0c759f892d61496a Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Mon, 13 Aug 2018 12:53:31 -0400
Subject: [PATCH 04/14] move to installation_id

---
 src/renderer/page/help/view.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/page/help/view.jsx b/src/renderer/page/help/view.jsx
index 80f72bf0c..597d067b2 100644
--- a/src/renderer/page/help/view.jsx
+++ b/src/renderer/page/help/view.jsx
@@ -67,7 +67,7 @@ class HelpPage extends React.PureComponent<Props, State> {
     });
     Lbry.status().then(info => {
       this.setState({
-        lbryId: info.lbry_id,
+        lbryId: info.installation_id,
       });
     });
 
-- 
2.45.3


From e67f76ae878e953dd1796f69aea01b21a905a434 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Mon, 13 Aug 2018 15:57:23 -0400
Subject: [PATCH 05/14] add thumbnail label for disabled publish button

---
 CHANGELOG.md                                | 13 +++++++++++++
 src/renderer/component/publishForm/view.jsx | 12 +++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf211e387..1f31008a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 ## [Unreleased]
 
+<<<<<<< HEAD
 ### Added
  * Wallet Encryption/Decryption user flows ([#1785](https://github.com/lbryio/lbry-desktop/pull/1785))
  * Add FAQ to Publishing Area ([#1833](https://github.com/lbryio/lbry-desktop/pull/1833))
@@ -19,6 +20,18 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
  * Use router pattern for rendering file viewer ([#1544](https://github.com/lbryio/lbry-desktop/pull/1544))
  * Missing word "to" added to the Bid Help Text (#1854)
  * Updated to electron@2 ([#1858](https://github.com/lbryio/lbry-desktop/pull/1858))
+=======
+### Changed
+ * Show label when publish button is disabled while uploading thumbnail to spee.ch ([#1867](https://github.com/lbryio/lbry-desktop/pull/1867))
+
+## [0.23.1] - 2018-08-01
+
+### Fixed
+  * Fix ShapeShift integration ([#1842](https://github.com/lbryio/lbry-desktop/pull/1842))
+
+
+## [0.23.0] - 2018-07-25
+>>>>>>> add thumbnail label for disabled publish button
 
 ### Fixed
  * **Wallet -> Get Credits** page now shows correct ShapeShift status when it's avialable ([#1836](https://github.com/lbryio/lbry-desktop/issues/1836))
diff --git a/src/renderer/component/publishForm/view.jsx b/src/renderer/component/publishForm/view.jsx
index 5fa4f9a25..76a8a96ff 100644
--- a/src/renderer/component/publishForm/view.jsx
+++ b/src/renderer/component/publishForm/view.jsx
@@ -258,7 +258,14 @@ class PublishForm extends React.PureComponent<Props> {
     } = this.props;
 
     // If they are editing, they don't need a new file chosen
-    const formValidLessFile = name && !nameError && title && bid && !bidError && tosAccepted && !(uploadThumbnailStatus === THUMBNAIL_STATUSES.IN_PROGRESS);
+    const formValidLessFile =
+      name &&
+      !nameError &&
+      title &&
+      bid &&
+      !bidError &&
+      tosAccepted &&
+      !(uploadThumbnailStatus === THUMBNAIL_STATUSES.IN_PROGRESS);
     return editingURI && !filePath ? isStillEditing && formValidLessFile : formValidLessFile;
   }
 
@@ -291,6 +298,9 @@ class PublishForm extends React.PureComponent<Props> {
           {uploadThumbnailStatus === THUMBNAIL_STATUSES.IN_PROGRESS
           && <div>{__('Please wait for thumbnail to finish uploading')}</div>}
           {!tosAccepted && <div>{__('You must agree to the terms of service')}</div>}
+          {uploadThumbnailStatus === THUMBNAIL_STATUSES.IN_PROGRESS && (
+            <div>{__('Please wait for thumbnail to finish uploading')}</div>
+          )}
           {!!editingURI &&
             !isStillEditing &&
             !filePath && <div>{__('You need to reselect a file after changing the LBRY URL')}</div>}
-- 
2.45.3


From a8092cec0ab0df5857592cfab645c4cc10f2545b Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Mon, 13 Aug 2018 15:59:53 -0400
Subject: [PATCH 06/14] don't show editing on new publishes

---
 CHANGELOG.md | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f31008a7..631212d5d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 ## [Unreleased]
 
-<<<<<<< HEAD
+### Fixed
+
 ### Added
  * Wallet Encryption/Decryption user flows ([#1785](https://github.com/lbryio/lbry-desktop/pull/1785))
  * Add FAQ to Publishing Area ([#1833](https://github.com/lbryio/lbry-desktop/pull/1833))
@@ -20,9 +21,17 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
  * Use router pattern for rendering file viewer ([#1544](https://github.com/lbryio/lbry-desktop/pull/1544))
  * Missing word "to" added to the Bid Help Text (#1854)
  * Updated to electron@2 ([#1858](https://github.com/lbryio/lbry-desktop/pull/1858))
-=======
+
+## [0.24.0] - 2018-08-14
+
+### Fixed
+ * Issue where publish page would show "Editing" on a new publish ([#1864](https://github.com/lbryio/lbry-desktop/pull/1864))
+ 
+### Added
+ * Upgraded to LBRY daemon@0.21.1 ([v0.21.1](https://github.com/lbryio/lbry/releases/tag/v0.21.1))
+ 
 ### Changed
- * Show label when publish button is disabled while uploading thumbnail to spee.ch ([#1867](https://github.com/lbryio/lbry-desktop/pull/1867))
+* Show label when publish button is disabled while uploading thumbnail to spee.ch ([#1867](https://github.com/lbryio/lbry-desktop/pull/1867))
 
 ## [0.23.1] - 2018-08-01
 
-- 
2.45.3


From 938fa70ac3a8bcdc80710db5841dea0084ea001e Mon Sep 17 00:00:00 2001
From: Thomas Zarebczan <thomas.zarebczan@gmail.com>
Date: Mon, 13 Aug 2018 16:01:33 -0400
Subject: [PATCH 07/14] rc bump + loading message Show initializing message
 after blockchain headers download status disappears

---
 package.json                           | 2 +-
 src/renderer/component/splash/view.jsx | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 8cede53fe..617e14888 100644
--- a/package.json
+++ b/package.json
@@ -132,7 +132,7 @@
     "yarn": "^1.3"
   },
   "lbrySettings": {
-    "lbrynetDaemonVersion": "0.21.1rc1",
+    "lbrynetDaemonVersion": "0.21.1rc2",
     "lbrynetDaemonUrlTemplate": "https://github.com/lbryio/lbry/releases/download/vDAEMONVER/lbrynet-daemon-vDAEMONVER-OSNAME.zip",
     "lbrynetDaemonDir": "static/daemon",
     "lbrynetDaemonFileName": "lbrynet-daemon"
diff --git a/src/renderer/component/splash/view.jsx b/src/renderer/component/splash/view.jsx
index 07c1deec6..d2ea7b937 100644
--- a/src/renderer/component/splash/view.jsx
+++ b/src/renderer/component/splash/view.jsx
@@ -110,12 +110,7 @@ export class SplashScreen extends React.PureComponent<Props, State> {
         message: __('Blockchain Sync'),
         details: __(format, status.wallet.blocks_behind),
       });
-    } else if (
-      status.blockchain_headers &&
-      status.blockchain_headers.download_progress === 100 &&
-      status.wallet &&
-      status.wallet.blocks_behind === 0
-    ) {
+    } else if (status.wallet && status.wallet.blocks_behind === 0) {
       this.setState({
         message: 'Network Loading',
         details: 'Initializing LBRY service...',
-- 
2.45.3


From 52026ee00eafb7d8c05802e0bd0b3e3c63835d9d Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Mon, 13 Aug 2018 17:35:40 -0400
Subject: [PATCH 08/14] daemon@0.21.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 617e14888..937df7214 100644
--- a/package.json
+++ b/package.json
@@ -132,7 +132,7 @@
     "yarn": "^1.3"
   },
   "lbrySettings": {
-    "lbrynetDaemonVersion": "0.21.1rc2",
+    "lbrynetDaemonVersion": "0.21.1",
     "lbrynetDaemonUrlTemplate": "https://github.com/lbryio/lbry/releases/download/vDAEMONVER/lbrynet-daemon-vDAEMONVER-OSNAME.zip",
     "lbrynetDaemonDir": "static/daemon",
     "lbrynetDaemonFileName": "lbrynet-daemon"
-- 
2.45.3


From 93182de0a5aa61d9e9ef50c495d549de0c362662 Mon Sep 17 00:00:00 2001
From: Thomas Zarebczan <thomas.zarebczan@gmail.com>
Date: Mon, 13 Aug 2018 18:48:51 -0400
Subject: [PATCH 09/14] chore: bump rc version

0.24.0RC1
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 937df7214..f7312de8f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "LBRY",
-  "version": "0.23.1",
+  "version": "0.24.0-rc.1",
   "description": "A browser for the LBRY network, a digital marketplace controlled by its users.",
   "keywords": [
     "lbry"
-- 
2.45.3


From 18ad3e5358f43ccf33d888a2e1ebfeb84d5341f4 Mon Sep 17 00:00:00 2001
From: Thomas Zarebczan <thomas.zarebczan@gmail.com>
Date: Mon, 13 Aug 2018 19:04:34 -0400
Subject: [PATCH 10/14] chore: change log

add LBRY protocol upgrade message
---
 CHANGELOG.md | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 631212d5d..0ef4bab94 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,8 +5,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 ## [Unreleased]
 
-### Fixed
-
 ### Added
  * Wallet Encryption/Decryption user flows ([#1785](https://github.com/lbryio/lbry-desktop/pull/1785))
  * Add FAQ to Publishing Area ([#1833](https://github.com/lbryio/lbry-desktop/pull/1833))
@@ -15,22 +13,17 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
  * New viewer for human-readable text files ([#1826](https://github.com/lbryio/lbry-desktop/pull/1826))
  * CSV and JSON viewer ([#1410](https://github.com/lbryio/lbry-desktop/pull/1410))
  * Recommended content on file viewer page ([#1845](https://github.com/lbryio/lbry-desktop/pull/1845))
+ 
+### Fixed
 
-### Changed
- * Pass error message from spee.ch API during thumbnail upload ([#1840](https://github.com/lbryio/lbry-desktop/pull/1840))
- * Use router pattern for rendering file viewer ([#1544](https://github.com/lbryio/lbry-desktop/pull/1544))
- * Missing word "to" added to the Bid Help Text (#1854)
- * Updated to electron@2 ([#1858](https://github.com/lbryio/lbry-desktop/pull/1858))
 
-## [0.24.0] - 2018-08-14
+## [0.23.1] - 2018-08-04
 
 ### Fixed
- * Issue where publish page would show "Editing" on a new publish ([#1864](https://github.com/lbryio/lbry-desktop/pull/1864))
- 
-### Added
- * Upgraded to LBRY daemon@0.21.1 ([v0.21.1](https://github.com/lbryio/lbry/releases/tag/v0.21.1))
- 
+* Issue where the publish page would show "Editing" on a new publish ([#1864](https://github.com/lbryio/lbry-desktop/pull/1864))
+
 ### Changed
+* Upgrade LBRY Protocol to [version 0.21.1](https://github.com/lbryio/lbry/releases/tag/v0.21.1) which should improve download speed and availability.
 * Show label when publish button is disabled while uploading thumbnail to spee.ch ([#1867](https://github.com/lbryio/lbry-desktop/pull/1867))
 
 ## [0.23.1] - 2018-08-01
@@ -40,7 +33,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 
 ## [0.23.0] - 2018-07-25
->>>>>>> add thumbnail label for disabled publish button
 
 ### Fixed
  * **Wallet -> Get Credits** page now shows correct ShapeShift status when it's avialable ([#1836](https://github.com/lbryio/lbry-desktop/issues/1836))
-- 
2.45.3


From 17829718bf5033d508e81374c76dff2a13688ffb Mon Sep 17 00:00:00 2001
From: Thomas Zarebczan <thomas.zarebczan@gmail.com>
Date: Tue, 14 Aug 2018 13:53:14 -0400
Subject: [PATCH 11/14] chore: bump proper release

Bumping RC to proper 0.24.0
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f7312de8f..7bbd8b0d5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "LBRY",
-  "version": "0.24.0-rc.1",
+  "version": "0.24.0",
   "description": "A browser for the LBRY network, a digital marketplace controlled by its users.",
   "keywords": [
     "lbry"
-- 
2.45.3


From a92523ce07a1996feeffb16c6098328819bae92c Mon Sep 17 00:00:00 2001
From: Thomas Zarebczan <thomas.zarebczan@gmail.com>
Date: Tue, 14 Aug 2018 15:34:20 -0400
Subject: [PATCH 12/14] fix up changelog

---
 CHANGELOG.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ef4bab94..dcab3c328 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,14 +17,14 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 ### Fixed
 
 
-## [0.23.1] - 2018-08-04
+## [0.24.0] - 2018-08-04
 
 ### Fixed
-* Issue where the publish page would show "Editing" on a new publish ([#1864](https://github.com/lbryio/lbry-desktop/pull/1864))
+ * Issue where the publish page would show "Editing" on a new publish ([#1864](https://github.com/lbryio/lbry-desktop/pull/1864))
 
 ### Changed
-* Upgrade LBRY Protocol to [version 0.21.1](https://github.com/lbryio/lbry/releases/tag/v0.21.1) which should improve download speed and availability.
-* Show label when publish button is disabled while uploading thumbnail to spee.ch ([#1867](https://github.com/lbryio/lbry-desktop/pull/1867))
+ * Upgrade LBRY Protocol to [version 0.21.1](https://github.com/lbryio/lbry/releases/tag/v0.21.1) which should improve download speed and availability.
+ * Show label when publish button is disabled while uploading thumbnail to spee.ch ([#1867](https://github.com/lbryio/lbry-desktop/pull/1867))
 
 ## [0.23.1] - 2018-08-01
 
-- 
2.45.3


From 28d0fdfbfde593f8bba790d6aa553bff04952451 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Wed, 15 Aug 2018 10:59:46 -0400
Subject: [PATCH 13/14] update changelog

---
 CHANGELOG.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dcab3c328..03d1754f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
  * New viewer for human-readable text files ([#1826](https://github.com/lbryio/lbry-desktop/pull/1826))
  * CSV and JSON viewer ([#1410](https://github.com/lbryio/lbry-desktop/pull/1410))
  * Recommended content on file viewer page ([#1845](https://github.com/lbryio/lbry-desktop/pull/1845))
- 
+
+### Changed
+* Pass error message from spee.ch API during thumbnail upload ([#1840](https://github.com/lbryio/lbry-desktop/pull/1840))
+* Use router pattern for rendering file viewer ([#1544](https://github.com/lbryio/lbry-desktop/pull/1544))
+* Missing word "to" added to the Bid Help Text (#1854)
+* Updated to electron@2 ([#1858](https://github.com/lbryio/lbry-desktop/pull/1858))
+  
 ### Fixed
 
 
-- 
2.45.3


From f8aa249859611938e290e46164e38542b506b8cc Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Wed, 15 Aug 2018 11:51:12 -0400
Subject: [PATCH 14/14] fix import

---
 src/renderer/component/splash/view.jsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/renderer/component/splash/view.jsx b/src/renderer/component/splash/view.jsx
index d2ea7b937..6659eea49 100644
--- a/src/renderer/component/splash/view.jsx
+++ b/src/renderer/component/splash/view.jsx
@@ -1,7 +1,6 @@
 // @flow
 import * as React from 'react';
 import { Lbry, MODALS } from 'lbry-redux';
-import LoadScreen from './internal/load-screen';
 import ModalWalletUnlock from 'modal/modalWalletUnlock';
 import ModalIncompatibleDaemon from 'modal/modalIncompatibleDaemon';
 import ModalUpgrade from 'modal/modalUpgrade';
@@ -70,7 +69,7 @@ export class SplashScreen extends React.PureComponent<Props, State> {
         details: __('Please unlock your wallet to proceed.'),
         isRunning: true,
       });
-    
+
       if (launchedModal === false) {
         this.setState({ launchedModal: true }, () => notifyUnlockWallet());
       }
-- 
2.45.3