Merge branch 'master' into issue/763

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.19.2
+current_version = 0.19.3rc1
 commit = True
 tag = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)((?P<release>[a-z]+)(?P<candidate>\d+))?

CHANGELOG.md

@@ -12,11 +12,12 @@ Web UI version numbers should always match the corresponding version of LBRY App
   *
 
 ### Changed
-  *
+  * Improved internal code structuring by adding linting integration -- developers only (#891)
+  * Improved developer documentation (#910)
   *
 
 ### Fixed
-  *
+  * Added snackbar text in place where it was coming up blank (#902)
   *
 
 ### Deprecated
@@ -24,7 +25,7 @@ Web UI version numbers should always match the corresponding version of LBRY App
   *
 
 ### Removed
-  *
+  * Removed email verification reward (#914)
   *
 
 ## [0.19.2] - 2017-12-22

README.md

@@ -43,6 +43,16 @@ This will download and install the LBRY app and its dependencies, including
 The LBRY app requires Node >= 6; if you have an earlier version of Node installed and want to keep
 it, you can use [nvm](https://github.com/creationix/nvm) to switch back and forth.
 
+#### Arch Linux and Other Non-Debian Distributions
+
+Running the build script with `DEPS=true` triggers a bash script with `apt-get` specific commands.
+If you are using a distribution without `apt-get`, try running the script as:
+
+`./build.sh`
+
+You may also have to install the package [libsecret](https://wiki.gnome.org/Projects/Libsecret) if
+it is not already installed.
+
 ### Running
 
 The app can be run from the sources using the following command:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "LBRY",
-  "version": "0.19.2",
+  "version": "0.19.3rc1",
   "description": "A browser for the LBRY network, a digital marketplace controlled by its users.",
   "homepage": "https://lbry.io/",
   "bugs": {

src/renderer/component/userEmailNew/index.js

@@ -3,15 +3,10 @@ import { connect } from 'react-redux';
 import { doUserEmailNew, doUserInviteNew } from 'redux/actions/user';
 import { selectEmailNewIsPending, selectEmailNewErrorMessage } from 'redux/selectors/user';
 import UserEmailNew from './view';
-import rewards from 'rewards';
-import { makeSelectRewardAmountByType } from 'redux/selectors/rewards';
 
 const select = state => ({
   isPending: selectEmailNewIsPending(state),
   errorMessage: selectEmailNewErrorMessage(state),
-  rewardAmount: makeSelectRewardAmountByType()(state, {
-    reward_type: rewards.TYPE_CONFIRM_EMAIL,
-  }),
 });
 
 const perform = dispatch => ({

src/renderer/component/userEmailNew/view.jsx

@@ -1,5 +1,4 @@
 import React from 'react';
-import { CreditAmount } from 'component/common';
 import { Form, FormRow, Submit } from 'component/form.js';
 
 class UserEmailNew extends React.PureComponent {
@@ -23,18 +22,12 @@ class UserEmailNew extends React.PureComponent {
   }
 
   render() {
-    const { cancelButton, errorMessage, isPending, rewardAmount } = this.props;
+    const { cancelButton, errorMessage, isPending } = this.props;
 
     return (
       <div>
         <p>
-          Let us know your email and you'll receive{' '}
-          <CreditAmount amount={rewardAmount} label="LBC" />, the blockchain token used by LBRY.
-        </p>
-        <p>
-          {__(
-            "We'll also let you know about LBRY updates, security issues, and great new content."
-          )}
+          {__("We'll let you know about LBRY updates, security issues, and great new content.")}
         </p>
         <p>{__("We'll never sell your email, and you can unsubscribe at any time.")}</p>
         <Form onSubmit={this.handleSubmit.bind(this)}>

src/renderer/component/userEmailVerify/index.js

@@ -7,16 +7,11 @@ import {
   selectEmailVerifyErrorMessage,
 } from 'redux/selectors/user';
 import UserEmailVerify from './view';
-import rewards from 'rewards';
-import { makeSelectRewardAmountByType } from 'redux/selectors/rewards';
 
 const select = state => ({
   isPending: selectEmailVerifyIsPending(state),
   email: selectEmailToVerify(state),
   errorMessage: selectEmailVerifyErrorMessage(state),
-  rewardAmount: makeSelectRewardAmountByType()(state, {
-    reward_type: rewards.TYPE_CONFIRM_EMAIL,
-  }),
 });
 
 const perform = dispatch => ({

src/renderer/component/userEmailVerify/view.jsx

@@ -1,6 +1,5 @@
 import React from 'react';
 import Link from 'component/link';
-import { CreditAmount } from 'component/common';
 import { Form, FormRow, Submit } from 'component/form.js';
 
 class UserEmailVerify extends React.PureComponent {
@@ -29,7 +28,7 @@ class UserEmailVerify extends React.PureComponent {
   }
 
   render() {
-    const { cancelButton, errorMessage, email, isPending, rewardAmount } = this.props;
+    const { cancelButton, errorMessage, email, isPending } = this.props;
     return (
       <Form onSubmit={this.handleSubmit.bind(this)}>
         <p>Please enter the verification code emailed to {email}.</p>

src/renderer/modal/modalCreditIntro/index.js

@@ -1,28 +1,18 @@
-import React from 'react';
 import { connect } from 'react-redux';
 import { doCloseModal } from 'redux/actions/app';
 import { doNavigate } from 'redux/actions/navigation';
 import { doSetClientSetting } from 'redux/actions/settings';
 import { selectUserIsRewardApproved } from 'redux/selectors/user';
 import { selectBalance } from 'redux/selectors/wallet';
-import {
-  makeSelectHasClaimedReward,
-  makeSelectRewardByType,
-  selectUnclaimedRewardValue,
-} from 'redux/selectors/rewards';
+import { selectUnclaimedRewardValue } from 'redux/selectors/rewards';
 import * as settings from 'constants/settings';
 import ModalCreditIntro from './view';
 
-const select = (state, props) => {
-  const selectHasClaimed = makeSelectHasClaimedReward(),
-    selectReward = makeSelectRewardByType();
-
-  return {
-    currentBalance: selectBalance(state),
-    isRewardApproved: selectUserIsRewardApproved(state),
-    totalRewardValue: selectUnclaimedRewardValue(state),
-  };
-};
+const select = state => ({
+  currentBalance: selectBalance(state),
+  isRewardApproved: selectUserIsRewardApproved(state),
+  totalRewardValue: selectUnclaimedRewardValue(state),
+});
 
 const perform = dispatch => () => ({
   addBalance: () => {