From 3e35d449783dc6017d563fb81d5fc15eaf037e0c Mon Sep 17 00:00:00 2001
From: Alex Liebowitz <alex@alexliebowitz.com>
Date: Wed, 17 May 2017 04:10:25 -0400
Subject: [PATCH 1/2] Basics of conversion to ES6 classes

---
 ui/js/component/auth.js        | 167 ++++++++++++++++-------------
 ui/js/component/common.js      | 145 ++++++++++++++-----------
 ui/js/component/form.js        | 112 +++++++++++--------
 ui/js/component/load_screen.js |  31 +++---
 ui/js/component/menu.js        |  59 +++++-----
 ui/js/component/modal-page.js  |   8 +-
 ui/js/component/modal.js       |  68 ++++++------
 ui/js/component/notice.js      |  22 ++--
 ui/js/component/reward-link.js |  48 +++++----
 ui/js/component/snack-bar.js   |  38 ++++---
 ui/js/component/splash.js      |  37 ++++---
 ui/js/component/tooltip.js     |  30 +++---
 ui/js/page/developer.js        |  35 +++---
 ui/js/page/help/view.jsx       |  25 +++--
 ui/js/page/publish/view.jsx    | 189 +++++++++++++++++++--------------
 ui/js/page/report.js           |  31 +++---
 ui/js/page/rewards.js          |  40 ++++---
 ui/js/page/settings/view.jsx   | 110 ++++++++++---------
 ui/js/page/start.js            |  11 +-
 19 files changed, 684 insertions(+), 522 deletions(-)

diff --git a/ui/js/component/auth.js b/ui/js/component/auth.js
index 261b065b1..df18b0817 100644
--- a/ui/js/component/auth.js
+++ b/ui/js/component/auth.js
@@ -9,23 +9,28 @@ import {CreditAmount, Address} from "../component/common.js";
 import {getLocal, getSession, setSession, setLocal} from '../utils.js';
 
 
