From 5f2312295c210273c9ab599f228b0f1bf0c52597 Mon Sep 17 00:00:00 2001
From: Job Evers-Meltzer <jobevers@users.noreply.github.com>
Date: Tue, 17 Jan 2017 21:36:32 -0600
Subject: [PATCH 1/4] fix typo in proptypes

---
 js/component/file-actions.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/component/file-actions.js b/js/component/file-actions.js
index 9e9ccc12e..df203a467 100644
--- a/js/component/file-actions.js
+++ b/js/component/file-actions.js
@@ -61,7 +61,7 @@ export let FileActions = React.createClass({
     path: React.PropTypes.string,
     hidden: React.PropTypes.bool,
     deleteChecked: React.PropTypes.bool,
-    onRemove: React.PropTypes.function,
+    onRemove: React.PropTypes.func,
   },
   getInitialState: function() {
     return {
@@ -218,4 +218,4 @@ export let FileActions = React.createClass({
       </section>
     );
   }
-});
\ No newline at end of file
+});

From 416641982378c260c5e7858aba2aa27f783fd22b Mon Sep 17 00:00:00 2001
From: Job Evers-Meltzer <jobevers@users.noreply.github.com>
Date: Tue, 17 Jan 2017 21:36:48 -0600
Subject: [PATCH 2/4] fix missing Icon import

---
 js/component/form.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/js/component/form.js b/js/component/form.js
index 27a7c977a..ae4135a29 100644
--- a/js/component/form.js
+++ b/js/component/form.js
@@ -1,4 +1,5 @@
 import React from 'react';
+import {Icon} from './common.js';
 
 var requiredFieldWarningStyle = {
   color: '#cc0000',

From 22c4f41066eb208e642f0575c1a1cd919974356f Mon Sep 17 00:00:00 2001
From: Job Evers-Meltzer <jobevers@users.noreply.github.com>
Date: Tue, 17 Jan 2017 21:37:24 -0600
Subject: [PATCH 3/4] fix errorcallback in publish

---
 js/lbry.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/js/lbry.js b/js/lbry.js
index 12ba61707..65fb4e821 100644
--- a/js/lbry.js
+++ b/js/lbry.js
@@ -308,12 +308,7 @@ lbry.publish = function(params, fileListedCallback, publishedCallback, errorCall
   // lbry.getFilesInfo() during the publish process.
 
   // Use ES6 named arguments instead of directly passing param dict?
-  lbry.call('publish', params, publishedCallback, (errorInfo) => {
-    errorCallback({
-      name: fault.fault,
-      message: fault.faultString,
-    });
-  });
+  lbry.call('publish', params, publishedCallback, errorCallback);
   if (fileListedCallback) {
     lbry.getFileInfoWhenListed(params.name, function(fileInfo) {
       fileListedCallback(fileInfo);

From f1b2d0d62d4fc89e15a779ce0d831723196b16f4 Mon Sep 17 00:00:00 2001
From: Job Evers-Meltzer <jobevers@users.noreply.github.com>
Date: Tue, 17 Jan 2017 21:57:16 -0600
Subject: [PATCH 4/4] ensure that content_type exists

---
 js/component/file-actions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/component/file-actions.js b/js/component/file-actions.js
index df203a467..ec4a14e06 100644
--- a/js/component/file-actions.js
+++ b/js/component/file-actions.js
@@ -191,7 +191,7 @@ export let FileActions = React.createClass({
 
     return (
       <section className="file-actions">
-        {this.props.metadata.content_type.startsWith('video/') ? <WatchLink streamName={this.props.streamName} /> : null}
+        {(this.props.metadata.content_type && this.props.metadata.content_type.startsWith('video/')) ? <WatchLink streamName={this.props.streamName} /> : null}
         {this.state.fileInfo !== null || this.state.fileInfo.isMine ?
           <div className="button-container">{linkBlock}</div>
           : null}