From 662cf9c906653b8d0a494c9be7db6adee608fc03 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Fri, 20 Dec 2019 11:26:55 -0500
Subject: [PATCH] fix tray icons, download icons, and fix embed route

---
 electron-builder.json                   | 10 ++++++++++
 electron/createWindow.js                |  6 +++---
 lbrytv/src/routes.js                    |  2 +-
 package.json                            |  2 +-
 ui/scss/component/_file-properties.scss |  1 -
 ui/util/lbrytv.js                       |  2 +-
 6 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/electron-builder.json b/electron-builder.json
index 2b9f07819..0c08881c2 100644
--- a/electron-builder.json
+++ b/electron-builder.json
@@ -19,6 +19,16 @@
       "from": "./static/daemon/",
       "to": "static/daemon/",
       "filter": ["**/*"]
+    },
+    {
+      "from": "./static/img",
+      "to": "static/img",
+      "filter": ["**/*"]
+    },
+    {
+      "from": "./static/font",
+      "to": "static/font",
+      "filter": ["**/*"]
     }
   ],
   "publish": [
diff --git a/electron/createWindow.js b/electron/createWindow.js
index 64e680114..39a3d1d54 100644
--- a/electron/createWindow.js
+++ b/electron/createWindow.js
@@ -32,7 +32,7 @@ export default appState => {
     // If state is undefined, create window as maximized.
     width: windowState.width === undefined ? width : windowState.width,
     height: windowState.height === undefined ? height : windowState.height,
-    icon: 'static/img/tray/windows/tray.png',
+    icon: 'static/img/tray/default/tray.png',
     webPreferences: {
       // Disable renderer process's webSecurity on development to enable CORS.
       webSecurity: !isDev,
@@ -133,8 +133,8 @@ export default appState => {
 
   // A backup incase https://github.com/electron/electron/issues/7779 happens
   window.webContents.once('dom-ready', () => {
-    startMinimized && window.hide()
-  })
+    startMinimized && window.hide();
+  });
 
   window.webContents.on('did-finish-load', () => {
     window.webContents.session.setUserAgent(`LBRY/${app.getVersion()}`);
diff --git a/lbrytv/src/routes.js b/lbrytv/src/routes.js
index cd04ab6d6..50e153194 100644
--- a/lbrytv/src/routes.js
+++ b/lbrytv/src/routes.js
@@ -6,7 +6,7 @@ const send = require('koa-send');
 
 const router = new Router();
 
-router.get(`/embed/:claimName/:claimId`, async ctx => {
+router.get(`/$/embed/:claimName/:claimId`, async ctx => {
   const { claimName, claimId } = ctx.params;
   const streamUrl = generateStreamUrl(claimName, claimId, LBRY_TV_API);
   ctx.redirect(streamUrl);
diff --git a/package.json b/package.json
index 763845505..7f3742cc5 100644
--- a/package.json
+++ b/package.json
@@ -205,7 +205,7 @@
     "yarn": "^1.3"
   },
   "lbrySettings": {
-    "lbrynetDaemonVersion": "0.50.0",
+    "lbrynetDaemonVersion": "0.50.1",
     "lbrynetDaemonUrlTemplate": "https://github.com/lbryio/lbry/releases/download/vDAEMONVER/lbrynet-OSNAME.zip",
     "lbrynetDaemonDir": "static/daemon",
     "lbrynetDaemonFileName": "lbrynet"
diff --git a/ui/scss/component/_file-properties.scss b/ui/scss/component/_file-properties.scss
index dbe612578..3101965e2 100644
--- a/ui/scss/component/_file-properties.scss
+++ b/ui/scss/component/_file-properties.scss
@@ -7,7 +7,6 @@
 
   .icon {
     margin-bottom: -1px;
-    stroke: var(--color-subtitle);
   }
 
   & > *:not(:last-child) {
diff --git a/ui/util/lbrytv.js b/ui/util/lbrytv.js
index 2b75e84af..b70dcf5f4 100644
--- a/ui/util/lbrytv.js
+++ b/ui/util/lbrytv.js
@@ -6,7 +6,7 @@ function generateStreamUrl(claimName, claimId, apiUrl) {
 }
 
 function generateEmbedUrl(claimName, claimId) {
-  return `${URL}/embed/${claimName}/${claimId}`;
+  return `${URL}/$/embed/${claimName}/${claimId}`;
 }
 
 // module.exports needed since the web server imports this function