-const SubmitEmailStage = React.createClass({
-  getInitialState: function() {
-    return {
+class SubmitEmailStage extends React.Component {
+  constructor(props) {
+    super(props);
+
+    this.state = {
       rewardType: null,
       email: '',
       submitting: false
     };
-  },
-  handleEmailChanged: function(event) {
+  }
+
+  handleEmailChanged(event) {
     this.setState({
       email: event.target.value,
     });
-  },
-  onEmailSaved: function(email) {
+  }
+
+  onEmailSaved(email) {
     this.props.setStage("confirm", { email: email })
-  },
-  handleSubmit: function(event) {
+  }
+
+  handleSubmit(event) {
     event.preventDefault();
 
     this.setState({
@@ -42,8 +47,9 @@ const SubmitEmailStage = React.createClass({
       }
       this.setState({ submitting: false });
     });
-  },
-  render: function() {
+  }
+
+  render() {
     return (
       <section>
         <form onSubmit={this.handleSubmit}>
@@ -57,23 +63,27 @@ const SubmitEmailStage = React.createClass({
       </section>
     );
   }
-});
+}
 
-const ConfirmEmailStage = React.createClass({
-  getInitialState: function() {
-    return {
+class ConfirmEmailStage extends React.Component {
+  constructor(props) {
+    super(props);
+
+    this.state = {
       rewardType: null,
       code: '',
       submitting: false,
       errorMessage: null,
     };
-  },
-  handleCodeChanged: function(event) {
+  }
+
+  handleCodeChanged(event) {
     this.setState({
       code: event.target.value,
     });
-  },
-  handleSubmit: function(event) {
+  }
+
+  handleSubmit(event) {
     event.preventDefault();
     this.setState({
       submitting: true,
@@ -93,8 +103,9 @@ const ConfirmEmailStage = React.createClass({
         onSubmitError(new Error("Your email is still not verified.")) //shouldn't happen?
       }
     }, onSubmitError);
-  },
-  render: function() {
+  }
+
+  render() {
     return (
       <section>
         <form onSubmit={this.handleSubmit}>
@@ -111,25 +122,26 @@ const ConfirmEmailStage = React.createClass({
       </section>
     );
   }
-});
+}
 
-const WelcomeStage = React.createClass({
-  propTypes: {
-    endAuth: React.PropTypes.func,
-  },
-  getInitialState: function() {
-    return {
+class WelcomeStage extends React.Component {
+  constructor(props) {
+    super(props);
+
+    this.state = {
       hasReward: false,
       rewardAmount: null,
-    }
-  },
-  onRewardClaim: function(reward) {
+    };
+  }
+
+  onRewardClaim(reward) {
     this.setState({
       hasReward: true,
       rewardAmount: reward.amount
     })
-  },
-  render: function() {
+  }
+
+  render() {
     return (
       !this.state.hasReward ?
         <Modal type="custom" isOpen={true} contentLabel="Welcome to LBRY" {...this.props}>
@@ -156,11 +168,13 @@ const WelcomeStage = React.createClass({
       </Modal>
     );
   }
-});
+}
+WelcomeStage.propTypes = {
+  endAuth: React.PropTypes.func,
+};
 
-
-const ErrorStage = React.createClass({
-  render: function() {
+class ErrorStage extends React.Component {
+  render() {
     return (
       <section>
         <p>An error was encountered that we cannot continue from.</p>
@@ -170,29 +184,32 @@ const ErrorStage = React.createClass({
       </section>
     );
   }
-});
+}
 
-const PendingStage = React.createClass({
-  render: function() {
+class PendingStage extends React.Component {
+  render() {
     return (
       <section>
         <p>Preparing for first access <span className="busy-indicator"></span></p>
       </section>
     );
   }
-});
+}
 
 
-const CodeRequiredStage = React.createClass({
-  _balanceSubscribeId: null,
-  getInitialState: function() {
-    return {
+class CodeRequiredStage extends React.Component {
+  constructor(props) {
+    super(props);
+
+    this._balanceSubscribeId = nullp
+
+    this.state = {
       balance: 0,
       address: getLocal('wallet_address')
-    }
-  },
+    };
+  }
 
-  componentWillMount: function() {
+  componentWillMount() {
     this._balanceSubscribeId = lbry.balanceSubscribe((balance) => {
       this.setState({
         balance: balance
@@ -205,13 +222,15 @@ const CodeRequiredStage = React.createClass({
         this.setState({ address: address });
       });
     }
-  },
-  componentWillUnmount: function() {
+  }
+
+  componentWillUnmount() {
     if (this._balanceSubscribeId) {
       lbry.balanceUnsubscribe(this._balanceSubscribeId)
     }
-  },
-  render: function() {
+  }
+
+  render() {
     const disabled = this.state.balance < 1;
     return (
       <div>
@@ -234,31 +253,36 @@ const CodeRequiredStage = React.createClass({
       </div>
     );
   }
-});
+}
 
 
-export const AuthOverlay = React.createClass({
-  _stages: {
-    pending: PendingStage,
-    error: ErrorStage,
-    nocode: CodeRequiredStage,
-    email: SubmitEmailStage,
-    confirm: ConfirmEmailStage,
-    welcome: WelcomeStage
-  },
-  getInitialState: function() {
-    return {
+export class AuthOverlay extends React.Component {
+  constructor(props) {
+    super(props);
+
+    this._stages = {
+      pending: PendingStage,
+      error: ErrorStage,
+      nocode: CodeRequiredStage,
+      email: SubmitEmailStage,
+      confirm: ConfirmEmailStage,
+      welcome: WelcomeStage
+    }
+
+    this.state = {
       stage: "pending",
       stageProps: {}
     };
-  },
-  setStage: function(stage, stageProps = {}) {
+  }
+
+  setStage(stage, stageProps = {}) {
     this.setState({
       stage: stage,
       stageProps: stageProps
     })
-  },
-  componentWillMount: function() {
+  }
+
+  componentWillMount() {
     lbryio.authenticate().then((user) => {
       if (!user.HasVerifiedEmail) {
         if (getLocal('auth_bypassed')) {
@@ -284,8 +308,9 @@ export const AuthOverlay = React.createClass({
         }
       }));
     })
-  },
-  render: function() {
+  }
+
+  render() {
     if (!this.state.stage) {
         return null;
     }
@@ -299,4 +324,4 @@ export const AuthOverlay = React.createClass({
           <StageContent setStage={this.setStage} {...this.state.stageProps}  />
     );
   }
-});
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/ui/js/component/common.js b/ui/js/component/common.js
index aac91004a..d2e05d6f6 100644
--- a/ui/js/component/common.js
+++ b/ui/js/component/common.js
@@ -2,65 +2,69 @@ import React from 'react';
 import lbry from '../lbry.js';
 
 //component/icon.js
-export let Icon = React.createClass({
-  propTypes: {
+export class Icon extends React.Component {
+  static propTypes = {
     icon: React.PropTypes.string.isRequired,
     className: React.PropTypes.string,
     fixed: React.PropTypes.bool,
-  },
-  render: function() {
+  }
+
+  static defaultProps = {
+    lines: null
+  }
+
+  render() {
     const {fixed, className, ...other} = this.props;
     const spanClassName = ('icon ' + ('fixed' in this.props ? 'icon-fixed-width ' : '') +
                            this.props.icon + ' ' + (this.props.className || ''));
     return <span className={spanClassName} {... other}></span>
   }
-});
+}
 
-export let TruncatedText = React.createClass({
-  propTypes: {
-    lines: React.PropTypes.number
-  },
-  getDefaultProps: function() {
-    return {
-      lines: null,
-    }
-  },
-  render: function() {
+export class TruncatedText extends React.Component {
+  static propTypes = {
+    lines: React.PropTypes.number,
+  }
+
+  render() {
     return <span className="truncated-text" style={{ WebkitLineClamp: this.props.lines }}>{this.props.children}</span>;
   }
-});
+}
 
-export let BusyMessage = React.createClass({
-  propTypes: {
-    message: React.PropTypes.string
-  },
-  render: function() {
+export class BusyMessage extends React.Component {
+  static propTypes = {
+    message: React.PropTypes.string,
+  }
+
+  render() {
     return <span>{this.props.message} <span className="busy-indicator"></span></span>
   }
-});
+}
 
-export let CurrencySymbol = React.createClass({
-  render: function() { return <span>LBC</span>; }
-});
+export class CurrencySymbol extends React.Component {
+  render() {
+    return <span>LBC</span>;
+  }
+}
 
-export let CreditAmount = React.createClass({
-  propTypes: {
+export class CreditAmount extends React.Component {
+  static propTypes = {
     amount: React.PropTypes.number.isRequired,
     precision: React.PropTypes.number,
     isEstimate: React.PropTypes.bool,
     label: React.PropTypes.bool,
     showFree: React.PropTypes.bool,
     look: React.PropTypes.oneOf(['indicator', 'plain']),
-  },
-  getDefaultProps: function() {
-    return {
-      precision: 1,
-      label: true,
-      showFree: false,
-      look: 'indicator',
-    }
-  },
-  render: function() {
+  }
+
+  static defaultProps = {
+    precision: 1,
+    label: true,
+    showFree: false,
+    look: 'indicator',
+  }
+
+  render() {
     const formattedAmount = lbry.formatCredits(this.props.amount, this.props.precision);
     let amountText;
     if (this.props.showFree && parseFloat(formattedAmount) == 0) {
@@ -80,45 +84,56 @@ export let CreditAmount = React.createClass({
       </span>
     );
   }
-});
+}
 
-var addressStyle = {
+let addressStyle = {
   fontFamily: '"Consolas", "Lucida Console", "Adobe Source Code Pro", monospace',
 };
-export let Address = React.createClass({
-  _inputElem: null,
-  propTypes: {
+export class Address extends React.Component {
+  static propTypes = {
     address: React.PropTypes.string,
-  },
-  render: function() {
+  }
+
+  constructor(props) {
+    super(props);
+
+    this._inputElem = null;
+  }
+
+  render() {
     return (
       <input className="input-copyable" type="text" ref={(input) => { this._inputElem = input; }}
              onFocus={() => { this._inputElem.select(); }} style={addressStyle} readOnly="readonly" value={this.props.address}></input>
     );
   }
-});
+}
 
-export let Thumbnail = React.createClass({
-  _defaultImageUri: lbry.imagePath('default-thumb.svg'),
-  _maxLoadTime: 10000,
-  _isMounted: false,
-
-  propTypes: {
+export class Thumbnail extends React.Component {
+  static propTypes = {
     src: React.PropTypes.string,
-  },
-  handleError: function() {
+  }
+
+  handleError() {
     if (this.state.imageUrl != this._defaultImageUri) {
       this.setState({
         imageUri: this._defaultImageUri,
       });
     }
-  },
-  getInitialState: function() {
-    return {
+  }
+
+  constructor(props) {
+    super(props);
+
+    this._defaultImageUri = lbry.imagePath('default-thumb.svg')
+    this._maxLoadTime = 10000
+    this._isMounted = false
+
+    this.state = {
       imageUri: this.props.src || this._defaultImageUri,
     };
-  },
-  componentDidMount: function() {
+  }
+
+  componentDidMount() {
     this._isMounted = true;
     setTimeout(() => {
       if (this._isMounted && !this.refs.img.complete) {
@@ -127,14 +142,16 @@ export let Thumbnail = React.createClass({
         });
       }
     }, this._maxLoadTime);
-  },
-  componentWillUnmount: function() {
+  }
+
+  componentWillUnmount() {
     this._isMounted = false;
-  },
-  render: function() {
+  }
+
+  render() {
     const className = this.props.className ? this.props.className : '',
           otherProps = Object.assign({}, this.props)
     delete otherProps.className;
     return <img ref="img" onError={this.handleError} {...otherProps} className={className} src={this.state.imageUri} />
-  },
-});
+  }
+}
diff --git a/ui/js/component/form.js b/ui/js/component/form.js
index f75310c92..64946c31f 100644
--- a/ui/js/component/form.js
+++ b/ui/js/component/form.js
@@ -8,24 +8,28 @@ function formFieldId() {
   return "form-field-" + (++formFieldCounter);
 }
 
-export let FormField = React.createClass({
-  _fieldRequiredText: 'This field is required',
-  _type: null,
-  _element: null,
-
-  propTypes: {
+export class FormField extends React.Component {
+  static propTypes = {
     type: React.PropTypes.string.isRequired,
     prefix: React.PropTypes.string,
     postfix: React.PropTypes.string,
     hasError: React.PropTypes.bool
-  },
-  getInitialState: function() {
-    return {
+  }
+
+  constructor(props) {
+    super(props);
+
+    this._fieldRequiredText = 'This field is required';
+    this._type = null;
+    this._element = null;
+
+    this.state = {
       isError: null,
       errorMessage: null,
-    }
-  },
-  componentWillMount: function() {
+    };
+  }
+
+  componentWillMount() {
     if (['text', 'number', 'radio', 'checkbox', 'file'].includes(this.props.type)) {
       this._element = 'input';
       this._type = this.props.type;
@@ -36,17 +40,20 @@ export let FormField = React.createClass({
       // Non <input> field, e.g. <select>, <textarea>
       this._element = this.props.type;
     }
-  },
-  showError: function(text) {
+  }
+
+  showError(text) {
     this.setState({
       isError: true,
       errorMessage: text,
     });
-  },
-  focus: function() {
+  }
+
+  focus() {
     this.refs.field.focus();
-  },
-  getValue: function() {
+  }
+
+  getValue() {
     if (this.props.type == 'checkbox') {
       return this.refs.field.checked;
     } else if (this.props.type == 'file') {
@@ -55,11 +62,13 @@ export let FormField = React.createClass({
     } else {
       return this.refs.field.value;
     }
-  },
-  getSelectedElement: function() {
+  }
+
+  getSelectedElement() {
     return this.refs.field.options[this.refs.field.selectedIndex];
-  },
-  render: function() {
+  }
+
+  render() {
     // Pass all unhandled props to the field element
     const otherProps = Object.assign({}, this.props),
           isError = this.state.isError !== null ? this.state.isError : this.props.hasError,
@@ -91,45 +100,56 @@ export let FormField = React.createClass({
       { isError && this.state.errorMessage ?  <div className="form-field__error">{this.state.errorMessage}</div> : '' }
     </div>
   }
-})
+}
 
-export let FormRow = React.createClass({
-  _fieldRequiredText: 'This field is required',
-  propTypes: {
-    label: React.PropTypes.oneOfType([React.PropTypes.string, React.PropTypes.element])
+export class FormRow extends React.Component {
+  static propTypes = {
+    label: React.PropTypes.oneOfType([React.PropTypes.string, React.PropTypes.element]),
     // helper: React.PropTypes.html,
-  },
-  getInitialState: function() {
-    return {
+  }
+
+  constructor(props) {
+    super(props);
+
+    this._fieldRequiredText = 'This field is required';
+
+    this.state = {
       isError: false,
       errorMessage: null,
-    }
-  },
-  showError: function(text) {
+    };
+  }
+
+  showError(text) {
     this.setState({
       isError: true,
       errorMessage: text,
     });
-  },
-  showRequiredError: function() {
+  }
+
+  showRequiredError() {
     this.showError(this._fieldRequiredText);
-  },
-  clearError: function(text) {
+  }
+
+  clearError(text) {
     this.setState({
       isError: false,
       errorMessage: ''
     });
-  },
-  getValue: function() {
+  }
+
+  getValue() {
     return this.refs.field.getValue();
-  },
-  getSelectedElement: function() {
+  }
+
+  getSelectedElement() {
     return this.refs.field.getSelectedElement();
-  },
-  focus: function() {
+  }
+
+  focus() {
     this.refs.field.focus();
-  },
-  render: function() {
+  }
+
+  render() {
     const fieldProps = Object.assign({}, this.props),
           elementId = formFieldId(),
           renderLabelInFormField = formFieldNestedLabelTypes.includes(this.props.type);
@@ -151,4 +171,4 @@ export let FormRow = React.createClass({
       { this.state.isError ?  <div className="form-field__error">{this.state.errorMessage}</div> : '' }
     </div>
   }
-})
+}
diff --git a/ui/js/component/load_screen.js b/ui/js/component/load_screen.js
index 4002d5191..5b24e19b7 100644
--- a/ui/js/component/load_screen.js
+++ b/ui/js/component/load_screen.js
@@ -3,25 +3,28 @@ import lbry from '../lbry.js';
 import {BusyMessage, Icon} from './common.js';
 import Link from 'component/link'
 
-var LoadScreen = React.createClass({
-  propTypes: {
+class LoadScreen extends React.Component {
+  static propTypes = {
     message: React.PropTypes.string.isRequired,
     details: React.PropTypes.string,
     isWarning: React.PropTypes.bool,
-  },
-  getDefaultProps: function() {
-    return {
-      isWarning: false,
-    }
-  },
-  getInitialState: function() {
-    return {
+  }
+
+  constructor(props) {
+    super(props);
+
+    this.state = {
       message: null,
       details: null,
       isLagging: false,
-    }
-  },
-  render: function() {
+    };
+  }
+
+  static defaultProps = {
+    isWarning: false,
+  }
+
+  render() {
     const imgSrc = lbry.imagePath('lbry-white-485x160.png');
     return (
       <div className="load-screen">
@@ -35,7 +38,7 @@ var LoadScreen = React.createClass({
       </div>
     );
   }
-});
+}
 
 
 export default LoadScreen;
diff --git a/ui/js/component/menu.js b/ui/js/component/menu.js
index c43d81f0e..7176895a4 100644
--- a/ui/js/component/menu.js
+++ b/ui/js/component/menu.js
@@ -2,19 +2,19 @@ import React from 'react';
 import {Icon} from './common.js';
 import Link from 'component/link';
 
-export let DropDownMenuItem = React.createClass({
-  propTypes: {
+export class DropDownMenuItem extends React.Component {
+  static propTypes = {
     href: React.PropTypes.string,
     label: React.PropTypes.string,
     icon: React.PropTypes.string,
     onClick: React.PropTypes.func,
-  },
-  getDefaultProps: function() {
-    return {
-      iconPosition: 'left',
-    }
-  },
-  render: function() {
+  }
+
+  static defaultProps = {
+    iconPosition: 'left',
+  }
+
+  render() {
     var icon = (this.props.icon ? <Icon icon={this.props.icon} fixed /> : null);
 
     return (
@@ -26,23 +26,27 @@ export let DropDownMenuItem = React.createClass({
       </a>
     );
   }
-});
+}
 
-export let DropDownMenu = React.createClass({
-  _isWindowClickBound: false,
-  _menuDiv: null,
+export class DropDownMenu extends React.Component {
+  constructor(props) {
+    super(props);
 
-  getInitialState: function() {
-    return {
+    this._isWindowClickBound = false;
+    this._menuDiv = null;
+
+    this.state = {
       menuOpen: false,
     };
-  },
-  componentWillUnmount: function() {
+  }
+
+  componentWillUnmount() {
     if (this._isWindowClickBound) {
       window.removeEventListener('click', this.handleWindowClick, false);
     }
-  },
-  handleMenuIconClick: function(e) {
+  }
+
+  handleMenuIconClick(e) {
     this.setState({
       menuOpen: !this.state.menuOpen,
     });
@@ -52,22 +56,25 @@ export let DropDownMenu = React.createClass({
       e.stopPropagation();
     }
     return false;
-  },
-  handleMenuClick: function(e) {
+  }
+
+  handleMenuClick(e) {
     // Event bubbles up to the menu after a link is clicked
     this.setState({
       menuOpen: false,
     });
-  },
-  handleWindowClick: function(e) {
+  }
+
+  handleWindowClick(e) {
     if (this.state.menuOpen &&
           (!this._menuDiv || !this._menuDiv.contains(e.target))) {
       this.setState({
         menuOpen: false
       });
     }
-  },
-  render: function() {
+  }
+
+  render() {
     if (!this.state.menuOpen && this._isWindowClickBound) {
       this._isWindowClickBound = false;
       window.removeEventListener('click', this.handleWindowClick, false);
@@ -83,4 +90,4 @@ export let DropDownMenu = React.createClass({
       </div>
     );
   }
-});
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/ui/js/component/modal-page.js b/ui/js/component/modal-page.js
index 12826a81e..6a7f8ec5d 100644
--- a/ui/js/component/modal-page.js
+++ b/ui/js/component/modal-page.js
@@ -1,8 +1,8 @@
 import React from 'react';
 import ReactModal from 'react-modal';
 
-export const ModalPage = React.createClass({
-  render: function() {
+export class ModalPage extends React.Component {
+  render() {
     return (
       <ReactModal onCloseRequested={this.props.onAborted || this.props.onConfirmed} {...this.props}
                   className={(this.props.className || '') + ' modal-page'}
@@ -13,6 +13,4 @@ export const ModalPage = React.createClass({
       </ReactModal>
     );
   }
-});
-
-export default ModalPage;
\ No newline at end of file
+}
diff --git a/ui/js/component/modal.js b/ui/js/component/modal.js
index 5c88fcf7e..6d7bbc2d8 100644
--- a/ui/js/component/modal.js
+++ b/ui/js/component/modal.js
@@ -3,8 +3,8 @@ import ReactModal from 'react-modal';
 import Link from 'component/link';
 
 
-export const Modal = React.createClass({
-  propTypes: {
+export class Modal extends React.Component {
+  static propTypes = {
     type: React.PropTypes.oneOf(['alert', 'confirm', 'custom']),
     overlay: React.PropTypes.bool,
     onConfirmed: React.PropTypes.func,
@@ -13,18 +13,18 @@ export const Modal = React.createClass({
     abortButtonLabel: React.PropTypes.string,
     confirmButtonDisabled: React.PropTypes.bool,
     abortButtonDisabled: React.PropTypes.bool,
-  },
-  getDefaultProps: function() {
-    return {
-      type: 'alert',
-      overlay: true,
-      confirmButtonLabel: 'OK',
-      abortButtonLabel: 'Cancel',
-      confirmButtonDisabled: false,
-      abortButtonDisabled: false,
-    };
-  },
-  render: function() {
+  }
+
+  static defaultProps = {
+    type: 'alert',
+    overlay: true,
+    confirmButtonLabel: 'OK',
+    abortButtonLabel: 'Cancel',
+    confirmButtonDisabled: false,
+    abortButtonDisabled: false,
+  }
+
+  render() {
     return (
       <ReactModal onCloseRequested={this.props.onAborted || this.props.onConfirmed} {...this.props}
                   className={(this.props.className || '') + ' modal'}
@@ -43,31 +43,35 @@ export const Modal = React.createClass({
       </ReactModal>
     );
   }
-});
+}
 
-export const ExpandableModal = React.createClass({
-  propTypes: {
+export class ExpandableModal extends React.Component {
+  static propTypes = {
     expandButtonLabel: React.PropTypes.string,
     extraContent: React.PropTypes.element,
-  },
-  getDefaultProps: function() {
-    return {
-      confirmButtonLabel: 'OK',
-      expandButtonLabel: 'Show More...',
-      hideButtonLabel: 'Show Less',
-    }
-  },
-  getInitialState: function() {
-    return {
+  }
+
+  static defaultProps = {
+    confirmButtonLabel: 'OK',
+    expandButtonLabel: 'Show More...',
+    hideButtonLabel: 'Show Less',
+  }
+
+  constructor(props) {
+    super(props);
+
+    this.state = {
       expanded: false,
     }
-  },
-  toggleExpanded: function() {
+  }
+
+  toggleExpanded() {
     this.setState({
       expanded: !this.state.expanded,
     });
-  },
-  render: function() {
+  }
+
+  render() {
     return (
       <Modal type="custom" {... this.props}>
         {this.props.children}
@@ -82,6 +86,6 @@ export const ExpandableModal = React.createClass({
       </Modal>
     );
   }
-});
+}
 
 export default Modal;
diff --git a/ui/js/component/notice.js b/ui/js/component/notice.js
index 068b545b5..8a0ea384c 100644
--- a/ui/js/component/notice.js
+++ b/ui/js/component/notice.js
@@ -1,21 +1,21 @@
 import React from 'react';
 
-export const Notice = React.createClass({
-  propTypes: {
+export class Notice extends React.Component {
+  static propTypes = {
     isError: React.PropTypes.bool,
-  },
-  getDefaultProps: function() {
-    return {
-      isError: false,
-    };
-  },
-  render: function() {
+  }
+
+  static defaultProps = {
+    isError: false,
+  }
+
+  render() {
     return (
       <section className={'notice ' + (this.props.isError ? 'notice--error ' : '') + (this.props.className || '')}>
         {this.props.children}
       </section>
     );
-  },
-});
+  }
+}
 
 export default Notice;
\ No newline at end of file
diff --git a/ui/js/component/reward-link.js b/ui/js/component/reward-link.js
index b6ae09fed..7dbd3046b 100644
--- a/ui/js/component/reward-link.js
+++ b/ui/js/component/reward-link.js
@@ -5,14 +5,25 @@ import Modal from 'component/modal';
 import rewards from 'rewards';
 import Link from 'component/link'
 
-export let RewardLink = React.createClass({
-  propTypes: {
+export class RewardLink extends React.Component {
+  static propTypes = {
     type: React.PropTypes.string.isRequired,
     claimed: React.PropTypes.bool,
     onRewardClaim: React.PropTypes.func,
     onRewardFailure: React.PropTypes.func
-  },
-  refreshClaimable: function() {
+  }
+
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      claimable: true,
+      pending: false,
+      errorMessage: null
+    };
+  }
+
+  refreshClaimable() {
     switch(this.props.type) {
       case 'new_user':
         this.setState({ claimable: true });
@@ -26,18 +37,13 @@ export let RewardLink = React.createClass({
         }.bind(this));
         return;
     }
-  },
-  componentWillMount: function() {
+  }
+
+  componentWillMount() {
     this.refreshClaimable();
-  },
-  getInitialState: function() {
-    return {
-      claimable: true,
-      pending: false,
-      errorMessage: null
-    }
-  },
-  claimReward: function() {
+  }
+
+  claimReward() {
     this.setState({
       pending: true
     })
@@ -55,16 +61,18 @@ export let RewardLink = React.createClass({
         pending: false
       })
     })
-  },
-  clearError: function() {
+  }
+
+  clearError() {
     if (this.props.onRewardFailure) {
       this.props.onRewardFailure()
     }
     this.setState({
       errorMessage: null
     })
-  },
-  render: function() {
+  }
+
+  render() {
     return (
       <div className="reward-link">
         {this.props.claimed
@@ -79,4 +87,4 @@ export let RewardLink = React.createClass({
       </div>
     );
   }
-});
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/ui/js/component/snack-bar.js b/ui/js/component/snack-bar.js
index 6d6f17915..68a562393 100644
--- a/ui/js/component/snack-bar.js
+++ b/ui/js/component/snack-bar.js
@@ -1,18 +1,19 @@
 import React from 'react';
 import lbry from '../lbry.js';
 
-export const SnackBar = React.createClass({
+export class SnackBar extends React.Component {
+  constructor(props) {
+    super(props);
 
-  _displayTime: 5, // in seconds
+    this._displayTime = 5; // in seconds
+    this._hideTimeout = null;
 
-  _hideTimeout: null,
-
-  getInitialState: function() {
-    return {
+    this.state = {
       snacks: []
-    }
-  },
-  handleSnackReceived: function(event) {
+    };
+  }
+
+  handleSnackReceived(event) {
     // if (this._hideTimeout) {
     //   clearTimeout(this._hideTimeout);
     // }
@@ -20,14 +21,17 @@ export const SnackBar = React.createClass({
     let snacks = this.state.snacks;
     snacks.push(event.detail);
     this.setState({ snacks: snacks});
-  },
-  componentWillMount: function() {
+  }
+
+  componentWillMount() {
     document.addEventListener('globalNotice', this.handleSnackReceived);
-  },
-  componentWillUnmount: function() {
+  }
+
+  componentWillUnmount() {
     document.removeEventListener('globalNotice', this.handleSnackReceived);
-  },
-  render: function() {
+  }
+
+  render() {
     if (!this.state.snacks.length) {
       this._hideTimeout = null; //should be unmounting anyway, but be safe?
       return null;
@@ -51,7 +55,7 @@ export const SnackBar = React.createClass({
           <a className="snack-bar__action" href={snack.linkTarget}>{snack.linkText}</a> : ''}
       </div>
     );
-  },
-});
+  }
+}
 
 export default SnackBar;
\ No newline at end of file
diff --git a/ui/js/component/splash.js b/ui/js/component/splash.js
index b0831b6a2..f2bc33405 100644
--- a/ui/js/component/splash.js
+++ b/ui/js/component/splash.js
@@ -2,21 +2,26 @@ import React from 'react';
 import lbry from '../lbry.js';
 import LoadScreen from './load_screen.js';
 
-var SplashScreen = React.createClass({
-  propTypes: {
+export class SplashScreen extends React.Component {
+  static propTypes = {
     message: React.PropTypes.string,
     onLoadDone: React.PropTypes.func,
-  },
-  getInitialState: function() {
-    return {
+  }
+
+  constructor(props) {
+    super(props);
+
+    this.state = {
       details: 'Starting daemon',
       isLagging: false,
-    }
-  },
-  updateStatus: function() {
+    };
+  }
+
+  updateStatus() {
     lbry.status().then(this._updateStatusCallback);
-  },
-  _updateStatusCallback: function(status) {
+  }
+
+  _updateStatusCallback(status) {
     const startupStatus = status.startup_status
     if (startupStatus.code == 'started') {
       // Wait until we are able to resolve a name before declaring
@@ -40,8 +45,9 @@ var SplashScreen = React.createClass({
     setTimeout(() => {
       this.updateStatus();
     }, 500);
-  },
-  componentDidMount: function() {
+  }
+
+  componentDidMount() {
     lbry.connect().then((isConnected) => {
       if (isConnected) {
         this.updateStatus();
@@ -53,10 +59,11 @@ var SplashScreen = React.createClass({
         })
       }
     })
-  },
-  render: function() {
+  }
+
+  render() {
     return <LoadScreen message={this.props.message} details={this.state.details} isWarning={this.state.isLagging} />
   }
-});
+}
 
 export default SplashScreen;
diff --git a/ui/js/component/tooltip.js b/ui/js/component/tooltip.js
index 052de0513..af83a2858 100644
--- a/ui/js/component/tooltip.js
+++ b/ui/js/component/tooltip.js
@@ -1,26 +1,32 @@
 import React from 'react';
 
-export let ToolTip = React.createClass({
-  propTypes: {
+export class ToolTip extends React.Component {
+  static propTypes = {
     body: React.PropTypes.string.isRequired,
     label: React.PropTypes.string.isRequired
-  },
-  getInitialState: function() {
-    return {
+  }
+
+  constructor(props) {
+    super(props);
+
+    this.state = {
       showTooltip: false,
     };
-  },
-  handleClick: function() {
+  }
+
+  handleClick() {
     this.setState({
       showTooltip: !this.state.showTooltip,
     });
-  },
-  handleTooltipMouseOut: function() {
+  }
+
+  handleTooltipMouseOut() {
     this.setState({
       showTooltip: false,
     });
-  },
-  render: function() {
+  }
+
+  render() {
     return (
       <span className={'tooltip ' + (this.props.className || '')}>
         <a className="tooltip__link" onClick={this.handleClick}>
@@ -33,6 +39,6 @@ export let ToolTip = React.createClass({
       </span>
     );
   }
-});
+}
 
 export default ToolTip
\ No newline at end of file
diff --git a/ui/js/page/developer.js b/ui/js/page/developer.js
index 31b3b6634..8e8d618e5 100644
--- a/ui/js/page/developer.js
+++ b/ui/js/page/developer.js
@@ -6,34 +6,40 @@ import Link from '../component/link';
 const fs = require('fs');
 const {ipcRenderer} = require('electron');
 
-const DeveloperPage = React.createClass({
-  getInitialState: function() {
-    return {
+class DeveloperPage extends React.Component {
+  constructor(props) {
+    super(props);
+
+    this.state = {
       showDeveloperMenu: lbry.getClientSetting('showDeveloperMenu'),
       useCustomLighthouseServers: lbry.getClientSetting('useCustomLighthouseServers'),
       customLighthouseServers: lbry.getClientSetting('customLighthouseServers').join('\n'),
       upgradePath: '',
     };
-  },
-  handleShowDeveloperMenuChange: function(event) {
+  }
+
+  handleShowDeveloperMenuChange(event) {
     lbry.setClientSetting('showDeveloperMenu', event.target.checked);
     lbry.showMenuIfNeeded();
     this.setState({
       showDeveloperMenu: event.target.checked,
     });
-  },
-  handleUseCustomLighthouseServersChange: function(event) {
+  }
+
+  handleUseCustomLighthouseServersChange(event) {
     lbry.setClientSetting('useCustomLighthouseServers', event.target.checked);
     this.setState({
       useCustomLighthouseServers: event.target.checked,
     });
-  },
-  handleUpgradeFileChange: function(event) {
+  }
+
+  handleUpgradeFileChange(event) {
     this.setState({
       upgradePath: event.target.files[0].path,
     });
-  },
-  handleForceUpgradeClick: function() {
+  }
+
+  handleForceUpgradeClick() {
     let upgradeSent = false;
     if (!this.state.upgradePath) {
       alert('Please select a file to upgrade from');
@@ -51,8 +57,9 @@ const DeveloperPage = React.createClass({
         alert('Failed to start upgrade. Is "' + this.state.upgradePath + '" a valid path to the upgrade?');
       }
     }
-  },
-  render: function() {
+  }
+
+  render() {
     return (
       <main>
         <section className="card">
@@ -82,6 +89,6 @@ const DeveloperPage = React.createClass({
       </main>
     );
   }
-});
+}
 
 export default DeveloperPage;
diff --git a/ui/js/page/help/view.jsx b/ui/js/page/help/view.jsx
index c57c4d1f0..67a1144c9 100644
--- a/ui/js/page/help/view.jsx
+++ b/ui/js/page/help/view.jsx
@@ -5,14 +5,17 @@ import Link from 'component/link';
 import SubHeader from 'component/subHeader'
 import {version as uiVersion} from 'json!../../../package.json';
 
-var HelpPage = React.createClass({
-  getInitialState: function() {
-    return {
+class HelpPage extends React.Component {
+  constructor(props) {
+    super(props);
+
+    this.state = {
       versionInfo: null,
       lbryId: null,
     };
-  },
-  componentWillMount: function() {
+  }
+
+  componentWillMount() {
     lbry.getVersionInfo((info) => {
       this.setState({
         versionInfo: info,
@@ -23,11 +26,13 @@ var HelpPage = React.createClass({
         lbryId: info.lbry_id,
       });
     });
-  },
-  componentDidMount: function() {
+  }
+
+  componentDidMount() {
     document.title = "Help";
-  },
-  render: function() {
+  }
+
+  render() {
     let ver, osName, platform, newVerLink;
     if (this.state.versionInfo) {
       ver = this.state.versionInfo;
@@ -119,6 +124,6 @@ var HelpPage = React.createClass({
       </main>
     );
   }
-});
+}
 
 export default HelpPage;
diff --git a/ui/js/page/publish/view.jsx b/ui/js/page/publish/view.jsx
index 7a6e4806f..b61f4a9b9 100644
--- a/ui/js/page/publish/view.jsx
+++ b/ui/js/page/publish/view.jsx
@@ -5,10 +5,41 @@ import Link from 'component/link';
 import rewards from 'rewards';
 import Modal from 'component/modal';
 
-var PublishPage = React.createClass({
-  _requiredFields: ['meta_title', 'name', 'bid', 'tos_agree'],
+class PublishPage extends React.Component {
+  constructor(props) {
+    super(props);
 
-  _updateChannelList: function(channel) {
+    this._requiredFields = ['meta_title', 'name', 'bid', 'tos_agree'];
+
+    this.state = {
+      channels: null,
+      rawName: '',
+      name: '',
+      bid: 10,
+      hasFile: false,
+      feeAmount: '',
+      feeCurrency: 'USD',
+      channel: 'anonymous',
+      newChannelName: '@',
+      newChannelBid: 10,
+      nameResolved: null,
+      myClaimExists: null,
+      topClaimValue: 0.0,
+      myClaimValue: 0.0,
+      myClaimMetadata: null,
+      copyrightNotice: '',
+      otherLicenseDescription: '',
+      otherLicenseUrl: '',
+      uploadProgress: 0.0,
+      uploaded: false,
+      errorMessage: null,
+      submitting: false,
+      creatingChannel: false,
+      modal: null,
+    };
+  }
+
+  _updateChannelList(channel) {
     // Calls API to update displayed list of channels. If a channel name is provided, will select
     // that channel at the same time (used immediately after creating a channel)
     lbry.channel_list_mine().then((channels) => {
@@ -18,8 +49,9 @@ var PublishPage = React.createClass({
         ... channel ? {channel} : {}
       });
     });
-  },
-  handleSubmit: function(event) {
+  }
+
+  handleSubmit(event) {
     if (typeof event !== 'undefined') {
       event.preventDefault();
     }
@@ -112,51 +144,27 @@ var PublishPage = React.createClass({
     } else {
       doPublish();
     }
-  },
-  getInitialState: function() {
-    return {
-      channels: null,
-      rawName: '',
-      name: '',
-      bid: 10,
-      hasFile: false,
-      feeAmount: '',
-      feeCurrency: 'USD',
-      channel: 'anonymous',
-      newChannelName: '@',
-      newChannelBid: 10,
-      nameResolved: null,
-      myClaimExists: null,
-      topClaimValue: 0.0,
-      myClaimValue: 0.0,
-      myClaimMetadata: null,
-      copyrightNotice: '',
-      otherLicenseDescription: '',
-      otherLicenseUrl: '',
-      uploadProgress: 0.0,
-      uploaded: false,
-      errorMessage: null,
-      submitting: false,
-      creatingChannel: false,
-      modal: null,
-    };
-  },
-  handlePublishStarted: function() {
+  }
+
+  handlePublishStarted() {
     this.setState({
       modal: 'publishStarted',
     });
-  },
-  handlePublishStartedConfirmed: function() {
+  }
+
+  handlePublishStartedConfirmed() {
     this.props.navigate('/published')
-  },
-  handlePublishError: function(error) {
+  }
+
+  handlePublishError(error) {
     this.setState({
       submitting: false,
       modal: 'error',
       errorMessage: error.message,
     });
-  },
-  handleNameChange: function(event) {
+  }
+
+  handleNameChange(event) {
     var rawName = event.target.value;
 
     if (!rawName) {
@@ -228,28 +236,33 @@ var PublishPage = React.createClass({
         });
       });
     });
-  },
-  handleBidChange: function(event) {
+  }
+
+  handleBidChange(event) {
     this.setState({
       bid: event.target.value,
     });
-  },
-  handleFeeAmountChange: function(event) {
+  }
+
+  handleFeeAmountChange(event) {
     this.setState({
       feeAmount: event.target.value,
     });
-  },
-  handleFeeCurrencyChange: function(event) {
+  }
+
+  handleFeeCurrencyChange(event) {
     this.setState({
       feeCurrency: event.target.value,
     });
-  },
-  handleFeePrefChange: function(feeEnabled) {
+  }
+
+  handleFeePrefChange(feeEnabled) {
     this.setState({
       isFee: feeEnabled
     });
-  },
-  handleLicenseChange: function(event) {
+  }
+
+  handleLicenseChange(event) {
     var licenseType = event.target.options[event.target.selectedIndex].getAttribute('data-license-type');
     var newState = {
       copyrightChosen: licenseType == 'copyright',
@@ -261,30 +274,35 @@ var PublishPage = React.createClass({
     }
 
     this.setState(newState);
-  },
-  handleCopyrightNoticeChange: function(event) {
+  }
+
+  handleCopyrightNoticeChange(event) {
     this.setState({
       copyrightNotice: event.target.value,
     });
-  },
-  handleOtherLicenseDescriptionChange: function(event) {
+  }
+
+  handleOtherLicenseDescriptionChange(event) {
     this.setState({
       otherLicenseDescription: event.target.value,
     });
-  },
-  handleOtherLicenseUrlChange: function(event) {
+  }
+
+  handleOtherLicenseUrlChange(event) {
     this.setState({
       otherLicenseUrl: event.target.value,
     });
-  },
-  handleChannelChange: function (event) {
+  }
+
+  handleChannelChange(event) {
     const channel = event.target.value;
 
     this.setState({
       channel: channel,
     });
-  },
-  handleNewChannelNameChange: function (event) {
+  }
+
+  handleNewChannelNameChange(event) {
     const newChannelName = (event.target.value.startsWith('@') ? event.target.value : '@' + event.target.value);
 
     if (newChannelName.length > 1 && !lbry.nameIsValid(newChannelName.substr(1), false)) {
@@ -297,18 +315,21 @@ var PublishPage = React.createClass({
     this.setState({
       newChannelName: newChannelName,
     });
-  },
-  handleNewChannelBidChange: function (event) {
+  }
+
+  handleNewChannelBidChange(event) {
     this.setState({
       newChannelBid: event.target.value,
     });
-  },
-  handleTOSChange: function(event) {
+  }
+
+  handleTOSChange(event) {
     this.setState({
       TOSAgreed: event.target.checked,
     });
-  },
-  handleCreateChannelClick: function (event) {
+  }
+
+  handleCreateChannelClick(event) {
     if (this.state.newChannelName.length < 5) {
       this.refs.newChannelName.showError('LBRY channel names must be at least 4 characters in length.');
       return;
@@ -334,8 +355,9 @@ var PublishPage = React.createClass({
         creatingChannel: false,
       });
     });
-  },
-  getLicenseUrl: function() {
+  }
+
+  getLicenseUrl() {
     if (!this.refs.meta_license) {
       return '';
     } else if (this.state.otherLicenseChosen) {
@@ -343,20 +365,21 @@ var PublishPage = React.createClass({
     } else {
       return this.refs.meta_license.getSelectedElement().getAttribute('data-url') || '' ;
     }
-  },
-  componentWillMount: function() {
+  }
+
+  componentWillMount() {
     this._updateChannelList();
-  },
-  componentDidUpdate: function() {
-  },
-  onFileChange: function() {
+  }
+
+  onFileChange() {
     if (this.refs.file.getValue()) {
       this.setState({ hasFile: true })
     } else {
       this.setState({ hasFile: false })
     }
-  },
-  getNameBidHelpText: function() {
+  }
+
+  getNameBidHelpText() {
     if (!this.state.name) {
       return "Select a URL for this publish.";
     } else if (this.state.nameResolved === false) {
@@ -369,13 +392,15 @@ var PublishPage = React.createClass({
     } else {
       return '';
     }
-  },
-  closeModal: function() {
+  }
+
+  closeModal() {
     this.setState({
       modal: null,
     });
-  },
-  render: function() {
+  }
+
+  render() {
     if (this.state.channels === null) {
       return null;
     }
@@ -564,6 +589,6 @@ var PublishPage = React.createClass({
       </main>
     );
   }
-});
+}
 
 export default PublishPage;
diff --git a/ui/js/page/report.js b/ui/js/page/report.js
index 03f0bb915..8c4b54301 100644
--- a/ui/js/page/report.js
+++ b/ui/js/page/report.js
@@ -3,8 +3,17 @@ import Link from 'component/link';
 import Modal from '../component/modal.js';
 import lbry from '../lbry.js';
 
-var ReportPage = React.createClass({
-  submitMessage: function() {
+class ReportPage extends React.Component {
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      submitting: false,
+      modal: null,
+    };
+  }
+
+  submitMessage() {
     if (this._messageArea.value) {
       this.setState({
         submitting: true
@@ -17,19 +26,15 @@ var ReportPage = React.createClass({
       });
       this._messageArea.value = '';
     }
-  },
-  closeModal: function() {
+  }
+
+  closeModal() {
     this.setState({
       modal: null,
     })
-  },
-  getInitialState: function() {
-    return {
-      submitting: false,
-      modal: null,
-    }
-  },
-  render: function() {
+  }
+
+  render() {
     return (
       <main className="main--single-column">
         <section className="card">
@@ -53,6 +58,6 @@ var ReportPage = React.createClass({
       </main>
     );
   }
-});
+}
 
 export default ReportPage;
diff --git a/ui/js/page/rewards.js b/ui/js/page/rewards.js
index 6dcdcc4c5..115fcbdfb 100644
--- a/ui/js/page/rewards.js
+++ b/ui/js/page/rewards.js
@@ -4,16 +4,17 @@ import {CreditAmount, Icon} from 'component/common.js';
 import SubHeader from 'component/subHeader'
 import {RewardLink} from 'component/reward-link';
 
-const RewardTile = React.createClass({
-  propTypes: {
+export class RewardTile extends React.Component {
+  static propTypes = {
     type: React.PropTypes.string.isRequired,
     title: React.PropTypes.string.isRequired,
     description: React.PropTypes.string.isRequired,
     claimed: React.PropTypes.bool.isRequired,
     value: React.PropTypes.number.isRequired,
     onRewardClaim: React.PropTypes.func
-  },
-  render: function() {
+  }
+
+  render() {
     return (
       <section className="card">
         <div className="card__inner">
@@ -31,19 +32,23 @@ const RewardTile = React.createClass({
       </section>
     );
   }
-});
+}
 
-export let RewardsPage = React.createClass({
-  componentWillMount: function() {
-    this.loadRewards()
-  },
-  getInitialState: function() {
-    return {
+export class RewardsPage extends React.Component {
+  constructor(props) {
+    super(props);
+
+    this.state = {
       userRewards: null,
-      failed: null
+      failed: null,
     };
-  },
-  loadRewards: function() {
+  }
+
+  componentWillMount() {
+    this.loadRewards()
+  }
+
+  loadRewards() {
     lbryio.call('reward', 'list', {}).then((userRewards) => {
       this.setState({
         userRewards: userRewards,
@@ -51,8 +56,9 @@ export let RewardsPage = React.createClass({
     }, () => {
       this.setState({failed: true })
     });
-  },
-  render: function() {
+  }
+
+  render() {
     return (
       <main className="main--single-column">
         <SubHeader />
@@ -66,6 +72,6 @@ export let RewardsPage = React.createClass({
       </main>
     );
   }
-});
+}
 
 export default RewardsPage;
diff --git a/ui/js/page/settings/view.jsx b/ui/js/page/settings/view.jsx
index 32e189ad3..0d04593dd 100644
--- a/ui/js/page/settings/view.jsx
+++ b/ui/js/page/settings/view.jsx
@@ -3,46 +3,10 @@ import {FormField, FormRow} from 'component/form.js';
 import SubHeader from 'component/subHeader'
 import lbry from 'lbry.js';
 
-var SettingsPage = React.createClass({
-  setDaemonSetting: function(name, value) {
-    this.props.setDaemonSetting(name, value)
-  },
-  setClientSetting: function(name, value) {
-    lbry.setClientSetting(name, value)
-    this._onSettingSaveSuccess()
-    },
-  onRunOnStartChange: function (event) {
-    this.setDaemonSetting('run_on_startup', event.target.checked);
-  },
-  onShareDataChange: function (event) {
-    this.setDaemonSetting('share_usage_data', event.target.checked);
-  },
-  onDownloadDirChange: function(event) {
-    this.setDaemonSetting('download_directory', event.target.value);
-  },
-  onMaxUploadPrefChange: function(isLimited) {
-    if (!isLimited) {
-      this.setDaemonSetting('max_upload', 0.0);
-    }
-    this.setState({
-      isMaxUpload: isLimited
-    });
-  },
-  onMaxUploadFieldChange: function(event) {
-    this.setDaemonSetting('max_upload', Number(event.target.value));
-  },
-  onMaxDownloadPrefChange: function(isLimited) {
-    if (!isLimited) {
-      this.setDaemonSetting('max_download', 0.0);
-    }
-    this.setState({
-      isMaxDownload: isLimited
-    });
-  },
-  onMaxDownloadFieldChange: function(event) {
-    this.setDaemonSetting('max_download', Number(event.target.value));
-  },
-  getInitialState: function() {
+class SettingsPage extends React.Component {
+  constructor(props) {
+    super(props);
+
     const daemonSettings = this.props.daemonSettings
 
     return {
@@ -51,14 +15,64 @@ var SettingsPage = React.createClass({
       showNsfw: lbry.getClientSetting('showNsfw'),
       showUnavailable: lbry.getClientSetting('showUnavailable'),
     }
-  },
-  onShowNsfwChange: function(event) {
-    lbry.setClientSetting('showNsfw', event.target.checked);
-  },
-  onShowUnavailableChange: function(event) {
+  }
 
-  },
-  render: function() {
+  setDaemonSetting(name, value) {
+    this.props.setDaemonSetting(name, value)
+  }
+
+  setClientSetting(name, value) {
+    lbry.setClientSetting(name, value)
+    this._onSettingSaveSuccess()
+  }
+
+  onRunOnStartChange(event) {
+    this.setDaemonSetting('run_on_startup', event.target.checked);
+  }
+
+  onShareDataChange(event) {
+    this.setDaemonSetting('share_usage_data', event.target.checked);
+  }
+
+  onDownloadDirChange(event) {
+    this.setDaemonSetting('download_directory', event.target.value);
+  }
+
+  onMaxUploadPrefChange(isLimited) {
+    if (!isLimited) {
+      this.setDaemonSetting('max_upload', 0.0);
+    }
+    this.setState({
+      isMaxUpload: isLimited
+    });
+  }
+
+  onMaxUploadFieldChange(event) {
+    this.setDaemonSetting('max_upload', Number(event.target.value));
+  }
+
+  onMaxDownloadPrefChange(isLimited) {
+    if (!isLimited) {
+      this.setDaemonSetting('max_download', 0.0);
+    }
+    this.setState({
+      isMaxDownload: isLimited
+    });
+  }
+
+  onMaxDownloadFieldChange(event) {
+    this.setDaemonSetting('max_download', Number(event.target.value));
+  }
+
+  onShowNsfwChange(event) {
+    lbry.setClientSetting('showNsfw', event.target.checked);
+  }
+
+  onShowUnavailableChange(event) {
+
+  }
+
+  render() {
     const {
       daemonSettings
     } = this.props
@@ -185,6 +199,6 @@ var SettingsPage = React.createClass({
        </main>
     );
   }
-});
+}
 
 export default SettingsPage;
diff --git a/ui/js/page/start.js b/ui/js/page/start.js
index e1cf6e7dd..9a2b388b1 100644
--- a/ui/js/page/start.js
+++ b/ui/js/page/start.js
@@ -1,11 +1,12 @@
 import React from 'react';
 import lbry from '../lbry.js';
 
-var StartPage = React.createClass({
-  componentWillMount: function() {
+class StartPage extends React.Component {
+  componentWillMount() {
     lbry.stop();
-  },
-  render: function() {
+  }
+
+  render() {
     return (
       <main className="main--single-column">
         <h3>LBRY is Closed</h3>
@@ -13,6 +14,6 @@ var StartPage = React.createClass({
       </main>
     );
   }
-});
+}
 
 export default StartPage;

From 09834941ab0801980f90c3cb7521dae5bbccc5be Mon Sep 17 00:00:00 2001
From: Alex Liebowitz <alex@alexliebowitz.com>
Date: Wed, 17 May 2017 21:37:39 -0400
Subject: [PATCH 2/2] Convert more callbacks to arrow functions

---
 ui/js/component/auth.js              | 18 +++++++--------
 ui/js/component/common.js            |  2 +-
 ui/js/component/fileActions/view.jsx |  2 +-
 ui/js/component/link/view.js         |  2 +-
 ui/js/component/menu.js              |  4 ++--
 ui/js/component/modal.js             |  2 +-
 ui/js/component/reward-link.js       |  4 ++--
 ui/js/component/splash.js            |  2 +-
 ui/js/component/tooltip.js           |  4 ++--
 ui/js/component/video/view.jsx       |  6 ++---
 ui/js/page/developer.js              | 10 ++++----
 ui/js/page/publish/view.jsx          | 34 ++++++++++++++--------------
 ui/js/page/report.js                 |  4 ++--
 ui/js/page/settings/view.jsx         |  2 +-
 14 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/ui/js/component/auth.js b/ui/js/component/auth.js
index df18b0817..c6ad8ae19 100644
--- a/ui/js/component/auth.js
+++ b/ui/js/component/auth.js
@@ -52,12 +52,12 @@ class SubmitEmailStage extends React.Component {
   render() {
     return (
       <section>
-        <form onSubmit={this.handleSubmit}>
+        <form onSubmit={(event) => { this.handleSubmit(event) }}>
           <FormRow ref={(ref) => { this._emailRow = ref }} type="text" label="Email" placeholder="scrwvwls@lbry.io"
                      name="email" value={this.state.email}
-                     onChange={this.handleEmailChanged} />
+                     onChange={(event) => { this.handleEmailChanged(event) }} />
           <div className="form-row-submit">
-            <Link button="primary" label="Next" disabled={this.state.submitting} onClick={this.handleSubmit} />
+            <Link button="primary" label="Next" disabled={this.state.submitting} onClick={(event) => { this.handleSubmit(event) }} />
           </div>
         </form>
       </section>
@@ -108,12 +108,12 @@ class ConfirmEmailStage extends React.Component {
   render() {
     return (
       <section>
-        <form onSubmit={this.handleSubmit}>
+        <form onSubmit={(event) => { this.handleSubmit(event) }}>
           <FormRow label="Verification Code" ref={(ref) => { this._codeRow = ref }} type="text"
-                     name="code" placeholder="a94bXXXXXXXXXXXXXX" value={this.state.code} onChange={this.handleCodeChanged}
+                     name="code" placeholder="a94bXXXXXXXXXXXXXX" value={this.state.code} onChange={(event) => { this.handleCodeChanged(event) }}
                      helper="A verification code is required to access this version."/>
           <div className="form-row-submit form-row-submit--with-footer">
-            <Link button="primary" label="Verify" disabled={this.state.submitting} onClick={this.handleSubmit} />
+            <Link button="primary" label="Verify" disabled={this.state.submitting} onClick={(event) => { this.handleSubmit(event)}} />
           </div>
           <div className="form-field__helper">
             No code? <Link onClick={() => { this.props.setStage("nocode")}} label="Click here" />.
@@ -152,7 +152,7 @@ class WelcomeStage extends React.Component {
             <p>Below, LBRY is controlled by users -- you -- via blockchain and decentralization.</p>
             <p>Thank you for making content freedom possible! Here's a nickel, kid.</p>
             <div style={{textAlign: "center", marginBottom: "12px"}}>
-              <RewardLink type="new_user" button="primary" onRewardClaim={this.onRewardClaim} onRewardFailure={() => this.props.setStage(null)} onConfirmed={() => { this.props.setStage(null) }} />
+              <RewardLink type="new_user" button="primary" onRewardClaim={(event) => { this.onRewardClaim(event) }} onRewardFailure={() => this.props.setStage(null)} onConfirmed={() => { this.props.setStage(null) }} />
             </div>
           </section>
          </Modal> :
@@ -319,9 +319,9 @@ export class AuthOverlay extends React.Component {
       this.state.stage != "welcome" ?
           <ModalPage className="modal-page--full" isOpen={true} contentLabel="Authentication" {...this.props}>
             <h1>LBRY Early Access</h1>
-            <StageContent {...this.state.stageProps}  setStage={this.setStage} />
+            <StageContent {...this.state.stageProps}  setStage={(stage, stageProps) => { this.setStage(stage, stageProps) }} />
           </ModalPage> :
-          <StageContent setStage={this.setStage} {...this.state.stageProps}  />
+          <StageContent setStage={(stage, stageProps) => { this.setStage(stage, stageProps) }} {...this.state.stageProps}  />
     );
   }
 }
\ No newline at end of file
diff --git a/ui/js/component/common.js b/ui/js/component/common.js
index d2e05d6f6..fc37c280a 100644
--- a/ui/js/component/common.js
+++ b/ui/js/component/common.js
@@ -152,6 +152,6 @@ export class Thumbnail extends React.Component {
     const className = this.props.className ? this.props.className : '',
           otherProps = Object.assign({}, this.props)
     delete otherProps.className;
-    return <img ref="img" onError={this.handleError} {...otherProps} className={className} src={this.state.imageUri} />
+    return <img ref="img" onError={() => { this.handleError() }} {...otherProps} className={className} src={this.state.imageUri} />
   }
 }
diff --git a/ui/js/component/fileActions/view.jsx b/ui/js/component/fileActions/view.jsx
index ec2b93587..64e0ac219 100644
--- a/ui/js/component/fileActions/view.jsx
+++ b/ui/js/component/fileActions/view.jsx
@@ -121,7 +121,7 @@ class FileActions extends React.Component {
             <DropDownMenuItem key={1} onClick={() => openModal('confirmRemove')} label="Remove..." />
           </DropDownMenu> : '' }
         <Modal type="confirm" isOpen={modal == 'affirmPurchase'}
-               contentLabel="Confirm Purchase" onConfirmed={this.onAffirmPurchase.bind(this)} onAborted={closeModal}>
+               contentLabel="Confirm Purchase" onConfirmed={this.onAffirmPurchase.bind(this)} onAborted={this.closeModal.bind(this)}>
           This will purchase <strong>{title}</strong> for <strong><FilePrice uri={uri} look="plain" /></strong> credits.
         </Modal>
         <Modal isOpen={modal == 'notEnoughCredits'} contentLabel="Not enough credits"
diff --git a/ui/js/component/link/view.js b/ui/js/component/link/view.js
index 8d690d555..783fefe3a 100644
--- a/ui/js/component/link/view.js
+++ b/ui/js/component/link/view.js
@@ -92,7 +92,7 @@ export default Link
 
 //     return (
 //       <a className={className} href={this.props.href || 'javascript:;'} title={this.props.title}
-//          onClick={this.handleClick} {... 'style' in this.props ? {style: this.props.style} : {}}>
+//          onClick={(event) => { this.handleClick() }} {... 'style' in this.props ? {style: this.props.style} : {}}>
 //         {content}
 //       </a>
 //     );
diff --git a/ui/js/component/menu.js b/ui/js/component/menu.js
index 7176895a4..25d3e95ac 100644
--- a/ui/js/component/menu.js
+++ b/ui/js/component/menu.js
@@ -81,9 +81,9 @@ export class DropDownMenu extends React.Component {
     }
     return (
       <div className="menu-container">
-        <Link ref={(span) => this._menuButton = span} button="text" icon="icon-ellipsis-v" onClick={this.handleMenuIconClick} />
+        <Link ref={(span) => this._menuButton = span} button="text" icon="icon-ellipsis-v" onClick={(event) => { this.handleMenuIconClick(event) }} />
         {this.state.menuOpen
-          ? <div ref={(div) => this._menuDiv = div} className="menu" onClick={this.handleMenuClick}>
+          ? <div ref={(div) => this._menuDiv = div} className="menu" onClick={(event) => { this.handleMenuClick(event) }}>
               {this.props.children}
             </div>
           : null}
diff --git a/ui/js/component/modal.js b/ui/js/component/modal.js
index 6d7bbc2d8..bd3c1eb3c 100644
--- a/ui/js/component/modal.js
+++ b/ui/js/component/modal.js
@@ -81,7 +81,7 @@ export class ExpandableModal extends React.Component {
         <div className="modal__buttons">
           <Link button="primary" label={this.props.confirmButtonLabel} className="modal__button" onClick={this.props.onConfirmed} />
           <Link button="alt" label={!this.state.expanded ? this.props.expandButtonLabel : this.props.hideButtonLabel}
-                className="modal__button" onClick={this.toggleExpanded} />
+                className="modal__button" onClick={() => { this.toggleExpanded() }} />
         </div>
       </Modal>
     );
diff --git a/ui/js/component/reward-link.js b/ui/js/component/reward-link.js
index 7dbd3046b..e9b511476 100644
--- a/ui/js/component/reward-link.js
+++ b/ui/js/component/reward-link.js
@@ -78,9 +78,9 @@ export class RewardLink extends React.Component {
         {this.props.claimed
           ? <span><Icon icon="icon-check" /> Reward claimed.</span>
           : <Link button={this.props.button ? this.props.button : 'alt'} disabled={this.state.pending || !this.state.claimable }
-                  label={ this.state.pending ? "Claiming..." : "Claim Reward"} onClick={this.claimReward} />}
+                  label={ this.state.pending ? "Claiming..." : "Claim Reward"} onClick={() => { this.claimReward() }} />}
         {this.state.errorMessage ?
-         <Modal isOpen={true} contentLabel="Reward Claim Error" className="error-modal" onConfirmed={this.clearError}>
+         <Modal isOpen={true} contentLabel="Reward Claim Error" className="error-modal" onConfirmed={() => { this.clearError() }}>
            {this.state.errorMessage}
          </Modal>
           : ''}
diff --git a/ui/js/component/splash.js b/ui/js/component/splash.js
index f2bc33405..e2be56b67 100644
--- a/ui/js/component/splash.js
+++ b/ui/js/component/splash.js
@@ -18,7 +18,7 @@ export class SplashScreen extends React.Component {
   }
 
   updateStatus() {
-    lbry.status().then(this._updateStatusCallback);
+    lbry.status().then((status) => { this._updateStatusCallback(status) });
   }
 
   _updateStatusCallback(status) {
diff --git a/ui/js/component/tooltip.js b/ui/js/component/tooltip.js
index af83a2858..beab4eadd 100644
--- a/ui/js/component/tooltip.js
+++ b/ui/js/component/tooltip.js
@@ -29,11 +29,11 @@ export class ToolTip extends React.Component {
   render() {
     return (
       <span className={'tooltip ' + (this.props.className || '')}>
-        <a className="tooltip__link" onClick={this.handleClick}>
+        <a className="tooltip__link" onClick={() => { this.handleClick() }}>
           {this.props.label}
         </a>
         <div className={'tooltip__body ' + (this.state.showTooltip ? '' : ' hidden')}
-             onMouseOut={this.handleTooltipMouseOut}>
+             onMouseOut={() => { this.handleTooltipMouseOut() }}>
           {this.props.body}
         </div>
       </span>
diff --git a/ui/js/component/video/view.jsx b/ui/js/component/video/view.jsx
index e4502f8d2..7490c69b1 100644
--- a/ui/js/component/video/view.jsx
+++ b/ui/js/component/video/view.jsx
@@ -51,9 +51,9 @@ class VideoPlayButton extends React.Component {
             label={label ? label : ""}
             className="video__play-button"
             icon="icon-play"
-            onClick={this.onWatchClick} />
+            onClick={() => { this.onWatchClick() }} />
       {modal}
-      <Modal contentLabel="Not enough credits" isOpen={modal == 'notEnoughCredits'} onConfirmed={closeModal}>
+      <Modal contentLabel="Not enough credits" isOpen={modal == 'notEnoughCredits'} onConfirmed={() => { this.closeModal() }}>
         You don't have enough LBRY credits to pay for this stream.
       </Modal>
       <Modal
@@ -65,7 +65,7 @@ class VideoPlayButton extends React.Component {
         This will purchase <strong>{title}</strong> for <strong><FilePrice uri={uri} look="plain" /></strong> credits.
       </Modal>
       <Modal
-        isOpen={modal == 'timedOut'} onConfirmed={closeModal} contentLabel="Timed Out">
+        isOpen={modal == 'timedOut'} onConfirmed={() => { this.closeModal() }} contentLabel="Timed Out">
         Sorry, your download timed out :(
       </Modal>
     </div>);
diff --git a/ui/js/page/developer.js b/ui/js/page/developer.js
index 8e8d618e5..96f82fa9f 100644
--- a/ui/js/page/developer.js
+++ b/ui/js/page/developer.js
@@ -65,25 +65,25 @@ class DeveloperPage extends React.Component {
         <section className="card">
           <h3>Developer Settings</h3>
           <div className="form-row">
-            <label><FormField type="checkbox" onChange={this.handleShowDeveloperMenuChange} checked={this.state.showDeveloperMenu} /> Show developer menu</label>
+            <label><FormField type="checkbox" onChange={(event) => { this.handleShowDeveloperMenuChange() }} checked={this.state.showDeveloperMenu} /> Show developer menu</label>
           </div>
           <div className="form-row">
-            <label><FormField type="checkbox" onChange={this.handleUseCustomLighthouseServersChange} checked={this.state.useCustomLighthouseServers} /> Use custom search servers</label>
+            <label><FormField type="checkbox" onChange={(event) => { this.handleUseCustomLighthouseServersChange() }} checked={this.state.useCustomLighthouseServers} /> Use custom search servers</label>
           </div>
           {this.state.useCustomLighthouseServers
             ? <div className="form-row">
                 <label>
                   Custom search servers (one per line)
-                  <div><FormField type="textarea" className="developer-page__custom-lighthouse-servers" value={this.state.customLighthouseServers} onChange={this.handleCustomLighthouseServersChange} checked={this.state.debugMode} /></div>
+                  <div><FormField type="textarea" className="developer-page__custom-lighthouse-servers" value={this.state.customLighthouseServers} onChange={(event) => { this.handleCustomLighthouseServersChange() }} checked={this.state.debugMode} /></div>
                 </label>
               </div>
             : null}
         </section>
         <section className="card">
           <div className="form-row">
-            <FormField name="file" ref="file" type="file" onChange={this.handleUpgradeFileChange}/>
+            <FormField name="file" ref="file" type="file" onChange={(event) => { this.handleUpgradeFileChange() }}/>
             &nbsp;
-            <Link label="Force Upgrade" button="alt" onClick={this.handleForceUpgradeClick} />
+            <Link label="Force Upgrade" button="alt" onClick={(event) => { this.handleForceUpgradeClick() }} />
           </div>
         </section>
       </main>
diff --git a/ui/js/page/publish/view.jsx b/ui/js/page/publish/view.jsx
index b61f4a9b9..676febfe1 100644
--- a/ui/js/page/publish/view.jsx
+++ b/ui/js/page/publish/view.jsx
@@ -409,7 +409,7 @@ class PublishPage extends React.Component {
 
     return (
       <main className="main--single-column">
-        <form onSubmit={this.handleSubmit}>
+        <form onSubmit={(event) => { this.handleSubmit(event) }}>
           <section className="card">
             <div className="card__title-primary">
               <h4>Content</h4>
@@ -418,7 +418,7 @@ class PublishPage extends React.Component {
               </div>
             </div>
             <div className="card__content">
-              <FormRow name="file" label="File" ref="file" type="file" onChange={this.onFileChange}
+              <FormRow name="file" label="File" ref="file" type="file" onChange={(event) => { this.onFileChange(event) }}
                        helper={this.state.myClaimExists ? "If you don't choose a file, the file from your existing claim will be used." : null}/>
             </div>
             { !this.state.hasFile ? '' :
@@ -468,7 +468,7 @@ class PublishPage extends React.Component {
               <FormField type="radio" name="isFree" label={!this.state.isFee ? 'Choose price...' : 'Price ' }
                          onChange={ () => { this.handleFeePrefChange(true) } } defaultChecked={this.state.isFee} />
              <span className={!this.state.isFee ? 'hidden' : ''}>
-               <FormField type="number" className="form-field__input--inline" step="0.01" placeholder="1.00" onChange={this.handleFeeAmountChange} /> <FormField type="select" onChange={this.handleFeeCurrencyChange}>
+               <FormField type="number" className="form-field__input--inline" step="0.01" placeholder="1.00" onChange={(event) => this.handleFeeAmountChange(event)} /> <FormField type="select" onChange={(event) => { this.handleFeeCurrencyChange(event) }}>
                <option value="USD">US Dollars</option>
                <option value="LBC">LBRY credits</option>
              </FormField>
@@ -477,7 +477,7 @@ class PublishPage extends React.Component {
                   <div className="form-field__helper">
                     If you choose to price this content in dollars, the number of credits charged will be adjusted based on the value of LBRY credits at the time of purchase.
                   </div> : '' }
-              <FormRow label="License" type="select" ref="meta_license" name="license" onChange={this.handleLicenseChange}>
+              <FormRow label="License" type="select" ref="meta_license" name="license" onChange={(event) => { this.handleLicenseChange(event) }}>
                 <option></option>
                 <option>Public Domain</option>
                 <option data-url="https://creativecommons.org/licenses/by/4.0/legalcode">Creative Commons Attribution 4.0 International</option>
@@ -492,13 +492,13 @@ class PublishPage extends React.Component {
               <FormField type="hidden" ref="meta_license_url" name="license_url" value={this.getLicenseUrl()} />
               {this.state.copyrightChosen
                 ?  <FormRow label="Copyright notice" type="text" name="copyright-notice"
-                            value={this.state.copyrightNotice} onChange={this.handleCopyrightNoticeChange} />
+                            value={this.state.copyrightNotice} onChange={(event) => { this.handleCopyrightNoticeChange(event) }} />
                 : null}
               {this.state.otherLicenseChosen ?
-               <FormRow label="License description" type="text" name="other-license-description" onChange={this.handleOtherLicenseDescriptionChange} />
+               <FormRow label="License description" type="text" name="other-license-description" onChange={(event) => { this.handleOtherLicenseDescriptionChange() }} />
                 : null}
               {this.state.otherLicenseChosen ?
-               <FormRow label="License URL" type="text" name="other-license-url" onChange={this.handleOtherLicenseUrlChange} />
+               <FormRow label="License URL" type="text" name="other-license-url" onChange={(event) => { this.handleOtherLicenseUrlChange(event) }} />
                 : null}
             </div>
           </section>
@@ -511,7 +511,7 @@ class PublishPage extends React.Component {
               </div>
             </div>
             <div className="card__content">
-              <FormRow type="select" tabIndex="1" onChange={this.handleChannelChange} value={this.state.channel}>
+              <FormRow type="select" tabIndex="1" onChange={(event) => { this.handleChannelChange(event) }} value={this.state.channel}>
                 <option key="anonymous" value="anonymous">Anonymous</option>
                 {this.state.channels.map(({name}) => <option key={name} value={name}>{name}</option>)}
                 <option key="new" value="new">New identity...</option>
@@ -519,17 +519,17 @@ class PublishPage extends React.Component {
             </div>
             {this.state.channel == 'new' ?
                <div className="card__content">
-                 <FormRow label="Name" type="text" onChange={this.handleNewChannelNameChange} ref={newChannelName => { this.refs.newChannelName = newChannelName }}
+                 <FormRow label="Name" type="text" onChange={(event) => { this.handleNewChannelNameChange(event) }} ref={newChannelName => { this.refs.newChannelName = newChannelName }}
                           value={this.state.newChannelName} />
                  <FormRow label="Deposit"
                           postfix="LBC"
                           step="0.01"
                           type="number"
                           helper={lbcInputHelp}
-                          onChange={this.handleNewChannelBidChange}
+                          onChange={(event) => { this.handleNewChannelBidChange(event) }}
                           value={this.state.newChannelBid} />
                  <div className="form-row-submit">
-                    <Link button="primary" label={!this.state.creatingChannel ? 'Create identity' : 'Creating identity...'} onClick={this.handleCreateChannelClick} disabled={this.state.creatingChannel} />
+                    <Link button="primary" label={!this.state.creatingChannel ? 'Create identity' : 'Creating identity...'} onClick={(event) => { this.handleCreateChannelClick(event) }} disabled={this.state.creatingChannel} />
                  </div>
                 </div>
               : null}
@@ -542,7 +542,7 @@ class PublishPage extends React.Component {
               <div className="card__subtitle">Where should this content permanently reside? <Link label="Read more" href="https://lbry.io/faq/naming" />.</div>
             </div>
             <div className="card__content">
-              <FormRow prefix="lbry://" type="text" ref="name" placeholder="myname" value={this.state.rawName} onChange={this.handleNameChange}
+              <FormRow prefix="lbry://" type="text" ref="name" placeholder="myname" value={this.state.rawName} onChange={(event) => { this.handleNameChange(event) }}
                        helper={this.getNameBidHelpText()} />
             </div>
             { this.state.rawName ?
@@ -552,7 +552,7 @@ class PublishPage extends React.Component {
                              step="0.01"
                              label="Deposit"
                              postfix="LBC"
-                             onChange={this.handleBidChange}
+                             onChange={(event) => { this.handleBidChange(event) }}
                              value={this.state.bid}
                              placeholder={this.state.nameResolved ? this.state.topClaimValue + 10 : 100}
                              helper={lbcInputHelp} />
@@ -566,24 +566,24 @@ class PublishPage extends React.Component {
             <div className="card__content">
               <FormRow label={
                 <span>I agree to the <Link href="https://www.lbry.io/termsofservice" label="LBRY terms of service" checked={this.state.TOSAgreed} /></span>
-              } type="checkbox" name="tos_agree" ref={(field) => { this.refs.tos_agree = field }} onChange={this.handleTOSChange} />
+              } type="checkbox" name="tos_agree" ref={(field) => { this.refs.tos_agree = field }} onChange={(event) => { this.handleTOSChange(event)}} />
             </div>
           </section>
 
           <div className="card-series-submit">
-            <Link button="primary" label={!this.state.submitting ? 'Publish' : 'Publishing...'} onClick={this.handleSubmit} disabled={this.state.submitting} />
+            <Link button="primary" label={!this.state.submitting ? 'Publish' : 'Publishing...'} onClick={(event) => { this.handleSubmit(event) }} disabled={this.state.submitting} />
             <Link button="cancel" onClick={lbry.back} label="Cancel" />
             <input type="submit" className="hidden" />
           </div>
         </form>
 
         <Modal isOpen={this.state.modal == 'publishStarted'} contentLabel="File published"
-               onConfirmed={this.handlePublishStartedConfirmed}>
+               onConfirmed={(event) => { this.handlePublishStartedConfirmed(event) }}>
           <p>Your file has been published to LBRY at the address <code>lbry://{this.state.name}</code>!</p>
           <p>The file will take a few minutes to appear for other LBRY users. Until then it will be listed as "pending" under your published files.</p>
         </Modal>
         <Modal isOpen={this.state.modal == 'error'} contentLabel="Error publishing file"
-               onConfirmed={this.closeModal}>
+               onConfirmed={(event) => { this.closeModal(event) }}>
           The following error occurred when attempting to publish your file: {this.state.errorMessage}
         </Modal>
       </main>
diff --git a/ui/js/page/report.js b/ui/js/page/report.js
index 8c4b54301..5c8aee799 100644
--- a/ui/js/page/report.js
+++ b/ui/js/page/report.js
@@ -44,7 +44,7 @@ class ReportPage extends React.Component {
             <textarea ref={(t) => this._messageArea = t} cols="80" rows="10" name="message" type="text"/>
           </div>
           <div className="form-row form-row-submit">
-            <button onClick={this.submitMessage} className={'button-block button-primary ' + (this.state.submitting ? 'disabled' : '')}>{this.state.submitting ? 'Submitting...' : 'Submit Report'}</button>
+            <button onClick={(event) => { this.submitMessage(event) }} className={'button-block button-primary ' + (this.state.submitting ? 'disabled' : '')}>{this.state.submitting ? 'Submitting...' : 'Submit Report'}</button>
           </div>
         </section>
         <section className="card">
@@ -52,7 +52,7 @@ class ReportPage extends React.Component {
           You can also <Link href="https://github.com/lbryio/lbry/issues" label="submit an issue on GitHub"/>.
         </section>
         <Modal isOpen={this.state.modal == 'submitted'} contentLabel="Bug report submitted"
-               onConfirmed={this.closeModal}>
+               onConfirmed={(event) => { this.closeModal(event) }}>
           Your bug report has been submitted! Thank you for your feedback.
         </Modal>
       </main>
diff --git a/ui/js/page/settings/view.jsx b/ui/js/page/settings/view.jsx
index 0d04593dd..c896d266d 100644
--- a/ui/js/page/settings/view.jsx
+++ b/ui/js/page/settings/view.jsx
@@ -9,7 +9,7 @@ class SettingsPage extends React.Component {
 
     const daemonSettings = this.props.daemonSettings
 
-    return {
+    this.state = {
       isMaxUpload: daemonSettings && daemonSettings.max_upload != 0,
       isMaxDownload: daemonSettings && daemonSettings.max_download != 0,
       showNsfw: lbry.getClientSetting('showNsfw'),