From 155672ee7b668a767a6da2b122b492fb34ace155 Mon Sep 17 00:00:00 2001
From: btzr-io <btzr.io@gmail.com>
Date: Wed, 29 May 2019 15:54:47 -0600
Subject: [PATCH 01/30] minor fixes for channel about page

fix #2506

fix #2485
---
 src/ui/component/channelAbout/view.jsx | 11 +++++++++--
 src/ui/scss/component/_media.scss      |  1 -
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/ui/component/channelAbout/view.jsx b/src/ui/component/channelAbout/view.jsx
index 82e8dab90..9d7982b54 100644
--- a/src/ui/component/channelAbout/view.jsx
+++ b/src/ui/component/channelAbout/view.jsx
@@ -1,5 +1,6 @@
 // @flow
 import React, { Fragment } from 'react';
+import MarkdownPreview from 'component/common/markdown-preview';
 
 type Props = {
   description: ?string,
@@ -16,7 +17,11 @@ function ChannelContent(props: Props) {
       {!showAbout && <h2 className="empty">{__('Nothing here yet')}</h2>}
       {showAbout && (
         <Fragment>
-          {description && <div className="media__info-text">{description}</div>}
+          {description && (
+            <div className="media__info-text">
+              <MarkdownPreview content={description} promptLinks />
+            </div>
+          )}
           {email && (
             <Fragment>
               <div className="media__info-title">{__('Contact')}</div>
@@ -26,7 +31,9 @@ function ChannelContent(props: Props) {
           {website && (
             <Fragment>
               <div className="media__info-title">{__('Site')}</div>
-              <div className="media__info-text">{website}</div>
+              <div className="media__info-text">
+                <MarkdownPreview content={website} promptLinks />
+              </div>
             </Fragment>
           )}
         </Fragment>
diff --git a/src/ui/scss/component/_media.scss b/src/ui/scss/component/_media.scss
index b4321fc29..5f4139fc7 100644
--- a/src/ui/scss/component/_media.scss
+++ b/src/ui/scss/component/_media.scss
@@ -260,7 +260,6 @@
 
 .media__info-text {
   font-size: 1.15rem;
-  word-break: break-all;
 
   &:not(:last-of-type) {
     margin-bottom: var(--spacing-vertical-large);

From 1edf7e06f91265e85eb2679c223b012dec46f7b5 Mon Sep 17 00:00:00 2001
From: btzr-io <btzr.io@gmail.com>
Date: Wed, 29 May 2019 17:21:20 -0600
Subject: [PATCH 02/30] add mailto protocol support for external links

---
 src/ui/component/channelAbout/view.jsx              | 13 ++++++++++++-
 .../component/common/markdown-preview-internal.jsx  |  2 +-
 src/ui/component/externalLink/view.jsx              |  4 ++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/ui/component/channelAbout/view.jsx b/src/ui/component/channelAbout/view.jsx
index 9d7982b54..2bde04b87 100644
--- a/src/ui/component/channelAbout/view.jsx
+++ b/src/ui/component/channelAbout/view.jsx
@@ -8,6 +8,15 @@ type Props = {
   website: ?string,
 };
 
+const formatEmail = (email: string) => {
+  if (email) {
+    const protocolRegex = new RegExp('^mailto:', 'i');
+    const protocol = protocolRegex.exec(email);
+    return protocol ? email : `mailto:${email}`;
+  }
+  return null;
+};
+
 function ChannelContent(props: Props) {
   const { description, email, website } = props;
   const showAbout = description || email || website;
@@ -25,7 +34,9 @@ function ChannelContent(props: Props) {
           {email && (
             <Fragment>
               <div className="media__info-title">{__('Contact')}</div>
-              <div className="media__info-text">{email}</div>
+              <div className="media__info-text">
+                <MarkdownPreview content={formatEmail(email)} promptLinks />
+              </div>
             </Fragment>
           )}
           {website && (
diff --git a/src/ui/component/common/markdown-preview-internal.jsx b/src/ui/component/common/markdown-preview-internal.jsx
index 78af2273d..8acf727bb 100644
--- a/src/ui/component/common/markdown-preview-internal.jsx
+++ b/src/ui/component/common/markdown-preview-internal.jsx
@@ -30,7 +30,7 @@ const SimpleLink = (props: SimpleLinkProps) => {
 const schema = { ...defaultSchema };
 
 // Extend sanitation schema to support lbry protocol
-schema.protocols.href[3] = 'lbry';
+schema.protocols.href.push('lbry');
 
 const MarkdownPreview = (props: MarkdownProps) => {
   const { content, promptLinks } = props;
diff --git a/src/ui/component/externalLink/view.jsx b/src/ui/component/externalLink/view.jsx
index ccab6ad27..36607e9ad 100644
--- a/src/ui/component/externalLink/view.jsx
+++ b/src/ui/component/externalLink/view.jsx
@@ -22,14 +22,14 @@ class ExternalLink extends React.PureComponent<Props> {
     const { href, title, children, openModal } = this.props;
 
     // Regex for url protocol
-    const protocolRegex = new RegExp('^(https?|lbry)+:', 'i');
+    const protocolRegex = new RegExp('^(https?|lbry|mailto)+:', 'i');
     const protocol = href ? protocolRegex.exec(href) : null;
 
     // Return plain text if no valid url
     let element = <span>{children}</span>;
 
     // Return external link if protocol is http or https
-    if (protocol && (protocol[0] === 'http:' || protocol[0] === 'https:')) {
+    if (protocol && (protocol[0] === 'http:' || protocol[0] === 'https:' || protocol[0] === 'mailto:')) {
       element = (
         <Button
           button="link"

From 9b9de07bfedd1f8e93373021c6caae134f05af06 Mon Sep 17 00:00:00 2001
From: btzr-io <btzr.io@gmail.com>
Date: Wed, 29 May 2019 19:32:06 -0600
Subject: [PATCH 03/30] add max-width to channel description

---
 src/ui/component/channelAbout/view.jsx | 2 +-
 src/ui/scss/component/_media.scss      | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/ui/component/channelAbout/view.jsx b/src/ui/component/channelAbout/view.jsx
index 2bde04b87..5965c896c 100644
--- a/src/ui/component/channelAbout/view.jsx
+++ b/src/ui/component/channelAbout/view.jsx
@@ -27,7 +27,7 @@ function ChannelContent(props: Props) {
       {showAbout && (
         <Fragment>
           {description && (
-            <div className="media__info-text">
+            <div className="media__info-text media__info-text--small">
               <MarkdownPreview content={description} promptLinks />
             </div>
           )}
diff --git a/src/ui/scss/component/_media.scss b/src/ui/scss/component/_media.scss
index 5f4139fc7..5e1836f18 100644
--- a/src/ui/scss/component/_media.scss
+++ b/src/ui/scss/component/_media.scss
@@ -260,11 +260,16 @@
 
 .media__info-text {
   font-size: 1.15rem;
+  word-break: break-word;
 
   &:not(:last-of-type) {
     margin-bottom: var(--spacing-vertical-large);
   }
 
+  &.media__info-text--small {
+    max-width: 70%;
+  }
+
   &.media__info-text--center {
     text-align: center;
   }

From c01730091355c9d36cda3d211d872a55ffd37d2f Mon Sep 17 00:00:00 2001
From: Baltazar Gomez <btzr.io@gmail.com>
Date: Thu, 30 May 2019 10:57:58 -0600
Subject: [PATCH 04/30] change channel description max width to 50rem

---
 src/ui/scss/component/_media.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ui/scss/component/_media.scss b/src/ui/scss/component/_media.scss
index 5e1836f18..6cb38251a 100644
--- a/src/ui/scss/component/_media.scss
+++ b/src/ui/scss/component/_media.scss
@@ -267,7 +267,7 @@
   }
 
   &.media__info-text--small {
-    max-width: 70%;
+    max-width: 50rem;
   }
 
   &.media__info-text--center {

From a854fa38c2093c0a1d99679caea630e79aed1b3b Mon Sep 17 00:00:00 2001
From: Thomas Zarebczan <tzarebczan@users.noreply.github.com>
Date: Fri, 31 May 2019 11:05:02 -0400
Subject: [PATCH 05/30] fix ?discover navigation

open.lbry.com/?discover would fail
---
 src/ui/component/router/view.jsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ui/component/router/view.jsx b/src/ui/component/router/view.jsx
index e60197c1c..02b6c86d6 100644
--- a/src/ui/component/router/view.jsx
+++ b/src/ui/component/router/view.jsx
@@ -37,6 +37,7 @@ export default function AppRouter() {
     <Scroll>
       <Switch>
         <Route path="/" exact component={DiscoverPage} />
+        <Route path={`/$/${PAGES.DISCOVER}`} exact component={DiscoverPage} />
         <Route path={`/$/${PAGES.AUTH}`} exact component={AuthPage} />
         <Route path={`/$/${PAGES.INVITE}`} exact component={InvitePage} />
         <Route path={`/$/${PAGES.DOWNLOADED}`} exact component={FileListDownloaded} />

From b9889bcb7973a97c3b7d9826cd9cdedffe8271f6 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Tue, 21 May 2019 23:46:20 -0400
Subject: [PATCH 06/30] new yarn.lock

---
 package.json |  2 +-
 yarn.lock    | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index ff0048352..994b0cbfc 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
     "flow-defs": "flow-typed install",
     "precommit": "lint-staged",
     "preinstall": "yarn cache clean lbry-redux && yarn cache clean lbryinc",
-    "postinstall": "electron-builder install-app-deps && node build/downloadDaemon.js"
+    "postinstall": "electron-builder install-app-deps"
   },
   "dependencies": {
     "electron-dl": "^1.11.0",
diff --git a/yarn.lock b/yarn.lock
index 9d3cb337d..855907a06 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -762,7 +762,7 @@
     pirates "^4.0.0"
     source-map-support "^0.5.9"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.2.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.3":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.2.0", "@babel/runtime@^7.3.1":
   version "7.4.5"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.5.tgz#582bb531f5f9dc67d2fcb682979894f75e253f12"
   integrity sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ==
@@ -6137,6 +6137,13 @@ is-path-in-cwd@^2.0.0:
   dependencies:
     is-path-inside "^2.1.0"
 
+is-path-in-cwd@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz#bfe2dca26c69f397265a4009963602935a053acb"
+  integrity sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==
+  dependencies:
+    is-path-inside "^2.1.0"
+
 is-path-inside@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
@@ -7908,11 +7915,6 @@ opener@^1.5.1:
   resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.1.tgz#6d2f0e77f1a0af0032aca716c2c1fbb8e7e8abed"
   integrity sha512-goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA==
 
-openseadragon@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/openseadragon/-/openseadragon-2.4.0.tgz#d0b28b37a953602c82432a0dbd8a3779dadf756f"
-  integrity sha512-e2fsoEiCDkmwc3vyrv396lkYu4c9CGlpbSX4kYE07eW0ZlEF5DnLbeY2PhqPTskkC1jlsPu2TGZwaZ9VhaAn/w==
-
 opn@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc"

From d518b06f3cf69c337d93758b2169c8fb46f130e5 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Mon, 3 Jun 2019 10:34:54 -0400
Subject: [PATCH 07/30] update changelog

---
 CHANGELOG.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 709c6866a..5e249085e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [0.33.0] - [Unreleased]
+
+### Fixed
+
+- Channel page styling ([#2520](https://github.com/lbryio/lbry-desktop/pull/2520))
+
+### Added
+
+- Comic book reader ([#2484](https://github.com/lbryio/lbry-desktop/pull/2484))
+- Base functionality for more language support ([#2495](https://github.com/lbryio/lbry-desktop/pull2495))
+
 ## [0.32.2] - [2019-5-20]
 
 ### Fixed

From 822eefcc49f29d703ffa5cea281fc031cb3ddab3 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Mon, 3 Jun 2019 10:35:18 -0400
Subject: [PATCH 08/30] bump lbry-sdk to 0.37.2

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

diff --git a/package.json b/package.json
index 994b0cbfc..f2f64d91f 100644
--- a/package.json
+++ b/package.json
@@ -190,7 +190,7 @@
     "yarn": "^1.3"
   },
   "lbrySettings": {
-    "lbrynetDaemonVersion": "0.37.1",
+    "lbrynetDaemonVersion": "0.37.2",
     "lbrynetDaemonUrlTemplate": "https://github.com/lbryio/lbry/releases/download/vDAEMONVER/lbrynet-OSNAME.zip",
     "lbrynetDaemonDir": "static/daemon",
     "lbrynetDaemonFileName": "lbrynet"

From ae6c8d8610d89bb2ea14f3367281cda16bd6ee0f Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Mon, 3 Jun 2019 11:52:59 -0400
Subject: [PATCH 09/30] update postinstall script

---
 package.json |  2 +-
 yarn.lock    | 14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index f2f64d91f..94894ad64 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
     "flow-defs": "flow-typed install",
     "precommit": "lint-staged",
     "preinstall": "yarn cache clean lbry-redux && yarn cache clean lbryinc",
-    "postinstall": "electron-builder install-app-deps"
+    "postinstall": "electron-builder install-app-deps && node ./build/downloadDaemon.js"
   },
   "dependencies": {
     "electron-dl": "^1.11.0",
diff --git a/yarn.lock b/yarn.lock
index 855907a06..9d3cb337d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -762,7 +762,7 @@
     pirates "^4.0.0"
     source-map-support "^0.5.9"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.2.0", "@babel/runtime@^7.3.1":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.2.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.3":
   version "7.4.5"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.5.tgz#582bb531f5f9dc67d2fcb682979894f75e253f12"
   integrity sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ==
@@ -6137,13 +6137,6 @@ is-path-in-cwd@^2.0.0:
   dependencies:
     is-path-inside "^2.1.0"
 
-is-path-in-cwd@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz#bfe2dca26c69f397265a4009963602935a053acb"
-  integrity sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==
-  dependencies:
-    is-path-inside "^2.1.0"
-
 is-path-inside@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
@@ -7915,6 +7908,11 @@ opener@^1.5.1:
   resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.1.tgz#6d2f0e77f1a0af0032aca716c2c1fbb8e7e8abed"
   integrity sha512-goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA==
 
+openseadragon@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/openseadragon/-/openseadragon-2.4.0.tgz#d0b28b37a953602c82432a0dbd8a3779dadf756f"
+  integrity sha512-e2fsoEiCDkmwc3vyrv396lkYu4c9CGlpbSX4kYE07eW0ZlEF5DnLbeY2PhqPTskkC1jlsPu2TGZwaZ9VhaAn/w==
+
 opn@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc"

From d36cfb0b6300dbf501e6336fe037487c0c04a2d8 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Mon, 3 Jun 2019 11:53:12 -0400
Subject: [PATCH 10/30] v0.33.0-rc.1

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

diff --git a/package.json b/package.json
index 94894ad64..d36a58f26 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "LBRY",
-  "version": "0.32.2",
+  "version": "0.33.0-rc.1",
   "description": "A browser for the LBRY network, a digital marketplace controlled by its users.",
   "keywords": [
     "lbry"

From d9e9a95879650b1065f1a27d844e3d1b887517dd Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Mon, 3 Jun 2019 15:29:01 -0400
Subject: [PATCH 11/30] update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e249085e..6ea4fe9a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 - Comic book reader ([#2484](https://github.com/lbryio/lbry-desktop/pull/2484))
 - Base functionality for more language support ([#2495](https://github.com/lbryio/lbry-desktop/pull2495))
+- Add easy thumbnail selector for videos ([#2492](https://github.com/lbryio/lbry-desktop/pull2492))
 
 ## [0.32.2] - [2019-5-20]
 

From 6eeafeca4c0aedff5a021e8650fbd5220a77f5fc Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Tue, 4 Jun 2019 11:30:25 -0400
Subject: [PATCH 12/30] v0.33.0-rc.2

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

diff --git a/package.json b/package.json
index d36a58f26..66af01f19 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "LBRY",
-  "version": "0.33.0-rc.1",
+  "version": "0.33.0-rc.2",
   "description": "A browser for the LBRY network, a digital marketplace controlled by its users.",
   "keywords": [
     "lbry"

From 439ac848ab46c23d1890de56d5c1c841ce9878b9 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Tue, 4 Jun 2019 13:04:25 -0400
Subject: [PATCH 13/30] fix: tx list for claims with no name

---
 .../transactionList/internal/transaction-list-item.jsx | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/ui/component/transactionList/internal/transaction-list-item.jsx b/src/ui/component/transactionList/internal/transaction-list-item.jsx
index 9d51128ff..abccd0f91 100644
--- a/src/ui/component/transactionList/internal/transaction-list-item.jsx
+++ b/src/ui/component/transactionList/internal/transaction-list-item.jsx
@@ -37,13 +37,17 @@ class TransactionListItem extends React.PureComponent<Props> {
     this.props.revokeClaim(txid, nout);
   }
 
-  capitalize = (string: string) => string.charAt(0).toUpperCase() + string.slice(1);
+  capitalize = (string: ?string) => string && string.charAt(0).toUpperCase() + string.slice(1);
 
   render() {
     const { reward, transaction, isRevokeable } = this.props;
     const { amount, claim_id: claimId, claim_name: name, date, fee, txid, type } = transaction;
-    // Ensure the claim name is valid
-    const { claimName } = parseURI(name);
+
+    // Ensure the claim name exists and is valid
+    let claimName = name;
+    if (claimName) {
+      ({ claimName } = parseURI(name));
+    }
 
     const dateFormat = {
       month: 'short',

From e37595ab29c7596f48ab8fcf7b62f679ff87a9aa Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Tue, 4 Jun 2019 13:07:27 -0400
Subject: [PATCH 14/30] v0.33.0-rc.3

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

diff --git a/package.json b/package.json
index 66af01f19..b7b3c5035 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "LBRY",
-  "version": "0.33.0-rc.2",
+  "version": "0.33.0-rc.3",
   "description": "A browser for the LBRY network, a digital marketplace controlled by its users.",
   "keywords": [
     "lbry"

From df58aedfdf3650b7f54c0e66e74a11ef94b3b87e Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Tue, 4 Jun 2019 14:32:42 -0400
Subject: [PATCH 15/30] fix: comic book reader in prod

---
 src/ui/component/viewers/comicBookViewer.jsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/ui/component/viewers/comicBookViewer.jsx b/src/ui/component/viewers/comicBookViewer.jsx
index 780d60fa1..778a11f76 100644
--- a/src/ui/component/viewers/comicBookViewer.jsx
+++ b/src/ui/component/viewers/comicBookViewer.jsx
@@ -10,8 +10,14 @@ type Props = {
   },
 };
 
+let workerPath = 'webworkers/worker-bundle.js';
+if (process.env.NODE_ENV !== 'production') {
+  // Don't add a leading slash in production because electron treats it as an absolute path
+  workerPath = `/${workerPath}`;
+}
+
 const opts = {
-  workerPath: '/webworkers/worker-bundle.js',
+  workerPath,
   allowFullScreen: false,
   autoHideControls: true,
 };

From e27e3117569bb7297e09250b72c8d441a1b7a3e4 Mon Sep 17 00:00:00 2001
From: btzr-io <btzr.io@gmail.com>
Date: Mon, 3 Jun 2019 21:39:26 -0600
Subject: [PATCH 16/30] fix render logic of non-playable files

---
 .../component/fileViewer/internal/player.jsx  | 77 +++++++++++--------
 1 file changed, 44 insertions(+), 33 deletions(-)

diff --git a/src/ui/component/fileViewer/internal/player.jsx b/src/ui/component/fileViewer/internal/player.jsx
index 839dd49f9..d3022b208 100644
--- a/src/ui/component/fileViewer/internal/player.jsx
+++ b/src/ui/component/fileViewer/internal/player.jsx
@@ -77,10 +77,12 @@ class MediaPlayer extends React.PureComponent<Props, State> {
     // Temp hack to force the video to play if the metadataloaded event was never fired
     // Will be removed with the new video player
     // Unoptimized MP4s will fail to render.
+    // Note: Don't use this for non-playable files
     // @if TARGET='app'
     setTimeout(() => {
       const { hasMetadata } = this.state;
-      if (!hasMetadata) {
+      const isPlayableType = this.playableType();
+      if (!hasMetadata && isPlayableType) {
         this.refreshMetadata();
         this.playMedia();
       }
@@ -88,6 +90,20 @@ class MediaPlayer extends React.PureComponent<Props, State> {
     // @endif
   }
 
+  componentDidUpdate(prevProps: Props) {
+    const { fileSource } = this.state;
+    const { downloadCompleted } = this.props;
+
+    // Attemp to render a non-playable file once download is completed
+    if (prevProps.downloadCompleted !== downloadCompleted) {
+      const isFileType = this.isSupportedFile();
+
+      if (isFileType && !fileSource && downloadCompleted) {
+        this.playMedia();
+      }
+    }
+  }
+
   componentWillUnmount() {
     const mediaElement = this.mediaContainer.current.children[0];
 
@@ -139,8 +155,8 @@ class MediaPlayer extends React.PureComponent<Props, State> {
     };
 
     // Render custom viewer: FileRender
-    if (this.isSupportedFile() && downloadCompleted) {
-      this.renderFile();
+    if (this.isSupportedFile()) {
+      downloadCompleted && this.renderFile();
     } else {
       // Render default viewer: render-media (video, audio, img, iframe)
       const currentMediaContainer = this.mediaContainer.current;
@@ -256,9 +272,7 @@ class MediaPlayer extends React.PureComponent<Props, State> {
   isRenderMediaSupported() {
     // Files supported by render-media
     const { contentType } = this.props;
-    return (
-      Object.values(player.mime).indexOf(contentType) !== -1 || MediaPlayer.SANDBOX_TYPES.indexOf(contentType) > -1
-    );
+    return Object.values(player.mime).indexOf(contentType) !== -1;
   }
 
   isSupportedFile() {
@@ -274,33 +288,36 @@ class MediaPlayer extends React.PureComponent<Props, State> {
 
     if (MediaPlayer.SANDBOX_TYPES.indexOf(contentType) > -1) {
       const outpoint = `${claim.txid}:${claim.nout}`;
-
-      return fetch(`${MediaPlayer.SANDBOX_SET_BASE_URL}${outpoint}`)
+      // Fetch unpacked url
+      fetch(`${MediaPlayer.SANDBOX_SET_BASE_URL}${outpoint}`)
         .then(res => res.text())
         .then(url => {
           const fileSource = { url: `${MediaPlayer.SANDBOX_CONTENT_BASE_URL}${url}` };
-          return this.setState({ fileSource });
+          this.setState({ fileSource });
+        })
+        .catch(err => {
+          console.error(err);
         });
+    } else {
+      // File to render
+      const fileSource = {
+        fileName,
+        contentType,
+        downloadPath,
+        fileType: path.extname(fileName).substring(1),
+        // Readable stream from file
+        // @if TARGET='app'
+        stream: opts => fs.createReadStream(downloadPath, opts),
+        // @endif
+      };
+
+      // Update state
+      this.setState({ fileSource });
     }
-
-    // File to render
-    const fileSource = {
-      fileName,
-      contentType,
-      downloadPath,
-      fileType: path.extname(fileName).substring(1),
-      // Readable stream from file
-      // @if TARGET='app'
-      stream: opts => fs.createReadStream(downloadPath, opts),
-      // @endif
-    };
-
-    // Update state
-    this.setState({ fileSource });
   }
 
   showLoadingScreen(isFileType: boolean, isPlayableType: boolean) {
-    const { mediaType, contentType } = this.props;
+    const { mediaType } = this.props;
     const { unplayable, fileSource, hasMetadata } = this.state;
 
     if (IS_WEB && ['audio', 'video'].indexOf(mediaType) === -1) {
@@ -325,10 +342,7 @@ class MediaPlayer extends React.PureComponent<Props, State> {
 
     // Files
     const isLoadingFile = !fileSource && isFileType;
-    const isLbryPackage = /application\/x(-ext)?-lbry$/.test(contentType);
-    const isUnsupported =
-      (mediaType === 'application' && !isLbryPackage) ||
-      (!this.isRenderMediaSupported() && !isFileType && !isPlayableType);
+    const isUnsupported = !this.isRenderMediaSupported() && !isFileType && !isPlayableType;
     // Media (audio, video)
     const isUnplayable = isPlayableType && unplayable;
     const isLoadingMetadata = isPlayableType && (!hasMetadata && !unplayable);
@@ -341,8 +355,6 @@ class MediaPlayer extends React.PureComponent<Props, State> {
       // Show unsupported error message
     } else if (isUnsupported || isUnplayable) {
       loader.loadingStatus = isUnsupported ? unsupportedMessage : unplayableMessage;
-    } else if (isLbryPackage && !isLoadingFile) {
-      loader.loadingStatus = null;
     }
 
     return loader;
@@ -352,8 +364,7 @@ class MediaPlayer extends React.PureComponent<Props, State> {
     const { mediaType, claim } = this.props;
     const { fileSource } = this.state;
     const isFileType = this.isSupportedFile();
-
-    const isFileReady = fileSource && isFileType;
+    const isFileReady = fileSource !== null && isFileType;
     const isPlayableType = this.playableType();
     const { isLoading, loadingStatus } = this.showLoadingScreen(isFileType, isPlayableType);
 

From d91ce266556687a53fd8ee6c05762cd0ebff2edf Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Tue, 4 Jun 2019 14:33:05 -0400
Subject: [PATCH 17/30] formatting

---
 src/ui/component/fileViewer/internal/player.jsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/ui/component/fileViewer/internal/player.jsx b/src/ui/component/fileViewer/internal/player.jsx
index d3022b208..4d7ba036a 100644
--- a/src/ui/component/fileViewer/internal/player.jsx
+++ b/src/ui/component/fileViewer/internal/player.jsx
@@ -156,7 +156,9 @@ class MediaPlayer extends React.PureComponent<Props, State> {
 
     // Render custom viewer: FileRender
     if (this.isSupportedFile()) {
-      downloadCompleted && this.renderFile();
+      if (downloadCompleted) {
+        this.renderFile();
+      }
     } else {
       // Render default viewer: render-media (video, audio, img, iframe)
       const currentMediaContainer = this.mediaContainer.current;

From 77c9594d5c03398676de1f28095c8bc067f36abe Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Tue, 4 Jun 2019 15:00:33 -0400
Subject: [PATCH 18/30] add sdk version in error report

---
 src/ui/component/errorBoundary/view.jsx | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/ui/component/errorBoundary/view.jsx b/src/ui/component/errorBoundary/view.jsx
index 64d7ad10d..fb7132a8b 100644
--- a/src/ui/component/errorBoundary/view.jsx
+++ b/src/ui/component/errorBoundary/view.jsx
@@ -5,6 +5,7 @@ import Yrbl from 'component/yrbl';
 import Button from 'component/button';
 import { withRouter } from 'react-router';
 import Native from 'native';
+import { Lbry } from 'lbry-redux';
 
 type Props = {
   children: React.Node,
@@ -30,29 +31,31 @@ class ErrorBoundary extends React.Component<Props, State> {
   }
 
   componentDidCatch(error: { stack: string }) {
-    let errorMessage = '\n';
+    let errorMessage = 'Uncaught error\n';
 
     // @if TARGET='web'
-    errorMessage += 'lbry.tv error\n';
+    errorMessage += 'lbry.tv\n';
     errorMessage += window.location.pathname + window.location.search;
     this.log(errorMessage);
     // @endif
     // @if TARGET='app'
     Native.getAppVersionInfo().then(({ localVersion }) => {
-      errorMessage += `version: ${localVersion}\n`;
-      errorMessage += `page: ${window.location.href.split('.html')[1]}\n`;
-      errorMessage += `${error.stack}`;
-
-      this.log(errorMessage);
+      Lbry.version().then(({ lbrynet_version: sdkVersion }) => {
+        errorMessage += `app version: ${localVersion}\n`;
+        errorMessage += `sdk version: ${sdkVersion}\n`;
+        errorMessage += `page: ${window.location.href.split('.html')[1]}\n`;
+        errorMessage += `${error.stack}`;
+        this.log(errorMessage);
+      });
     });
     // @endif
   }
 
   log(message) {
     declare var app: { env: string };
-    if (app.env === 'production') {
-      Lbryio.call('event', 'desktop_error', { error_message: message });
-    }
+    // if (app.env === 'production') {
+    Lbryio.call('event', 'desktop_error', { error_message: message });
+    // }
   }
 
   refresh() {

From 159d0277958bf7c6c269a7d3d732efd64d14e750 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Tue, 4 Jun 2019 15:01:11 -0400
Subject: [PATCH 19/30] v0.33.0-rc.4

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

diff --git a/package.json b/package.json
index b7b3c5035..d488e55ff 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "LBRY",
-  "version": "0.33.0-rc.3",
+  "version": "0.33.0-rc.4",
   "description": "A browser for the LBRY network, a digital marketplace controlled by its users.",
   "keywords": [
     "lbry"

From a8a629b3c210dd5e0bfe8416b482b4d47772047e Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Tue, 4 Jun 2019 17:08:08 -0400
Subject: [PATCH 20/30] v0.33.0

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

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

From 9d60470f5f0b57d3893e29bd78623a1d6b6c2f00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=83=9D=E3=83=BC=E3=83=AB=20=E3=82=A6=E3=82=A7=E3=83=83?=
 =?UTF-8?q?=E3=83=96?= <netopwibby@thenetwork.email>
Date: Fri, 17 May 2019 10:17:44 -0500
Subject: [PATCH 21/30] NEW splash

---
 src/ui/component/doodle/index.js              |  7 +++
 .../component/splash/internal/load-screen.jsx |  7 ++-
 src/ui/scss/component/_load-screen.scss       | 63 ++++++++++++++-----
 3 files changed, 59 insertions(+), 18 deletions(-)
 create mode 100644 src/ui/component/doodle/index.js

diff --git a/src/ui/component/doodle/index.js b/src/ui/component/doodle/index.js
new file mode 100644
index 000000000..0c5d79afd
--- /dev/null
+++ b/src/ui/component/doodle/index.js
@@ -0,0 +1,7 @@
+import React from 'react';
+import 'css-doodle';
+
+export default ([rule = '']) => () => (
+  // eslint-disable-line
+  <css-doodle use="var(--rule)">{rule}</css-doodle>
+);
diff --git a/src/ui/component/splash/internal/load-screen.jsx b/src/ui/component/splash/internal/load-screen.jsx
index 1111a2a3d..6320586c1 100644
--- a/src/ui/component/splash/internal/load-screen.jsx
+++ b/src/ui/component/splash/internal/load-screen.jsx
@@ -4,6 +4,7 @@ import React, { Fragment } from 'react';
 import Icon from 'component/common/icon';
 import Spinner from 'component/spinner';
 import Button from 'component/button';
+import Doodle from 'component/doodle';
 
 type Props = {
   message: string,
@@ -12,6 +13,8 @@ type Props = {
   error: boolean,
 };
 
+const FancyDoodle = Doodle``; // this looks dumb but it prevents repetition from `_load-screen.scss`
+
 class LoadScreen extends React.PureComponent<Props> {
   static defaultProps = {
     isWarning: false,
@@ -22,7 +25,7 @@ class LoadScreen extends React.PureComponent<Props> {
 
     return (
       <div className="load-screen">
-        <div>
+        <div className="load-screen__overlay">
           <div className="load-screen__header">
             <h1 className="load-screen__title">
               {__('LBRY')}
@@ -70,6 +73,8 @@ class LoadScreen extends React.PureComponent<Props> {
             </Fragment>
           )}
         </div>
+
+        <FancyDoodle />
       </div>
     );
   }
diff --git a/src/ui/scss/component/_load-screen.scss b/src/ui/scss/component/_load-screen.scss
index 5d5bd6a88..301063874 100644
--- a/src/ui/scss/component/_load-screen.scss
+++ b/src/ui/scss/component/_load-screen.scss
@@ -1,26 +1,48 @@
 .load-screen {
-  min-width: 100vw;
-  min-height: 100vh;
+  width: 100vw;
+  height: 100vh;
 
   align-items: center;
-  background-image: linear-gradient(to right, $lbry-teal-5, $lbry-cyan-5 100%);
-  background-size: cover;
-  color: $lbry-white;
-  cursor: default;
+  background-color: #270f34;
   display: flex;
   justify-content: center;
-  text-align: center;
+  overflow: hidden;
 
-  .spinner {
-    margin-right: auto;
-    margin-left: auto;
+  css-doodle {
+    width: 100%;
+    height: 100%;
+
+    overflow: hidden;
+    position: absolute;
+
+    --color: @p (var(--lbry-teal-1), var(--lbry-orange-1), var(--lbry-cyan-3), var(--lbry-pink-5));
+
+    --rule: (
+      : doodle {@grid: 30x1 / 18vmin; --deg: @p (-180deg, 180deg) ;}: container {perspective: 30vmin;}: before,
+      : after {@place-cell: @r (100%) @r (100%) ; @shape: star; @size: @r (6px) ; background-color: var(--color) ;
+        content: '' ;} @place-cell: center; @size: 100%; animation: scale-up 12s linear infinite; animation-delay: calc(
+          -12s / @size () * @i ()
+        ) ; background-image: @m100 (
+          radial-gradient(var(--color) 50%, transparent 0) @r (-20%, 120%) @r (-20%, 100%) / 1px 1px no-repeat
+        ) ; box-shadow: @m2 (0 0 50px var(--color)) ; will-change: transform,
+      opacity; @keyframes scale-up {0%,
+      95.01%,
+      100% {opacity: 0; transform: translateZ(0) rotate(0) ;} 10% {opacity: 1;} 95% {transform: translateZ(35vmin) rotateZ(
+          @var (--deg)
+        ) ;}}
+    );
   }
 }
 
+.load-screen__actions {
+  font-size: 1.2em;
+  margin-top: var(--spacing-vertical-medium);
+}
+
 .load-screen__button {
-  transition: none;
-  color: $lbry-white;
   border-bottom: 1px solid $lbry-white;
+  color: $lbry-white;
+  transition: none;
 
   &:hover {
     border-bottom: 1px solid $lbry-blue-1;
@@ -52,6 +74,18 @@
   margin-bottom: var(--spacing-vertical-medium);
 }
 
+.load-screen__overlay {
+  @include center;
+  width: 100vw;
+  height: 100vh;
+
+  color: $lbry-white;
+  flex-direction: column;
+  position: relative;
+  text-align: center;
+  z-index: 1;
+}
+
 .load-screen__title {
   font-size: 60px;
   font-weight: 700;
@@ -79,8 +113,3 @@
   font-size: 14px;
   padding-top: $spacing-vertical;
 }
-
-.load-screen__actions {
-  font-size: 1.2em;
-  margin-top: var(--spacing-vertical-medium);
-}

From 17be6711af706cb7dbfbbd05a5c7566edb0a395d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=83=9D=E3=83=BC=E3=83=AB=20=E3=82=A6=E3=82=A7=E3=83=83?=
 =?UTF-8?q?=E3=83=96?= <netopwibby@thenetwork.email>
Date: Fri, 17 May 2019 10:32:13 -0500
Subject: [PATCH 22/30] Updated eslint ignore line

---
 src/ui/component/doodle/index.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/ui/component/doodle/index.js b/src/ui/component/doodle/index.js
index 0c5d79afd..8516969b8 100644
--- a/src/ui/component/doodle/index.js
+++ b/src/ui/component/doodle/index.js
@@ -1,7 +1,6 @@
+/* eslint react/display-name: 0 */
+
 import React from 'react';
 import 'css-doodle';
 
-export default ([rule = '']) => () => (
-  // eslint-disable-line
-  <css-doodle use="var(--rule)">{rule}</css-doodle>
-);
+export default ([rule = '']) => () => <css-doodle use="var(--rule)">{rule}</css-doodle>;

From cca2ec68525596dee6a264978090b94d5d37b43b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=83=9D=E3=83=BC=E3=83=AB=20=E3=82=A6=E3=82=A7=E3=83=83?=
 =?UTF-8?q?=E3=83=96?= <netopwibby@thenetwork.email>
Date: Fri, 17 May 2019 11:00:45 -0500
Subject: [PATCH 23/30] Disable prettier for load-screen.scss

---
 .prettierignore                         |  1 +
 src/ui/scss/component/_load-screen.scss | 71 ++++++++++++++++++-------
 2 files changed, 54 insertions(+), 18 deletions(-)
 create mode 100644 .prettierignore

diff --git a/.prettierignore b/.prettierignore
new file mode 100644
index 000000000..cec9064c3
--- /dev/null
+++ b/.prettierignore
@@ -0,0 +1 @@
+src/ui/scss/component/_load-screen.scss
diff --git a/src/ui/scss/component/_load-screen.scss b/src/ui/scss/component/_load-screen.scss
index 301063874..25c0f856c 100644
--- a/src/ui/scss/component/_load-screen.scss
+++ b/src/ui/scss/component/_load-screen.scss
@@ -9,28 +9,62 @@
   overflow: hidden;
 
   css-doodle {
-    width: 100%;
-    height: 100%;
+    width: 100%; height: 100%;
 
     overflow: hidden;
     position: absolute;
 
-    --color: @p (var(--lbry-teal-1), var(--lbry-orange-1), var(--lbry-cyan-3), var(--lbry-pink-5));
+    --color: @p(var(--lbry-teal-1), var(--lbry-orange-1), var(--lbry-cyan-3), var(--lbry-pink-5));
 
     --rule: (
-      : doodle {@grid: 30x1 / 18vmin; --deg: @p (-180deg, 180deg) ;}: container {perspective: 30vmin;}: before,
-      : after {@place-cell: @r (100%) @r (100%) ; @shape: star; @size: @r (6px) ; background-color: var(--color) ;
-        content: '' ;} @place-cell: center; @size: 100%; animation: scale-up 12s linear infinite; animation-delay: calc(
-          -12s / @size () * @i ()
-        ) ; background-image: @m100 (
-          radial-gradient(var(--color) 50%, transparent 0) @r (-20%, 120%) @r (-20%, 100%) / 1px 1px no-repeat
-        ) ; box-shadow: @m2 (0 0 50px var(--color)) ; will-change: transform,
-      opacity; @keyframes scale-up {0%,
-      95.01%,
-      100% {opacity: 0; transform: translateZ(0) rotate(0) ;} 10% {opacity: 1;} 95% {transform: translateZ(35vmin) rotateZ(
-          @var (--deg)
-        ) ;}}
-    );
+      :doodle {
+        @grid: 30x1 / 18vmin;
+        --deg: @p(-180deg, 180deg);
+      }
+
+      :container {
+        perspective: 30vmin;
+      }
+
+      :before,
+      :after {
+        @place-cell: @r(100%) @r(100%);
+        @shape: star;
+        @size: @r(6px);
+        background-color: var(--color);
+        content: '';
+      }
+
+      @place-cell: center;
+      @size: 100%;
+
+      animation: scale-up 12s linear infinite;
+      animation-delay: calc(-12s / @size() * @i());
+      background-image: @m100(
+        radial-gradient(var(--color) 50%, transparent 0)
+        @r(-20%, 120%) @r(-20%, 100%) / 1px 1px
+        no-repeat
+      );
+      box-shadow: @m2(0 0 50px var(--color));
+      will-change: transform, opacity;
+
+      @keyframes scale-up {
+        0%,
+        95.01%,
+        100% {
+          opacity: 0;
+          transform: translateZ(0) rotate(0);
+        }
+
+        10% {
+          opacity: 1;
+        }
+
+        95% {
+          transform: translateZ(35vmin) rotateZ(@var(--deg));
+        }
+      }
+    )
   }
 }
 
@@ -76,8 +110,7 @@
 
 .load-screen__overlay {
   @include center;
-  width: 100vw;
-  height: 100vh;
+  width: 100vw; height: 100vh;
 
   color: $lbry-white;
   flex-direction: column;
@@ -109,6 +142,8 @@
   }
 }
 
+
+
 .load-screen--help {
   font-size: 14px;
   padding-top: $spacing-vertical;

From ca776f78ca5192ad6d2ab3c7fe6fa7a7c8fb6d92 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Tue, 21 May 2019 18:40:21 -0400
Subject: [PATCH 24/30] centered animation

---
 src/ui/component/doodle/index.js              |   3 +-
 .../component/splash/internal/load-screen.jsx |  57 +------
 src/ui/component/splash/view.jsx              |  16 +-
 src/ui/scss/component/_load-screen.scss       | 146 ++++++++----------
 4 files changed, 77 insertions(+), 145 deletions(-)

diff --git a/src/ui/component/doodle/index.js b/src/ui/component/doodle/index.js
index 8516969b8..542124684 100644
--- a/src/ui/component/doodle/index.js
+++ b/src/ui/component/doodle/index.js
@@ -1,6 +1,5 @@
 /* eslint react/display-name: 0 */
 
 import React from 'react';
-import 'css-doodle';
 
-export default ([rule = '']) => () => <css-doodle use="var(--rule)">{rule}</css-doodle>;
+export default ({ rule = '' }) => <css-doodle use="var(--rule)">{rule}</css-doodle>;
diff --git a/src/ui/component/splash/internal/load-screen.jsx b/src/ui/component/splash/internal/load-screen.jsx
index 6320586c1..ca8fd95cd 100644
--- a/src/ui/component/splash/internal/load-screen.jsx
+++ b/src/ui/component/splash/internal/load-screen.jsx
@@ -4,7 +4,8 @@ import React, { Fragment } from 'react';
 import Icon from 'component/common/icon';
 import Spinner from 'component/spinner';
 import Button from 'component/button';
-import Doodle from 'component/doodle';
+// import Doodle from 'component/doodle';
+import 'css-doodle';
 
 type Props = {
   message: string,
@@ -13,7 +14,7 @@ type Props = {
   error: boolean,
 };
 
-const FancyDoodle = Doodle``; // this looks dumb but it prevents repetition from `_load-screen.scss`
+// const FancyDoodle = Doodle``; // this looks dumb but it prevents repetition from `_load-screen.scss`
 
 class LoadScreen extends React.PureComponent<Props> {
   static defaultProps = {
@@ -25,56 +26,8 @@ class LoadScreen extends React.PureComponent<Props> {
 
     return (
       <div className="load-screen">
-        <div className="load-screen__overlay">
-          <div className="load-screen__header">
-            <h1 className="load-screen__title">
-              {__('LBRY')}
-              <sup>beta</sup>
-            </h1>
-          </div>
-          {error ? (
-            <Fragment>
-              <h3>{__('Uh oh. Sean must have messed something up. Try refreshing to fix it.')}</h3>
-              <div className="load-screen__actions">
-                <Button
-                  label="Refresh"
-                  button="link"
-                  className="load-screen__button"
-                  onClick={() => window.location.reload()}
-                />
-              </div>
-              <div className="load-screen__help">
-                <p>{__('If you still have issues, your anti-virus software or firewall may be preventing startup.')}</p>
-                <p>
-                  {__('Reach out to hello@lbry.com for help, or check out')}{' '}
-                  <Button
-                    button="link"
-                    className="load-screen__button"
-                    href="https://lbry.com/faq/startup-troubleshooting"
-                    label="this link"
-                  />
-                  .
-                </p>
-              </div>
-            </Fragment>
-          ) : (
-            <Fragment>
-              {isWarning ? (
-                <span className="load-screen__message">
-                  <Icon size={20} icon={ICONS.ALERT} />
-                  {` ${message}`}
-                </span>
-              ) : (
-                <div className="load-screen__message">{message}</div>
-              )}
-
-              {details && <div className="load-screen__details">{details}</div>}
-              <Spinner type="splash" />
-            </Fragment>
-          )}
-        </div>
-
-        <FancyDoodle />
+        <h1 className="load-screen__title">{__('LBRY')}</h1>
+        <css-doodle use="var(--rule)" />
       </div>
     );
   }
diff --git a/src/ui/component/splash/view.jsx b/src/ui/component/splash/view.jsx
index 5615dde20..34b5116e6 100644
--- a/src/ui/component/splash/view.jsx
+++ b/src/ui/component/splash/view.jsx
@@ -170,14 +170,14 @@ export default class SplashScreen extends React.PureComponent<Props, State> {
     const { daemonVersionMatched, onReadyToLaunch } = this.props;
     const { isRunning, launchWithIncompatibleDaemon } = this.state;
 
-    if (daemonVersionMatched) {
-      onReadyToLaunch();
-    } else if (launchWithIncompatibleDaemon && isRunning) {
-      // The user may have decided to run the app with mismatched daemons
-      // They could make this decision before the daemon is finished starting up
-      // If it isn't running, this function will be called after the daemon is started
-      onReadyToLaunch();
-    }
+    // if (daemonVersionMatched) {
+    //   onReadyToLaunch();
+    // } else if (launchWithIncompatibleDaemon && isRunning) {
+    //   // The user may have decided to run the app with mismatched daemons
+    //   // They could make this decision before the daemon is finished starting up
+    //   // If it isn't running, this function will be called after the daemon is started
+    //   onReadyToLaunch();
+    // }
   }
 
   hasRecordedUser: boolean;
diff --git a/src/ui/scss/component/_load-screen.scss b/src/ui/scss/component/_load-screen.scss
index 25c0f856c..79aeb6f44 100644
--- a/src/ui/scss/component/_load-screen.scss
+++ b/src/ui/scss/component/_load-screen.scss
@@ -9,86 +9,75 @@
   overflow: hidden;
 
   css-doodle {
-    width: 100%; height: 100%;
-
-    overflow: hidden;
-    position: absolute;
-
     --color: @p(var(--lbry-teal-1), var(--lbry-orange-1), var(--lbry-cyan-3), var(--lbry-pink-5));
-
     --rule: (
       :doodle {
         @grid: 30x1 / 18vmin;
         --deg: @p(-180deg, 180deg);
       }
-
       :container {
         perspective: 30vmin;
       }
-
-      :before,
-      :after {
-        @place-cell: @r(100%) @r(100%);
-        @shape: star;
-        @size: @r(6px);
-        background-color: var(--color);
-        content: '';
+      :after, :before {
+        // content: '';
+        // background: var(--color); 
+        // @place-cell: @r(100%) @r(100%);
+        // @size: @r(6px);
+        // @shape: heart;
       }
-
+    
       @place-cell: center;
       @size: 100%;
-
-      animation: scale-up 12s linear infinite;
-      animation-delay: calc(-12s / @size() * @i());
-      background-image: @m100(
-        radial-gradient(var(--color) 50%, transparent 0)
+    
+      box-shadow: @m2(0 0 50px var(--color));
+      background: @m100(
+        radial-gradient(var(--color) 50%, transparent 0) 
         @r(-20%, 120%) @r(-20%, 100%) / 1px 1px
         no-repeat
       );
-      box-shadow: @m2(0 0 50px var(--color));
+    
       will-change: transform, opacity;
+      animation: scale-up 12s linear infinite;
+      animation-delay: calc(-12s / @size() * @i());
 
       @keyframes scale-up {
-        0%,
-        95.01%,
-        100% {
-          opacity: 0;
+        0%, 95.01%, 100% {
           transform: translateZ(0) rotate(0);
+          opacity: 0;
         }
-
-        10% {
-          opacity: 1;
+        10% { 
+          opacity: 1; 
         }
-
         95% {
-          transform: translateZ(35vmin) rotateZ(@var(--deg));
+          transform: 
+            translateZ(35vmin) rotateZ(@var(--deg));
         }
       }
     )
   }
 }
 
-.load-screen__actions {
-  font-size: 1.2em;
-  margin-top: var(--spacing-vertical-medium);
-}
+// .load-screen__actions {
+//   font-size: 1.2em;
+//   margin-top: var(--spacing-vertical-medium);
+// }
 
-.load-screen__button {
-  border-bottom: 1px solid $lbry-white;
-  color: $lbry-white;
-  transition: none;
+// .load-screen__button {
+//   border-bottom: 1px solid $lbry-white;
+//   color: $lbry-white;
+//   transition: none;
 
-  &:hover {
-    border-bottom: 1px solid $lbry-blue-1;
-    color: $lbry-blue-1;
-  }
-}
+//   &:hover {
+//     border-bottom: 1px solid $lbry-blue-1;
+//     color: $lbry-blue-1;
+//   }
+// }
 
-.load-screen__details {
-  font-weight: 600;
-  line-height: 1;
-  max-width: 400px;
-}
+// .load-screen__details {
+//   font-weight: 600;
+//   line-height: 1;
+//   max-width: 400px;
+// }
 
 .load-screen__header {
   display: flex;
@@ -96,55 +85,46 @@
   margin-bottom: var(--spacing-vertical-medium);
 }
 
-.load-screen__help {
-  font-size: 1.25rem;
-  padding-top: var(--spacing-vertical-large);
-}
-
-.load-screen__message {
-  font-size: 16px;
-  font-weight: 800;
-  line-height: 1;
-  margin-bottom: var(--spacing-vertical-medium);
-}
-
 .load-screen__overlay {
-  @include center;
-  width: 100vw; height: 100vh;
+  // @include center;
 
   color: $lbry-white;
   flex-direction: column;
+  align-items: center;
+  justify-content: center;
   position: relative;
   text-align: center;
   z-index: 1;
 }
 
 .load-screen__title {
-  font-size: 60px;
+  font-size: 40px;
   font-weight: 700;
   line-height: 1;
   position: relative;
+  color: $lbry-white;
+  position: absolute;
+  
+  // sup {
+  //   margin-left: -var(--spacing-vertical-tiny);
+  //   padding: var(--spacing-vertical-miniscule) var(--spacing-vertical-small);
 
-  sup {
-    margin-left: -var(--spacing-vertical-tiny);
-    padding: var(--spacing-vertical-miniscule) var(--spacing-vertical-small);
-
-    background-color: rgba($lbry-white, 0.3);
-    border-radius: 0.2rem;
-    color: $lbry-white;
-    font-size: 0.6rem;
-    font-weight: 400;
-    letter-spacing: 0.1rem;
-    line-height: 1;
-    position: absolute;
-    text-transform: uppercase;
-    top: 2.15rem;
-  }
+  //   background-color: rgba($lbry-white, 0.3);
+  //   border-radius: 0.2rem;
+  //   color: $lbry-white;
+  //   font-size: 0.6rem;
+  //   font-weight: 400;
+  //   letter-spacing: 0.1rem;
+  //   line-height: 1;
+  //   position: absolute;
+  //   text-transform: uppercase;
+  //   top: 1.5rem;
+  // }
 }
 
 
 
-.load-screen--help {
-  font-size: 14px;
-  padding-top: $spacing-vertical;
-}
+// .load-screen--help {
+//   font-size: 14px;
+//   padding-top: $spacing-vertical;
+// }

From 965fb5a2ba246a8e5168421da4f1f1ef302c6cea Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Wed, 29 May 2019 15:48:44 -0400
Subject: [PATCH 25/30] cleanup

---
 .prettierignore                               |   2 +-
 build/downloadDaemon.js                       |  10 +-
 package.json                                  |   1 +
 src/platforms/electron/createWindow.js        |   2 +-
 .../component/splash/internal/load-screen.jsx |  36 -----
 src/ui/component/splash/view.jsx              |  51 ++++---
 src/ui/scss/all.scss                          |   2 +-
 src/ui/scss/component/_load-screen.scss       | 130 ------------------
 src/ui/scss/component/_modal.scss             |   3 +-
 src/ui/scss/component/_splash.scss            |  91 ++++++++++++
 src/ui/scss/init/_vars.scss                   |   7 +-
 yarn.lock                                     |   5 +
 12 files changed, 142 insertions(+), 198 deletions(-)
 delete mode 100644 src/ui/component/splash/internal/load-screen.jsx
 delete mode 100644 src/ui/scss/component/_load-screen.scss
 create mode 100644 src/ui/scss/component/_splash.scss

diff --git a/.prettierignore b/.prettierignore
index cec9064c3..46bfc9b46 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1 +1 @@
-src/ui/scss/component/_load-screen.scss
+src/ui/scss/component/_splash.scss
diff --git a/build/downloadDaemon.js b/build/downloadDaemon.js
index b8221e632..878272343 100644
--- a/build/downloadDaemon.js
+++ b/build/downloadDaemon.js
@@ -24,14 +24,13 @@ const downloadDaemon = targetPlatform =>
     const daemonFilePath = path.join(daemonDir, daemonFileName);
     const daemonVersionPath = path.join(__dirname, 'daemon.ver');
     const tmpZipPath = path.join(__dirname, '..', 'dist', 'daemon.zip');
-    const daemonURL = daemonURLTemplate
-      .replace(/DAEMONVER/g, daemonVersion)
-      .replace(/OSNAME/g, daemonPlatform);
+    const daemonURL = daemonURLTemplate.replace(/DAEMONVER/g, daemonVersion).replace(/OSNAME/g, daemonPlatform);
 
     // If a daemon and daemon.ver exists, check to see if it matches the current daemon version
     const hasDaemonDownloaded = fs.existsSync(daemonFilePath);
     const hasDaemonVersion = fs.existsSync(daemonVersionPath);
     let downloadedDaemonVersion;
+
     if (hasDaemonVersion) {
       downloadedDaemonVersion = fs.readFileSync(daemonVersionPath, 'utf8');
     }
@@ -65,6 +64,7 @@ const downloadDaemon = targetPlatform =>
             })
         )
         .then(() => del(`${daemonFilePath}*`))
+        .then()
         .then(() =>
           decompress(tmpZipPath, daemonDir, {
             filter: file => path.basename(file.path) === daemonFileName,
@@ -80,9 +80,7 @@ const downloadDaemon = targetPlatform =>
           resolve('Done');
         })
         .catch(error => {
-          console.error(
-            `\x1b[31merror\x1b[0m Daemon download failed due to: \x1b[35m${error}\x1b[0m`
-          );
+          console.error(`\x1b[31merror\x1b[0m Daemon download failed due to: \x1b[35m${error}\x1b[0m`);
           reject(error);
         });
     }
diff --git a/package.json b/package.json
index c19c2f56a..43448d283 100644
--- a/package.json
+++ b/package.json
@@ -81,6 +81,7 @@
     "copy-webpack-plugin": "^4.6.0",
     "country-data": "^0.0.31",
     "cross-env": "^5.2.0",
+    "css-doodle": "^0.7.1",
     "css-loader": "^2.1.0",
     "cssnano": "^4.1.10",
     "dat.gui": "^0.7.2",
diff --git a/src/platforms/electron/createWindow.js b/src/platforms/electron/createWindow.js
index 584e6d536..90fd4df29 100644
--- a/src/platforms/electron/createWindow.js
+++ b/src/platforms/electron/createWindow.js
@@ -16,7 +16,7 @@ export default appState => {
   });
 
   const windowConfiguration = {
-    backgroundColor: '#2f9176',
+    backgroundColor: '#270f34', // Located in src/scss/init/_vars.scss `--color-background`
     minWidth: 950,
     minHeight: 600,
     autoHideMenuBar: true,
diff --git a/src/ui/component/splash/internal/load-screen.jsx b/src/ui/component/splash/internal/load-screen.jsx
deleted file mode 100644
index ca8fd95cd..000000000
--- a/src/ui/component/splash/internal/load-screen.jsx
+++ /dev/null
@@ -1,36 +0,0 @@
-// @flow
-import * as ICONS from 'constants/icons';
-import React, { Fragment } from 'react';
-import Icon from 'component/common/icon';
-import Spinner from 'component/spinner';
-import Button from 'component/button';
-// import Doodle from 'component/doodle';
-import 'css-doodle';
-
-type Props = {
-  message: string,
-  details: ?string,
-  isWarning: boolean,
-  error: boolean,
-};
-
-// const FancyDoodle = Doodle``; // this looks dumb but it prevents repetition from `_load-screen.scss`
-
-class LoadScreen extends React.PureComponent<Props> {
-  static defaultProps = {
-    isWarning: false,
-  };
-
-  render() {
-    const { details, message, isWarning, error } = this.props;
-
-    return (
-      <div className="load-screen">
-        <h1 className="load-screen__title">{__('LBRY')}</h1>
-        <css-doodle use="var(--rule)" />
-      </div>
-    );
-  }
-}
-
-export default LoadScreen;
diff --git a/src/ui/component/splash/view.jsx b/src/ui/component/splash/view.jsx
index 34b5116e6..be7eb0d37 100644
--- a/src/ui/component/splash/view.jsx
+++ b/src/ui/component/splash/view.jsx
@@ -1,14 +1,15 @@
 // @flow
-import * as React from 'react';
 import * as MODALS from 'constants/modal_types';
+import React from 'react';
 import { Lbry } from 'lbry-redux';
+import Button from 'component/button';
 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';
+import 'css-doodle';
 
-const ONE_MINUTE = 60 * 1000;
+const FORTY_FIVE_SECONDS = 45 * 1000;
 
 type Props = {
   checkDaemonVersion: () => Promise<any>,
@@ -87,7 +88,7 @@ export default class SplashScreen extends React.PureComponent<Props, State> {
     // If nothing changes after 1 minute, show the error message.
     this.timeout = setTimeout(() => {
       this.setState({ error: true });
-    }, ONE_MINUTE);
+    }, FORTY_FIVE_SECONDS);
   }
 
   updateStatus() {
@@ -170,14 +171,14 @@ export default class SplashScreen extends React.PureComponent<Props, State> {
     const { daemonVersionMatched, onReadyToLaunch } = this.props;
     const { isRunning, launchWithIncompatibleDaemon } = this.state;
 
-    // if (daemonVersionMatched) {
-    //   onReadyToLaunch();
-    // } else if (launchWithIncompatibleDaemon && isRunning) {
-    //   // The user may have decided to run the app with mismatched daemons
-    //   // They could make this decision before the daemon is finished starting up
-    //   // If it isn't running, this function will be called after the daemon is started
-    //   onReadyToLaunch();
-    // }
+    if (daemonVersionMatched) {
+      onReadyToLaunch();
+    } else if (launchWithIncompatibleDaemon && isRunning) {
+      // The user may have decided to run the app with mismatched daemons
+      // They could make this decision before the daemon is finished starting up
+      // If it isn't running, this function will be called after the daemon is started
+      onReadyToLaunch();
+    }
   }
 
   hasRecordedUser: boolean;
@@ -206,16 +207,32 @@ export default class SplashScreen extends React.PureComponent<Props, State> {
   }
 
   render() {
-    const { message, details, error } = this.state;
+    const { error } = this.state;
 
     return (
-      <React.Fragment>
-        <LoadScreen message={message} details={details} error={error} />
+      <div className="splash">
+        <css-doodle use="var(--rule)" />
+        <h1 className="splash__title">LBRY</h1>
+        {error && (
+          <div className="splash__error card card--section">
+            <h3>{__('Uh oh. The flux in our Retro Encabulator must be out of whack. Try refreshing to fix it.')}</h3>
+            <div className="splash__actions">
+              <Button button="primary" label={__('Refresh')} onClick={() => window.location.reload()} />
+            </div>
+            <div className="help">
+              <p>{__('If you still have issues, your anti-virus software or firewall may be preventing startup.')}</p>
+              <p>
+                {__('Reach out to hello@lbry.com for help, or check out')}{' '}
+                <Button button="link" href="https://lbry.com/faq/startup-troubleshooting" label="this link" />.
+              </p>
+            </div>
+          </div>
+        )}
         {/* 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. */}
+          in the modals won't work. */}
         {this.renderModals()}
-      </React.Fragment>
+      </div>
     );
   }
 }
diff --git a/src/ui/scss/all.scss b/src/ui/scss/all.scss
index bd7a12ae3..5088d6a1b 100644
--- a/src/ui/scss/all.scss
+++ b/src/ui/scss/all.scss
@@ -24,7 +24,6 @@
 @import 'component/header';
 @import 'component/icon';
 @import 'component/item-list';
-@import 'component/load-screen';
 @import 'component/main';
 @import 'component/markdown-editor';
 @import 'component/markdown-preview';
@@ -38,6 +37,7 @@
 @import 'component/search';
 @import 'component/snack-bar';
 @import 'component/spinner';
+@import 'component/splash';
 @import 'component/subscriptions';
 @import 'component/syntax-highlighter';
 @import 'component/table';
diff --git a/src/ui/scss/component/_load-screen.scss b/src/ui/scss/component/_load-screen.scss
deleted file mode 100644
index 79aeb6f44..000000000
--- a/src/ui/scss/component/_load-screen.scss
+++ /dev/null
@@ -1,130 +0,0 @@
-.load-screen {
-  width: 100vw;
-  height: 100vh;
-
-  align-items: center;
-  background-color: #270f34;
-  display: flex;
-  justify-content: center;
-  overflow: hidden;
-
-  css-doodle {
-    --color: @p(var(--lbry-teal-1), var(--lbry-orange-1), var(--lbry-cyan-3), var(--lbry-pink-5));
-    --rule: (
-      :doodle {
-        @grid: 30x1 / 18vmin;
-        --deg: @p(-180deg, 180deg);
-      }
-      :container {
-        perspective: 30vmin;
-      }
-      :after, :before {
-        // content: '';
-        // background: var(--color); 
-        // @place-cell: @r(100%) @r(100%);
-        // @size: @r(6px);
-        // @shape: heart;
-      }
-    
-      @place-cell: center;
-      @size: 100%;
-    
-      box-shadow: @m2(0 0 50px var(--color));
-      background: @m100(
-        radial-gradient(var(--color) 50%, transparent 0) 
-        @r(-20%, 120%) @r(-20%, 100%) / 1px 1px
-        no-repeat
-      );
-    
-      will-change: transform, opacity;
-      animation: scale-up 12s linear infinite;
-      animation-delay: calc(-12s / @size() * @i());
-
-      @keyframes scale-up {
-        0%, 95.01%, 100% {
-          transform: translateZ(0) rotate(0);
-          opacity: 0;
-        }
-        10% { 
-          opacity: 1; 
-        }
-        95% {
-          transform: 
-            translateZ(35vmin) rotateZ(@var(--deg));
-        }
-      }
-    )
-  }
-}
-
-// .load-screen__actions {
-//   font-size: 1.2em;
-//   margin-top: var(--spacing-vertical-medium);
-// }
-
-// .load-screen__button {
-//   border-bottom: 1px solid $lbry-white;
-//   color: $lbry-white;
-//   transition: none;
-
-//   &:hover {
-//     border-bottom: 1px solid $lbry-blue-1;
-//     color: $lbry-blue-1;
-//   }
-// }
-
-// .load-screen__details {
-//   font-weight: 600;
-//   line-height: 1;
-//   max-width: 400px;
-// }
-
-.load-screen__header {
-  display: flex;
-  justify-content: center;
-  margin-bottom: var(--spacing-vertical-medium);
-}
-
-.load-screen__overlay {
-  // @include center;
-
-  color: $lbry-white;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  position: relative;
-  text-align: center;
-  z-index: 1;
-}
-
-.load-screen__title {
-  font-size: 40px;
-  font-weight: 700;
-  line-height: 1;
-  position: relative;
-  color: $lbry-white;
-  position: absolute;
-  
-  // sup {
-  //   margin-left: -var(--spacing-vertical-tiny);
-  //   padding: var(--spacing-vertical-miniscule) var(--spacing-vertical-small);
-
-  //   background-color: rgba($lbry-white, 0.3);
-  //   border-radius: 0.2rem;
-  //   color: $lbry-white;
-  //   font-size: 0.6rem;
-  //   font-weight: 400;
-  //   letter-spacing: 0.1rem;
-  //   line-height: 1;
-  //   position: absolute;
-  //   text-transform: uppercase;
-  //   top: 1.5rem;
-  // }
-}
-
-
-
-// .load-screen--help {
-//   font-size: 14px;
-//   padding-top: $spacing-vertical;
-// }
diff --git a/src/ui/scss/component/_modal.scss b/src/ui/scss/component/_modal.scss
index c90961be2..c971123b0 100644
--- a/src/ui/scss/component/_modal.scss
+++ b/src/ui/scss/component/_modal.scss
@@ -90,8 +90,7 @@
 
 .error-modal__content {
   display: flex;
-  padding: 0 var(--spacing-vertical-medium) var(--spacing-vertical-medium)
-    var(--spacing-vertical-medium);
+  padding: 0 var(--spacing-vertical-medium) var(--spacing-vertical-medium) var(--spacing-vertical-medium);
 }
 
 .error-modal__warning-symbol {
diff --git a/src/ui/scss/component/_splash.scss b/src/ui/scss/component/_splash.scss
new file mode 100644
index 000000000..5d61642ff
--- /dev/null
+++ b/src/ui/scss/component/_splash.scss
@@ -0,0 +1,91 @@
+//
+// Formatting is ignored for this file because css-doodle requires that the styles be in a specific shape 
+//
+.splash {
+  width: 100vw;
+  height: 100vh;
+
+  align-items: center;
+  background-color: var(--color-background);
+  display: flex;
+  justify-content: center;
+  overflow: hidden;
+
+  css-doodle {
+    z-index: 0;
+    
+    --color: @p(var(--lbry-teal-1), var(--lbry-orange-1), var(--lbry-cyan-3), var(--lbry-pink-5));
+    --rule: (
+      :doodle {
+        @grid: 30x1 / 18vmin;
+        --deg: @p(-180deg, 180deg);
+      }
+      :container {
+        perspective: 30vmin;
+      }
+    
+      @place-cell: center;
+      @size: 100%;
+    
+      box-shadow: @m2(0 0 50px var(--color));
+      background: @m100(
+        radial-gradient(var(--color) 50%, transparent 0) 
+        @r(-20%, 120%) @r(-20%, 100%) / 1px 1px
+        no-repeat
+      );
+    
+      will-change: transform, opacity;
+      animation: scale-up 12s linear infinite;
+      animation-delay: calc(-12s / @size() * @i());
+
+      @keyframes scale-up {
+        0%, 95.01%, 100% {
+          transform: translateZ(0) rotate(0);
+          opacity: 0;
+        }
+        10% { 
+          opacity: 1; 
+        }
+        95% {
+          transform: 
+            translateZ(35vmin) rotateZ(@var(--deg));
+        }
+      }
+    )
+  }
+}
+
+.splash__actions {
+  margin-top: var(--spacing-vertical-medium);
+}
+
+.splash__button {
+  border-bottom: 1px solid $lbry-white;
+  color: $lbry-white;
+  transition: none;
+
+  &:hover {
+    border-bottom: 1px solid $lbry-blue-1;
+    color: $lbry-blue-1;
+  }
+}
+
+.splash__details {
+  font-weight: 600;
+  line-height: 1;
+  max-width: 400px;
+}
+
+.splash__title {
+  position: absolute;
+  font-size: 40px;
+  line-height: 1;
+  font-weight: 700;
+  color: $lbry-white;
+}
+
+.splash__error {
+  position: absolute;
+  margin-top: 25rem;
+  box-shadow: var(--card-box-shadow) $lbry-gray-5;
+}
\ No newline at end of file
diff --git a/src/ui/scss/init/_vars.scss b/src/ui/scss/init/_vars.scss
index ae5a3129e..1bdebafab 100644
--- a/src/ui/scss/init/_vars.scss
+++ b/src/ui/scss/init/_vars.scss
@@ -9,7 +9,6 @@ $large-breakpoint: 1921px;
   // Width & spacing
   --side-nav-width: 180px;
   --font-size-subtext-multiple: 0.92;
-
   --spacing-vertical-miniscule: calc(2rem / 5);
   --spacing-vertical-tiny: calc(2rem / 4);
   --spacing-vertical-small: calc(2rem / 3);
@@ -17,15 +16,15 @@ $large-breakpoint: 1921px;
   --spacing-vertical-large: 2rem;
   --spacing-vertical-xlarge: 3rem;
   --spacing-main-padding: var(--spacing-vertical-xlarge);
-
   --file-page-max-width: 1787px;
   --file-max-height: 788px;
   --file-max-width: 1400px;
-
   --video-aspect-ratio: 56.25%; // 9 x 16
-
   --channel-thumbnail-size: 10rem;
 
+  // Color
+  --color-background: #270f34;
+
   // Text
   --text-max-width: 660px;
   --text-link-padding: 4px;
diff --git a/yarn.lock b/yarn.lock
index 9d3cb337d..fc556c0eb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3001,6 +3001,11 @@ css-declaration-sorter@^4.0.1:
     postcss "^7.0.1"
     timsort "^0.3.0"
 
+css-doodle@^0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/css-doodle/-/css-doodle-0.7.1.tgz#477466310df6554ec5182349745194ba37415670"
+  integrity sha512-TRs+7YLgP/yc0EdrL5Us2GRHbhIgf4GsQWAt5WdRxr5pwwpWl8Q9jZle431Z/5u5C29jiEoItjIaKE84xFh+kA==
+
 css-hot-loader@^1.4.3:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/css-hot-loader/-/css-hot-loader-1.4.4.tgz#ae784932cd8b7d092f7f15702af08b3ec9436052"

From 7e044788f2a69022037b62582e7defa61c3ad7c5 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Wed, 5 Jun 2019 00:14:15 -0400
Subject: [PATCH 26/30] fix build

---
 .prettierignore                    |  1 -
 src/ui/component/splash/view.jsx   | 38 +++++++++++++++++++--
 src/ui/scss/component/_splash.scss | 55 +++---------------------------
 3 files changed, 41 insertions(+), 53 deletions(-)
 delete mode 100644 .prettierignore

diff --git a/.prettierignore b/.prettierignore
deleted file mode 100644
index 46bfc9b46..000000000
--- a/.prettierignore
+++ /dev/null
@@ -1 +0,0 @@
-src/ui/scss/component/_splash.scss
diff --git a/src/ui/component/splash/view.jsx b/src/ui/component/splash/view.jsx
index be7eb0d37..6ff0d45cf 100644
--- a/src/ui/component/splash/view.jsx
+++ b/src/ui/component/splash/view.jsx
@@ -211,12 +211,46 @@ export default class SplashScreen extends React.PureComponent<Props, State> {
 
     return (
       <div className="splash">
-        <css-doodle use="var(--rule)" />
+        <css-doodle>
+          {`
+            --color: @p(var(--lbry-teal-1), var(--lbry-orange-1), var(--lbry-cyan-3), var(--lbry-pink-5));
+            :doodle {
+              @grid: 30x1 / 18vmin;
+              --deg: @p(-180deg, 180deg);
+            }
+            :container {
+              perspective: 30vmin;
+            }
+          
+            @place-cell: center;
+            @size: 100%;
+          
+            box-shadow: @m2(0 0 50px var(--color));            
+            will-change: transform, opacity;
+            animation: scale-up 12s linear infinite;
+            animation-delay: calc(-12s / @size() * @i());
+
+            @keyframes scale-up {
+              0%, 95.01%, 100% {
+                transform: translateZ(0) rotate(0);
+                opacity: 0;
+              }
+              10% { 
+                opacity: 1; 
+              }
+              95% {
+                transform: 
+                  translateZ(35vmin) rotateZ(@var(--deg));
+              }
+            }
+          )
+          `}
+        </css-doodle>
         <h1 className="splash__title">LBRY</h1>
         {error && (
           <div className="splash__error card card--section">
             <h3>{__('Uh oh. The flux in our Retro Encabulator must be out of whack. Try refreshing to fix it.')}</h3>
-            <div className="splash__actions">
+            <div className="card__actions--top-space card__actions--center">
               <Button button="primary" label={__('Refresh')} onClick={() => window.location.reload()} />
             </div>
             <div className="help">
diff --git a/src/ui/scss/component/_splash.scss b/src/ui/scss/component/_splash.scss
index 5d61642ff..8a581aa84 100644
--- a/src/ui/scss/component/_splash.scss
+++ b/src/ui/scss/component/_splash.scss
@@ -1,6 +1,3 @@
-//
-// Formatting is ignored for this file because css-doodle requires that the styles be in a specific shape 
-//
 .splash {
   width: 100vw;
   height: 100vh;
@@ -10,54 +7,12 @@
   display: flex;
   justify-content: center;
   overflow: hidden;
-
-  css-doodle {
-    z-index: 0;
-    
-    --color: @p(var(--lbry-teal-1), var(--lbry-orange-1), var(--lbry-cyan-3), var(--lbry-pink-5));
-    --rule: (
-      :doodle {
-        @grid: 30x1 / 18vmin;
-        --deg: @p(-180deg, 180deg);
-      }
-      :container {
-        perspective: 30vmin;
-      }
-    
-      @place-cell: center;
-      @size: 100%;
-    
-      box-shadow: @m2(0 0 50px var(--color));
-      background: @m100(
-        radial-gradient(var(--color) 50%, transparent 0) 
-        @r(-20%, 120%) @r(-20%, 100%) / 1px 1px
-        no-repeat
-      );
-    
-      will-change: transform, opacity;
-      animation: scale-up 12s linear infinite;
-      animation-delay: calc(-12s / @size() * @i());
-
-      @keyframes scale-up {
-        0%, 95.01%, 100% {
-          transform: translateZ(0) rotate(0);
-          opacity: 0;
-        }
-        10% { 
-          opacity: 1; 
-        }
-        95% {
-          transform: 
-            translateZ(35vmin) rotateZ(@var(--deg));
-        }
-      }
-    )
-  }
 }
 
-.splash__actions {
-  margin-top: var(--spacing-vertical-medium);
-}
+// .splash__actions {
+//   margin-top: var(--spacing-vertical-medium);
+//   align-items: center;
+// }
 
 .splash__button {
   border-bottom: 1px solid $lbry-white;
@@ -88,4 +43,4 @@
   position: absolute;
   margin-top: 25rem;
   box-shadow: var(--card-box-shadow) $lbry-gray-5;
-}
\ No newline at end of file
+}

From 24bc21aecca06d2171f46a16e62ef4fc490d63da Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Wed, 5 Jun 2019 01:15:43 -0400
Subject: [PATCH 27/30] fix typo

---
 src/ui/component/errorBoundary/view.jsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/ui/component/errorBoundary/view.jsx b/src/ui/component/errorBoundary/view.jsx
index fb7132a8b..6e6c8d092 100644
--- a/src/ui/component/errorBoundary/view.jsx
+++ b/src/ui/component/errorBoundary/view.jsx
@@ -53,9 +53,9 @@ class ErrorBoundary extends React.Component<Props, State> {
 
   log(message) {
     declare var app: { env: string };
-    // if (app.env === 'production') {
-    Lbryio.call('event', 'desktop_error', { error_message: message });
-    // }
+    if (app.env === 'production') {
+      Lbryio.call('event', 'desktop_error', { error_message: message });
+    }
   }
 
   refresh() {

From f62cbcbcb96e65d0702e15f2556543a6ad19e826 Mon Sep 17 00:00:00 2001
From: Thomas Zarebczan <tzarebczan@users.noreply.github.com>
Date: Wed, 5 Jun 2019 17:30:02 -0400
Subject: [PATCH 28/30] update api url (#2536)

Update api url to api.lbry.tv
---
 src/ui/component/viewers/videoViewer.jsx | 2 +-
 src/ui/index.jsx                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ui/component/viewers/videoViewer.jsx b/src/ui/component/viewers/videoViewer.jsx
index 8599afdce..9787e7f6d 100644
--- a/src/ui/component/viewers/videoViewer.jsx
+++ b/src/ui/component/viewers/videoViewer.jsx
@@ -28,7 +28,7 @@ class AudioVideoViewer extends React.PureComponent<Props> {
     // Will need to be changed to include time to start
     analytics.apiLogView(`${name}#${claimId}`, `${txid}:${nout}`, claimId);
 
-    const path = `https://api.piratebay.com/content/claims/${claim.name}/${claim.claim_id}/stream.mp4`;
+    const path = `https://api.lbry.tv/content/claims/${claim.name}/${claim.claim_id}/stream.mp4`;
     const sources = [
       {
         src: path,
diff --git a/src/ui/index.jsx b/src/ui/index.jsx
index a928ebd7d..9ad9d0491 100644
--- a/src/ui/index.jsx
+++ b/src/ui/index.jsx
@@ -44,7 +44,7 @@ if (process.env.SEARCH_API_URL) {
 }
 
 // @if TARGET='web'
-const SDK_API_URL = process.env.SDK_API_URL || 'https://api.piratebay.com/api/proxy';
+const SDK_API_URL = process.env.SDK_API_URL || 'https://api.lbry.tv/api/proxy';
 Lbry.setDaemonConnectionString(SDK_API_URL);
 // @endif
 

From 601c081f1033fafeb0b381b7caa1bfd9de4ce5e2 Mon Sep 17 00:00:00 2001
From: Jessop Breth <jessop@lbry.com>
Date: Wed, 29 May 2019 13:40:57 -0400
Subject: [PATCH 29/30] auth header token

---
 package.json     | 2 +-
 src/ui/index.jsx | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 43448d283..d0bcaefe6 100644
--- a/package.json
+++ b/package.json
@@ -119,7 +119,7 @@
     "jsmediatags": "^3.8.1",
     "json-loader": "^0.5.4",
     "lbry-format": "https://github.com/lbryio/lbry-format.git",
-    "lbry-redux": "lbryio/lbry-redux#02f6918238110726c0b3b4248c61a84ac0b969e3",
+    "lbry-redux": "lbryio/lbry-redux#ed94218cdb3409b963aec136ffe3c11c9e3bc875",
     "lbryinc": "lbryio/lbryinc#43d382d9b74d396a581a74d87e4c53105e04f845",
     "lint-staged": "^7.0.2",
     "localforage": "^1.7.1",
diff --git a/src/ui/index.jsx b/src/ui/index.jsx
index 9ad9d0491..c3d073c5d 100644
--- a/src/ui/index.jsx
+++ b/src/ui/index.jsx
@@ -89,6 +89,7 @@ Lbryio.setOverride(
   () =>
     new Promise(resolve => {
       if (authToken) {
+        Lbry.setApiHeader('X-Lbry-Auth-Token', authToken);
         resolve(authToken);
       } else {
         // @if TARGET='app'
@@ -101,6 +102,10 @@ Lbryio.setOverride(
         // @endif
         // @if TARGET='web'
         const { auth_token: authToken } = cookie.parse(document.cookie);
+
+        if (authToken) {
+          Lbry.setApiHeader('X-Lbry-Auth-Token', authToken);
+        }
         resolve(authToken);
         // @endif
       }

From b75732f19c1d976e39691a18a7de1d2f8808a128 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Thu, 6 Jun 2019 17:44:24 -0400
Subject: [PATCH 30/30] Revert "app uses auth token header"

---
 package.json     | 2 +-
 src/ui/index.jsx | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/package.json b/package.json
index d0bcaefe6..43448d283 100644
--- a/package.json
+++ b/package.json
@@ -119,7 +119,7 @@
     "jsmediatags": "^3.8.1",
     "json-loader": "^0.5.4",
     "lbry-format": "https://github.com/lbryio/lbry-format.git",
-    "lbry-redux": "lbryio/lbry-redux#ed94218cdb3409b963aec136ffe3c11c9e3bc875",
+    "lbry-redux": "lbryio/lbry-redux#02f6918238110726c0b3b4248c61a84ac0b969e3",
     "lbryinc": "lbryio/lbryinc#43d382d9b74d396a581a74d87e4c53105e04f845",
     "lint-staged": "^7.0.2",
     "localforage": "^1.7.1",
diff --git a/src/ui/index.jsx b/src/ui/index.jsx
index c3d073c5d..9ad9d0491 100644
--- a/src/ui/index.jsx
+++ b/src/ui/index.jsx
@@ -89,7 +89,6 @@ Lbryio.setOverride(
   () =>
     new Promise(resolve => {
       if (authToken) {
-        Lbry.setApiHeader('X-Lbry-Auth-Token', authToken);
         resolve(authToken);
       } else {
         // @if TARGET='app'
@@ -102,10 +101,6 @@ Lbryio.setOverride(
         // @endif
         // @if TARGET='web'
         const { auth_token: authToken } = cookie.parse(document.cookie);
-
-        if (authToken) {
-          Lbry.setApiHeader('X-Lbry-Auth-Token', authToken);
-        }
         resolve(authToken);
         // @endif
       }