diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef87b8f3d..3a97a6e4a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,7 +15,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
  * Adds Persistence to File List Filter Selections ([#2050](https://github.com/lbryio/lbry-desktop/pull/2050))
 
 ### Changed
- * Upgraded to lbrynet v0.30.0 ([#1998](https://github.com/lbryio/lbry-desktop/pull/1998))
  * Make tooltip smarter ([#1979](https://github.com/lbryio/lbry-desktop/pull/1979))
  * Change channel pages to have 48 items instead of 10 ([#2002](https://github.com/lbryio/lbry-desktop/pull/2002))
  * Update to https ([#2016](https://github.com/lbryio/lbry-desktop/pull/2016))
@@ -97,10 +96,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
  * Fix middle click link error ([#1843](https://github.com/lbryio/lbry-desktop/issues/1843)}
  * Problem with search auto-complete menu when scrolling over file viewer ([#1847](https://github.com/lbryio/lbry-desktop/issues/1847))
  * Show label when publish button is disabled while uploading thumbnail to spee.ch ([#1867](https://github.com/lbryio/lbry-desktop/pull/1867))
- * Edit option missing from certain published claims ([#1756](https://github.com/lbryio/lbry-desktop/issues/1756))
-  * Navigation issue with channels that have more than one page ([#1797](https://github.com/lbryio/lbry-desktop/pull/1797))
-  * Navigation issue with channels that have more than one page ([#1797](https://github.com/lbryio/lbry-desktop/pull/1797))
-  * Upgrade modals would stack on-top of each other if the app was kept open for a long time ([#1857](https://github.com/lbryio/lbry-desktop/pull/1857))
 
 ### Added
  * 3D file viewer for OBJ & STL file types ([#1558](https://github.com/lbryio/lbry-desktop/pull/1558))
@@ -119,6 +114,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
   * More descriptive error message when Shapeshift is unavailable ([#1771](https://github.com/lbryio/lbry-desktop/pull/1771))
   * Rename the Github repo to lbry-desktop ([#1765](https://github.com/lbryio/lbry-desktop/pull/1765))
 
+
+### Fixed
+  * Edit option missing from certain published claims ([#1756](https://github.com/lbryio/lbry-desktop/issues/1756))
+  * Navigation issue with channels that have more than one page ([#1797](https://github.com/lbryio/lbry-desktop/pull/1797))
+  * Navigation issue with channels that have more than one page ([#1797](https://github.com/lbryio/lbry-desktop/pull/1797))
+  * Upgrade modals would stack on-top of each other if the app was kept open for a long time ([#1857](https://github.com/lbryio/lbry-desktop/pull/1857))
+
+
 ## [0.22.2] - 2018-07-09
 
 ### Fixed
diff --git a/build/downloadDaemon.js b/build/downloadDaemon.js
index 4bb955d4e..4e45f1ad2 100644
--- a/build/downloadDaemon.js
+++ b/build/downloadDaemon.js
@@ -17,7 +17,7 @@ const downloadDaemon = targetPlatform =>
     let currentPlatform = os.platform();
 
     var daemonPlatform = process.env.TARGET || targetPlatform || currentPlatform;
-    if (daemonPlatform === 'mac' || daemonPlatform === 'darwin') daemonPlatform = 'mac';
+    if (daemonPlatform === 'mac' || daemonPlatform === 'darwin') daemonPlatform = 'macos';
     if (daemonPlatform === 'win32' || daemonPlatform === 'windows') {
      daemonPlatform = 'windows';
      daemonFileName = daemonFileName + '.exe';
diff --git a/package.json b/package.json
index 4f1b1bc35..0dce4c7e0 100644
--- a/package.json
+++ b/package.json
@@ -49,8 +49,8 @@
     "formik": "^0.10.4",
     "hast-util-sanitize": "^1.1.2",
     "keytar": "^4.2.1",
-    "lbry-redux": "lbryio/lbry-redux#2375860d6269d0369418879c2531b1d48c4e47f2",
-    "lbryinc": "lbryio/lbryinc#7a458ea13ceceffa0191e73139f94e5c953f22b1",
+    "lbry-redux": "lbryio/lbry-redux#03aea43da5f12bc01546a92bdf460ebd08681013",
+    "lbryinc": "lbryio/lbryinc#3f34af546ee73ff2ee7d8ad05e540b3b0aa658fb",
     "localforage": "^1.7.1",
     "mammoth": "^1.4.6",
     "mime": "^2.3.1",
@@ -134,9 +134,9 @@
     "yarn": "^1.3"
   },
   "lbrySettings": {
-    "lbrynetDaemonVersion": "0.30.0",
-    "lbrynetDaemonUrlTemplate": "https://github.com/lbryio/lbry/releases/download/vDAEMONVER/lbrynet-OSNAME.zip",
+    "lbrynetDaemonVersion": "0.21.2",
+    "lbrynetDaemonUrlTemplate": "https://github.com/lbryio/lbry/releases/download/vDAEMONVER/lbrynet-daemon-vDAEMONVER-OSNAME.zip",
     "lbrynetDaemonDir": "static/daemon",
-    "lbrynetDaemonFileName": "lbrynet"
+    "lbrynetDaemonFileName": "lbrynet-daemon"
   }
 }
diff --git a/src/main/Daemon.js b/src/main/Daemon.js
index 326c2d92d..f530f9768 100644
--- a/src/main/Daemon.js
+++ b/src/main/Daemon.js
@@ -3,7 +3,7 @@ import path from 'path';
 import { spawn, execSync } from 'child_process';
 
 export default class Daemon {
-  static path = process.env.LBRY_DAEMON || path.join(__static, 'daemon/lbrynet');
+  static path = process.env.LBRY_DAEMON || path.join(__static, 'daemon/lbrynet-daemon');
   subprocess;
   handlers;
 
@@ -12,12 +12,13 @@ export default class Daemon {
   }
 
   launch() {
-    this.subprocess = spawn(Daemon.path, ['start']);
+    console.log('Launching daemon:', Daemon.path);
+    this.subprocess = spawn(Daemon.path);
 
     this.subprocess.stdout.on('data', data => console.log(`Daemon: ${data}`));
     this.subprocess.stderr.on('data', data => console.error(`Daemon: ${data}`));
     this.subprocess.on('exit', () => this.fire('exit'));
-    this.subprocess.on('error', error => console.error(`Daemon error: ${error}`));
+    this.subprocess.on('error', error => console.error(`Daemon: ${error}`));
   }
 
   quit() {
diff --git a/src/main/index.js b/src/main/index.js
index 91a0d41a3..2f19fcd97 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -64,9 +64,8 @@ if (isDev) {
 }
 
 app.on('ready', async () => {
-  const processList = await findProcess('name', 'lbrynet');
+  const processList = await findProcess('name', 'lbrynet-daemon');
   const isDaemonRunning = processList.length > 0;
-
   if (!isDaemonRunning) {
     daemon = new Daemon();
     daemon.on('exit', () => {
@@ -96,16 +95,11 @@ app.on('ready', async () => {
   // HACK: patch webrequest to fix devtools incompatibility with electron 2.x.
   // See https://github.com/electron/electron/issues/13008#issuecomment-400261941
   session.defaultSession.webRequest.onBeforeRequest({}, (details, callback) => {
-    if (details.url.indexOf('7accc8730b0f99b5e7c0702ea89d1fa7c17bfe33') !== -1) {
-      callback({
-        redirectURL: details.url.replace(
-          '7accc8730b0f99b5e7c0702ea89d1fa7c17bfe33',
-          '57c9d07b416b5a2ea23d28247300e4af36329bdc'
-        ),
-      });
-    } else {
-      callback({ cancel: false });
-    }
+  if (details.url.indexOf('7accc8730b0f99b5e7c0702ea89d1fa7c17bfe33') !== -1) {
+    callback({redirectURL: details.url.replace('7accc8730b0f99b5e7c0702ea89d1fa7c17bfe33', '57c9d07b416b5a2ea23d28247300e4af36329bdc')});
+  } else {
+    callback({cancel: false});
+  }
   });
 });
 
diff --git a/src/renderer/component/cardMedia/index.js b/src/renderer/component/cardMedia/index.js
index 1f7988712..22c6c0488 100644
--- a/src/renderer/component/cardMedia/index.js
+++ b/src/renderer/component/cardMedia/index.js
@@ -1,8 +1,3 @@
-import React from 'react';
-import { connect } from 'react-redux';
 import CardMedia from './view';
 
-const select = state => ({});
-const perform = dispatch => ({});
-
-export default connect(select, perform)(CardMedia);
+export default CardMedia;
diff --git a/src/renderer/component/cardVerify/view.jsx b/src/renderer/component/cardVerify/view.jsx
index 5d3f3e007..0f3ff4fe0 100644
--- a/src/renderer/component/cardVerify/view.jsx
+++ b/src/renderer/component/cardVerify/view.jsx
@@ -7,20 +7,6 @@ let scriptLoading = false;
 let scriptLoaded = false;
 let scriptDidError = false;
 
-declare class CardVerify {
-  static stripeHandler: {
-    open: Function,
-    close: Function,
-  };
-}
-
-declare class StripeCheckout {
-  static configure({}): {
-    open: Function,
-    close: Function,
-  };
-}
-
 type Props = {
   disabled: boolean,
   label: ?string,
@@ -41,20 +27,14 @@ type Props = {
   //     token.id can be used to create a charge or customer.
   //     token.email contains the email address entered by the user.
   token: string,
-  email: string,
 };
 
-type State = {
-  open: boolean,
-};
-
-class CardVerifyComponent extends React.Component<Props, State> {
-  constructor(props: Props) {
+class CardVerify extends React.Component {
+  constructor(props) {
     super(props);
     this.state = {
       open: false,
     };
-    this.onClick = this.onClick.bind(this);
   }
 
   componentDidMount() {
@@ -85,14 +65,12 @@ class CardVerifyComponent extends React.Component<Props, State> {
           scriptDidError = true;
           scriptLoading = false;
           reject(event);
-          this.onScriptError();
+          this.onScriptError(event);
         };
       });
       const wrappedPromise = new Promise((accept, cancel) => {
-        promise.then(() => (canceled ? cancel(new Error({ isCanceled: true })) : accept()));
-        promise.catch(
-          error => (canceled ? cancel(new Error({ isCanceled: true })) : cancel(error))
-        );
+        promise.then(() => (canceled ? cancel({ isCanceled: true }) : accept()));
+        promise.catch(error => (canceled ? cancel({ isCanceled: true }) : cancel(error)));
       });
 
       return {
@@ -105,9 +83,7 @@ class CardVerifyComponent extends React.Component<Props, State> {
 
     this.loadPromise.promise.then(this.onScriptLoaded).catch(this.onScriptError);
 
-    if (document.body) {
-      document.body.appendChild(script);
-    }
+    document.body.appendChild(script);
   }
 
   componentDidUpdate() {
@@ -136,7 +112,7 @@ class CardVerifyComponent extends React.Component<Props, State> {
     }
   };
 
-  onScriptError = () => {
+  onScriptError = (...args) => {
     throw new Error('Unable to load credit validation script.');
   };
 
@@ -144,23 +120,6 @@ class CardVerifyComponent extends React.Component<Props, State> {
     this.setState({ open: false });
   };
 
-  onClick = () => {
-    if (scriptDidError) {
-      throw new Error('Tried to call onClick, but StripeCheckout failed to load');
-    } else if (CardVerify.stripeHandler) {
-      this.showStripeDialog();
-    } else {
-      this.hasPendingClick = true;
-    }
-  };
-
-  loadPromise: {
-    promise: Promise<any>,
-    cancel: Function,
-  };
-
-  hasPendingClick: boolean;
-
   updateStripeHandler() {
     if (!CardVerify.stripeHandler) {
       CardVerify.stripeHandler = StripeCheckout.configure({
@@ -183,6 +142,18 @@ class CardVerifyComponent extends React.Component<Props, State> {
     });
   }
 
+  onClick = () => {
+    if (scriptDidError) {
+      try {
+        throw new Error('Tried to call onClick, but StripeCheckout failed to load');
+      } catch (x) {}
+    } else if (CardVerify.stripeHandler) {
+      this.showStripeDialog();
+    } else {
+      this.hasPendingClick = true;
+    }
+  };
+
   render() {
     return (
       <Button
@@ -190,10 +161,10 @@ class CardVerifyComponent extends React.Component<Props, State> {
         label={this.props.label}
         icon={icons.LOCK}
         disabled={this.props.disabled || this.state.open || this.hasPendingClick}
-        onClick={this.onClick}
+        onClick={this.onClick.bind(this)}
       />
     );
   }
 }
 
-export default CardVerifyComponent;
+export default CardVerify;
diff --git a/src/renderer/component/fileCard/index.js b/src/renderer/component/fileCard/index.js
index 626a9a5b0..b61ae8bb1 100644
--- a/src/renderer/component/fileCard/index.js
+++ b/src/renderer/component/fileCard/index.js
@@ -6,7 +6,6 @@ import {
   makeSelectFileInfoForUri,
   makeSelectIsUriResolving,
   makeSelectClaimIsMine,
-  makeSelectClaimIsPending,
 } from 'lbry-redux';
 import { doNavigate } from 'redux/actions/navigation';
 import {
@@ -14,22 +13,34 @@ import {
   makeSelectContentPositionForUri,
 } from 'redux/selectors/content';
 import { selectShowNsfw } from 'redux/selectors/settings';
+import { selectPendingPublish } from 'redux/selectors/publish';
 import { makeSelectIsSubscribed } from 'redux/selectors/subscriptions';
 import { doClearContentHistoryUri } from 'redux/actions/content';
 import FileCard from './view';
 
-const select = (state, props) => ({
-  pending: makeSelectClaimIsPending(props.uri)(state),
-  claim: makeSelectClaimForUri(props.uri)(state),
-  obscureNsfw: !selectShowNsfw(state),
-  claimIsMine: makeSelectClaimIsMine(props.uri)(state),
-  rewardedContentClaimIds: selectRewardContentClaimIds(state, props),
-  fileInfo: makeSelectFileInfoForUri(props.uri)(state),
-  metadata: makeSelectMetadataForUri(props.uri)(state),
-  isResolvingUri: makeSelectIsUriResolving(props.uri)(state),
-  position: makeSelectContentPositionForUri(props.uri)(state),
-  isSubscribed: makeSelectIsSubscribed(props.uri)(state),
-});
+const select = (state, props) => {
+  let pendingPublish;
+  if (props.checkPending) {
+    pendingPublish = selectPendingPublish(props.uri)(state);
+  }
+
+  const fileCardInfo = pendingPublish || {
+    claim: makeSelectClaimForUri(props.uri)(state),
+    fileInfo: makeSelectFileInfoForUri(props.uri)(state),
+    metadata: makeSelectMetadataForUri(props.uri)(state),
+    isResolvingUri: makeSelectIsUriResolving(props.uri)(state),
+  };
+
+  return {
+    obscureNsfw: !selectShowNsfw(state),
+    claimIsMine: makeSelectClaimIsMine(props.uri)(state),
+    rewardedContentClaimIds: selectRewardContentClaimIds(state, props),
+    ...fileCardInfo,
+    pending: !!pendingPublish,
+    position: makeSelectContentPositionForUri(props.uri)(state),
+    isSubscribed: makeSelectIsSubscribed(props.uri)(state),
+  };
+};
 
 const perform = dispatch => ({
   navigate: (path, params) => dispatch(doNavigate(path, params)),
diff --git a/src/renderer/component/fileList/view.jsx b/src/renderer/component/fileList/view.jsx
index d5bb5e86d..b2b1eaa45 100644
--- a/src/renderer/component/fileList/view.jsx
+++ b/src/renderer/component/fileList/view.jsx
@@ -10,15 +10,15 @@ type Props = {
   sortByHeight?: boolean,
   claimsById: Array<{}>,
   fileInfos: Array<FileInfo>,
+  checkPending?: boolean,
   sortBy: string,
-  page?: string,
-  setFileListSort: (?string, string) => void,
+  page: string,
+  setFileListSort: (string, string) => void,
 };
 
 class FileList extends React.PureComponent<Props> {
   static defaultProps = {
     hideFilter: false,
-    sortBy: SORT_OPTIONS.DATE_NEW,
   };
 
   constructor(props: Props) {
@@ -29,12 +29,9 @@ class FileList extends React.PureComponent<Props> {
       [SORT_OPTIONS.DATE_NEW]: fileInfos =>
         this.props.sortByHeight
           ? fileInfos.sort((fileInfo1, fileInfo2) => {
-              if (fileInfo1.confirmations < 1) {
+              if (fileInfo1.pending) {
                 return -1;
-              } else if (fileInfo2.confirmations < 1) {
-                return 1;
               }
-
               const height1 = this.props.claimsById[fileInfo1.claim_id]
                 ? this.props.claimsById[fileInfo1.claim_id].height
                 : 0;
@@ -127,8 +124,7 @@ class FileList extends React.PureComponent<Props> {
   sortFunctions: {};
 
   render() {
-    const { fileInfos, hideFilter, sortBy } = this.props;
-
+    const { fileInfos, hideFilter, checkPending, sortBy } = this.props;
     const content = [];
     if (!fileInfos) {
       return null;
@@ -154,7 +150,7 @@ class FileList extends React.PureComponent<Props> {
       const outpoint = `${txid}:${nout}`;
 
       // See https://github.com/lbryio/lbry-desktop/issues/1327 for discussion around using outpoint as the key
-      content.push(<FileCard key={outpoint} uri={uri} isNew={isNew} />);
+      content.push(<FileCard key={outpoint} uri={uri} checkPending={checkPending} isNew={isNew} />);
     });
 
     return (
diff --git a/src/renderer/component/fileListSearch/index.js b/src/renderer/component/fileListSearch/index.js
index 5f4011e2d..351776461 100644
--- a/src/renderer/component/fileListSearch/index.js
+++ b/src/renderer/component/fileListSearch/index.js
@@ -8,9 +8,4 @@ const select = (state, props) => ({
   isSearching: selectIsSearching(state),
 });
 
-const perform = () => ({});
-
-export default connect(
-  select,
-  perform
-)(FileListSearch);
+export default connect(select)(FileListSearch);
diff --git a/src/renderer/component/formFieldPrice/index.js b/src/renderer/component/formFieldPrice/index.js
index c3dea1781..050c3d310 100644
--- a/src/renderer/component/formFieldPrice/index.js
+++ b/src/renderer/component/formFieldPrice/index.js
@@ -1,5 +1,3 @@
-import React from 'react';
-import { connect } from 'react-redux';
 import FormFieldPrice from './view';
 
-export default connect(null, null)(FormFieldPrice);
+export default FormFieldPrice;
diff --git a/src/renderer/component/publishForm/index.js b/src/renderer/component/publishForm/index.js
index dfb124897..6b0644544 100644
--- a/src/renderer/component/publishForm/index.js
+++ b/src/renderer/component/publishForm/index.js
@@ -1,5 +1,3 @@
-import { connect } from 'react-redux';
-import { selectBalance } from 'lbry-redux';
 import PublishForm from './view';
 
-export default connect(null, null)(PublishForm);
+export default PublishForm;
diff --git a/src/renderer/component/publishForm/view.jsx b/src/renderer/component/publishForm/view.jsx
index 672dbe90c..91b2300b2 100644
--- a/src/renderer/component/publishForm/view.jsx
+++ b/src/renderer/component/publishForm/view.jsx
@@ -123,7 +123,7 @@ class PublishForm extends React.PureComponent<Props> {
     const { channel, updatePublishForm } = this.props;
 
     if (!name) {
-      updatePublishForm({ name: '', nameError: __('A name is required.') });
+      updatePublishForm({ nameError: undefined });
       return;
     }
 
diff --git a/src/renderer/component/selectChannel/view.jsx b/src/renderer/component/selectChannel/view.jsx
index 94e734f13..01dbb8d41 100644
--- a/src/renderer/component/selectChannel/view.jsx
+++ b/src/renderer/component/selectChannel/view.jsx
@@ -159,6 +159,7 @@ class ChannelSection extends React.PureComponent<Props, State> {
           <FormField
             key="channel"
             type="select"
+            tabIndex="1"
             onChange={this.handleChannelChange}
             value={channel}
           >
diff --git a/src/renderer/component/theme/index.js b/src/renderer/component/theme/index.js
index 77f5fba6d..cb4fc92c9 100644
--- a/src/renderer/component/theme/index.js
+++ b/src/renderer/component/theme/index.js
@@ -1,10 +1,9 @@
-import React from 'react';
 import { connect } from 'react-redux';
-import { selectThemePath } from 'redux/selectors/settings.js';
+import { selectThemePath } from 'redux/selectors/settings';
 import Theme from './view';
 
 const select = state => ({
   themePath: selectThemePath(state),
 });
 
-export default connect(select, null)(Theme);
+export default connect(select)(Theme);
diff --git a/src/renderer/component/uriIndicator/view.jsx b/src/renderer/component/uriIndicator/view.jsx
index d394850b7..85e070ac0 100644
--- a/src/renderer/component/uriIndicator/view.jsx
+++ b/src/renderer/component/uriIndicator/view.jsx
@@ -38,12 +38,18 @@ class UriIndicator extends React.PureComponent<Props> {
     if (!claim) {
       return <span className="empty">{isResolvingUri ? 'Validating...' : 'Unused'}</span>;
     }
-    const { channel_name: channelName, signature_is_valid: signatureIsValid, value } = claim;
+
+    const {
+      channel_name: channelName,
+      has_signature: hasSignature,
+      signature_is_valid: signatureIsValid,
+      value,
+    } = claim;
 
     const channelClaimId =
       value && value.publisherSignature && value.publisherSignature.certificateId;
 
-    if (!channelName) {
+    if (!hasSignature || !channelName) {
       return <span className="channel-name">Anonymous</span>;
     }
 
diff --git a/src/renderer/component/walletSendTip/index.js b/src/renderer/component/walletSendTip/index.js
index 57f4c5d28..ad1d98cb7 100644
--- a/src/renderer/component/walletSendTip/index.js
+++ b/src/renderer/component/walletSendTip/index.js
@@ -1,6 +1,6 @@
 import { connect } from 'react-redux';
 import {
-  doSendTip,
+  doSendSupport,
   makeSelectTitleForUri,
   makeSelectClaimForUri,
   selectIsSendingSupport,
@@ -16,10 +16,7 @@ const select = (state, props) => ({
 });
 
 const perform = dispatch => ({
-  sendSupport: (amount, claimId, uri) => dispatch(doSendTip(amount, claimId, uri)),
+  sendSupport: (amount, claimId, uri) => dispatch(doSendSupport(amount, claimId, uri)),
 });
 
-export default connect(
-  select,
-  perform
-)(WalletSendTip);
+export default connect(select, perform)(WalletSendTip);
diff --git a/src/renderer/logWarningConsoleMessage.js b/src/renderer/logWarningConsoleMessage.js
index 84a2cd05f..12f0d1a0e 100644
--- a/src/renderer/logWarningConsoleMessage.js
+++ b/src/renderer/logWarningConsoleMessage.js
@@ -23,12 +23,12 @@ export default function doLogWarningConsoleMessage(activeOnDev = false) {
   );
 
   console.log(
-    "%cIf you don't understand exactly what you are doing here, please close this window and keep your LBC credits/wallet safe.",
+    "%cIf you don't understand what you are doing here, please close this window and keep your LBC credits/wallet safe.",
     style.redText
   );
 
   console.log(
-    '%cIf you do understand exactly what you are doing, joins us, earn LBC, and make LBRY better! All of LBRY is open-source and we have a sweet secret handshake. Get started at https://lbry.tech/contribute',
+    '%cIf you do understand exactly what you are doing, you should come work with us https://lbry.io/join-us',
     style.normalText
   );
 }
diff --git a/src/renderer/modal/modalAuthFailure/index.js b/src/renderer/modal/modalAuthFailure/index.js
index cae0bbbe7..de152b077 100644
--- a/src/renderer/modal/modalAuthFailure/index.js
+++ b/src/renderer/modal/modalAuthFailure/index.js
@@ -2,10 +2,13 @@ import { connect } from 'react-redux';
 import { doHideNotification } from 'lbry-redux';
 import ModalAuthFailure from './view';
 
-const select = state => ({});
+const select = () => ({});
 
 const perform = dispatch => ({
   close: () => dispatch(doHideNotification()),
 });
 
-export default connect(null, null)(ModalAuthFailure);
+export default connect(
+  select,
+  perform
+)(ModalAuthFailure);
diff --git a/src/renderer/modal/modalAutoUpdateConfirm/index.js b/src/renderer/modal/modalAutoUpdateConfirm/index.js
index 14c3c8967..c46dbc7d1 100644
--- a/src/renderer/modal/modalAutoUpdateConfirm/index.js
+++ b/src/renderer/modal/modalAutoUpdateConfirm/index.js
@@ -1,4 +1,3 @@
-import React from 'react';
 import { connect } from 'react-redux';
 import { doAutoUpdateDeclined } from 'redux/actions/app';
 import { doHideNotification } from 'lbry-redux';
@@ -9,4 +8,7 @@ const perform = dispatch => ({
   declineAutoUpdate: () => dispatch(doAutoUpdateDeclined()),
 });
 
-export default connect(null, perform)(ModalAutoUpdateConfirm);
+export default connect(
+  null,
+  perform
+)(ModalAutoUpdateConfirm);
diff --git a/src/renderer/modal/modalAutoUpdateDownloaded/index.js b/src/renderer/modal/modalAutoUpdateDownloaded/index.js
index ced2d84b7..70eacbb0f 100644
--- a/src/renderer/modal/modalAutoUpdateDownloaded/index.js
+++ b/src/renderer/modal/modalAutoUpdateDownloaded/index.js
@@ -1,4 +1,3 @@
-import React from 'react';
 import { connect } from 'react-redux';
 import { doAutoUpdateDeclined } from 'redux/actions/app';
 import { doHideNotification } from 'lbry-redux';
@@ -9,4 +8,7 @@ const perform = dispatch => ({
   declineAutoUpdate: () => dispatch(doAutoUpdateDeclined()),
 });
 
-export default connect(null, perform)(ModalAutoUpdateDownloaded);
+export default connect(
+  null,
+  perform
+)(ModalAutoUpdateDownloaded);
diff --git a/src/renderer/modal/modalDownloading/index.js b/src/renderer/modal/modalDownloading/index.js
index ac9089bc0..9b3fd2044 100644
--- a/src/renderer/modal/modalDownloading/index.js
+++ b/src/renderer/modal/modalDownloading/index.js
@@ -1,4 +1,3 @@
-import React from 'react';
 import { connect } from 'react-redux';
 import { doStartUpgrade, doCancelUpgrade } from 'redux/actions/app';
 import { doHideNotification } from 'lbry-redux';
diff --git a/src/renderer/modal/modalTransactionFailed/index.js b/src/renderer/modal/modalTransactionFailed/index.js
index cee37a19d..e9529429b 100644
--- a/src/renderer/modal/modalTransactionFailed/index.js
+++ b/src/renderer/modal/modalTransactionFailed/index.js
@@ -2,10 +2,13 @@ import { connect } from 'react-redux';
 import { doHideNotification } from 'lbry-redux';
 import ModalTransactionFailed from './view';
 
-const select = state => ({});
+const select = () => ({});
 
 const perform = dispatch => ({
   closeModal: () => dispatch(doHideNotification()),
 });
 
-export default connect(select, perform)(ModalTransactionFailed);
+export default connect(
+  select,
+  perform
+)(ModalTransactionFailed);
diff --git a/src/renderer/page/backup/index.js b/src/renderer/page/backup/index.js
index 43bc773f9..df4f971d8 100644
--- a/src/renderer/page/backup/index.js
+++ b/src/renderer/page/backup/index.js
@@ -1,4 +1,3 @@
-import React from 'react';
 import { connect } from 'react-redux';
 import { selectDaemonSettings } from 'redux/selectors/settings';
 import BackupPage from './view';
@@ -7,4 +6,4 @@ const select = state => ({
   daemonSettings: selectDaemonSettings(state),
 });
 
-export default connect(select, null)(BackupPage);
+export default connect(select)(BackupPage);
diff --git a/src/renderer/page/fileListPublished/index.js b/src/renderer/page/fileListPublished/index.js
index d3b4e90fd..871c44ed5 100644
--- a/src/renderer/page/fileListPublished/index.js
+++ b/src/renderer/page/fileListPublished/index.js
@@ -1,19 +1,20 @@
 import { connect } from 'react-redux';
-import { selectPendingPublishes } from 'redux/selectors/publish';
-import { selectIsFetchingClaimListMine, selectFileListPublishedSort, selectMyClaimsWithoutChannels } from 'lbry-redux';
+import { selectPendingPublishes, selectClaimsWithPendingPublishes } from 'redux/selectors/publish';
+import { selectIsFetchingClaimListMine, selectFileListPublishedSort } from 'lbry-redux';
 import { doNavigate } from 'redux/actions/navigation';
 import { doCheckPendingPublishes } from 'redux/actions/publish';
 import FileListPublished from './view';
 
 const select = state => ({
-  claims: selectMyClaimsWithoutChannels(state),
+  claims: selectClaimsWithPendingPublishes(state),
   fetching: selectIsFetchingClaimListMine(state),
+  pendingPublishes: selectPendingPublishes(state),
   sortBy: selectFileListPublishedSort(state),
 });
 
 const perform = dispatch => ({
   navigate: path => dispatch(doNavigate(path)),
-  checkPendingPublishes: () => dispatch(doCheckPendingPublishes()),
+  checkIfPublishesConfirmed: publishes => dispatch(doCheckPendingPublishes(publishes)),
 });
 
 export default connect(
diff --git a/src/renderer/page/fileListPublished/view.jsx b/src/renderer/page/fileListPublished/view.jsx
index 338da3b60..d25fb8c9b 100644
--- a/src/renderer/page/fileListPublished/view.jsx
+++ b/src/renderer/page/fileListPublished/view.jsx
@@ -1,5 +1,4 @@
 // @flow
-import type { Claim } from 'types/claim';
 import React from 'react';
 import Button from 'component/button';
 import FileList from 'component/fileList';
@@ -7,8 +6,9 @@ import Page from 'component/page';
 import { PAGES } from 'lbry-redux';
 
 type Props = {
-  claims: Array<Claim>,
-  checkPendingPublishes: () => void,
+  pendingPublishes: Array<{}>,
+  claims: Array<{}>,
+  checkIfPublishesConfirmed: (Array<{}>) => void,
   navigate: (string, ?{}) => void,
   fetching: boolean,
   sortBy: string,
@@ -16,8 +16,10 @@ type Props = {
 
 class FileListPublished extends React.PureComponent<Props> {
   componentDidMount() {
-    const { checkPendingPublishes } = this.props;
-    checkPendingPublishes();
+    const { pendingPublishes, checkIfPublishesConfirmed } = this.props;
+    if (pendingPublishes.length) {
+      checkIfPublishesConfirmed(pendingPublishes);
+    }
   }
 
   render() {
diff --git a/src/renderer/page/getCredits/index.js b/src/renderer/page/getCredits/index.js
index c212a7e62..557278c25 100644
--- a/src/renderer/page/getCredits/index.js
+++ b/src/renderer/page/getCredits/index.js
@@ -1,5 +1,3 @@
-import React from 'react';
-import { connect } from 'react-redux';
 import GetCreditsPage from './view';
 
-export default connect(null, null)(GetCreditsPage);
+export default GetCreditsPage;
diff --git a/src/renderer/page/help/view.jsx b/src/renderer/page/help/view.jsx
index 52c22a2c8..4bd07428a 100644
--- a/src/renderer/page/help/view.jsx
+++ b/src/renderer/page/help/view.jsx
@@ -26,6 +26,7 @@ type VersionInfo = {
   os_release: string,
   platform: string,
   lbrynet_version: string,
+  lbryum_version: string,
 };
 
 type State = {
@@ -208,6 +209,10 @@ class HelpPage extends React.PureComponent<Props, State> {
                   <td>{__('Daemon (lbrynet)')}</td>
                   <td>{ver.lbrynet_version}</td>
                 </tr>
+                <tr>
+                  <td>{__('Wallet (lbryum)')}</td>
+                  <td>{ver.lbryum_version}</td>
+                </tr>
                 <tr>
                   <td>{__('Connected Email')}</td>
                   <td>
diff --git a/src/renderer/page/sendCredits/index.js b/src/renderer/page/sendCredits/index.js
index 3441ef7fa..0d19a7d34 100644
--- a/src/renderer/page/sendCredits/index.js
+++ b/src/renderer/page/sendCredits/index.js
@@ -1,5 +1,3 @@
-import React from 'react';
-import { connect } from 'react-redux';
 import SendReceivePage from './view';
 
-export default connect(null, null)(SendReceivePage);
+export default SendReceivePage;
diff --git a/src/renderer/page/sendCredits/view.jsx b/src/renderer/page/sendCredits/view.jsx
index 82b038068..6195c0e10 100644
--- a/src/renderer/page/sendCredits/view.jsx
+++ b/src/renderer/page/sendCredits/view.jsx
@@ -3,7 +3,7 @@ import WalletSend from 'component/walletSend';
 import WalletAddress from 'component/walletAddress';
 import Page from 'component/page';
 
-const SendReceivePage = props => (
+const SendReceivePage = () => (
   <Page>
     <WalletSend />
     <WalletAddress />
diff --git a/src/renderer/page/subscriptions/index.js b/src/renderer/page/subscriptions/index.js
index a62734e5d..70fb57fc3 100644
--- a/src/renderer/page/subscriptions/index.js
+++ b/src/renderer/page/subscriptions/index.js
@@ -15,6 +15,7 @@ import {
 } from 'redux/actions/subscriptions';
 import { doSetClientSetting } from 'redux/actions/settings';
 import { makeSelectClientSetting } from 'redux/selectors/settings';
+import { selectFileListSubscriptionSort } from 'lbry-redux';
 import SubscriptionsPage from './view';
 
 const select = state => ({
@@ -25,6 +26,7 @@ const select = state => ({
   autoDownload: makeSelectClientSetting(settings.AUTO_DOWNLOAD)(state),
   allSubscriptions: selectSubscriptionClaims(state),
   unreadSubscriptions: selectUnreadSubscriptions(state),
+  sortBy: selectFileListSubscriptionSort(state),
   viewMode: selectViewMode(state),
 });
 
diff --git a/src/renderer/page/subscriptions/view.jsx b/src/renderer/page/subscriptions/view.jsx
index 5b7b80578..fa039d318 100644
--- a/src/renderer/page/subscriptions/view.jsx
+++ b/src/renderer/page/subscriptions/view.jsx
@@ -10,7 +10,7 @@ import FileList from 'component/fileList';
 import HiddenNsfwClaims from 'component/hiddenNsfwClaims';
 import { FormField } from 'component/common/form';
 import FileCard from 'component/fileCard';
-import { parseURI } from 'lbry-redux';
+import { parseURI, PAGES } from 'lbry-redux';
 
 type Props = {
   subscribedChannels: Array<string>, // The channels a user is subscribed to
@@ -25,6 +25,7 @@ type Props = {
   doSetViewMode: ViewMode => void,
   doFetchMySubscriptions: () => void,
   doSetClientSetting: (string, boolean) => void,
+  sortBy: string,
 };
 
 export default class extends React.PureComponent<Props> {
@@ -44,13 +45,19 @@ export default class extends React.PureComponent<Props> {
   }
 
   renderSubscriptions() {
-    const { viewMode, unreadSubscriptions, allSubscriptions } = this.props;
+    const { viewMode, unreadSubscriptions, allSubscriptions, sortBy } = this.props;
 
     if (viewMode === VIEW_ALL) {
       return (
         <React.Fragment>
           <div className="card__title">{__('Your subscriptions')}</div>
-          <FileList hideFilter sortByHeight fileInfos={allSubscriptions} />
+          <FileList
+            hideFilter
+            sortByHeight
+            fileInfos={allSubscriptions}
+            sortBy={sortBy}
+            page={PAGES.SUBSCRIPTIONS}
+          />
         </React.Fragment>
       );
     }
diff --git a/src/renderer/page/wallet/index.js b/src/renderer/page/wallet/index.js
index 364f16edb..5199c1623 100644
--- a/src/renderer/page/wallet/index.js
+++ b/src/renderer/page/wallet/index.js
@@ -1,5 +1,3 @@
-import React from 'react';
-import { connect } from 'react-redux';
 import WalletPage from './view';
 
-export default connect(null, null)(WalletPage);
+export default WalletPage;
diff --git a/src/renderer/redux/actions/content.js b/src/renderer/redux/actions/content.js
index 81fdcecda..5a07c8ad7 100644
--- a/src/renderer/redux/actions/content.js
+++ b/src/renderer/redux/actions/content.js
@@ -292,7 +292,7 @@ export function doFetchClaimsByChannel(uri, page, pageSize) {
       data: { uri, page },
     });
 
-    Lbry.claim_list_by_channel({ uri, page: page || 1, page_size: pageSize || 20 }).then(result => {
+    Lbry.claim_list_by_channel({ uri, page: page || 1, page_size: pageSize || 48 }).then(result => {
       const claimResult = result[uri] || {};
       const { claims_in_channel: claimsInChannel, returned_page: returnedPage } = claimResult;
 
diff --git a/src/renderer/redux/actions/publish.js b/src/renderer/redux/actions/publish.js
index af0e9709a..ca831c214 100644
--- a/src/renderer/redux/actions/publish.js
+++ b/src/renderer/redux/actions/publish.js
@@ -1,11 +1,4 @@
 // @flow
-import type { Dispatch, GetState } from 'types/redux';
-import type { Source, Metadata } from 'types/claim';
-import type {
-  UpdatePublishFormData,
-  UpdatePublishFormAction,
-  PublishParams,
-} from 'redux/reducers/publish';
 import {
   ACTIONS,
   Lbry,
@@ -14,14 +7,20 @@ import {
   selectMyChannelClaims,
   THUMBNAIL_STATUSES,
   batchActions,
-  creditsToString,
-  selectPendingById,
 } from 'lbry-redux';
+import { selectPendingPublishes } from 'redux/selectors/publish';
+import type {
+  UpdatePublishFormData,
+  UpdatePublishFormAction,
+  PublishParams,
+} from 'redux/reducers/publish';
 import { selectosNotificationsEnabled } from 'redux/selectors/settings';
 import { doNavigate } from 'redux/actions/navigation';
 import fs from 'fs';
 import path from 'path';
 import { CC_LICENSES, COPYRIGHT, OTHER } from 'constants/licenses';
+import type { Dispatch, GetState } from 'types/redux';
+import type { Source } from 'types/claim';
 
 type Action = UpdatePublishFormAction | { type: ACTIONS.CLEAR_PUBLISH };
 
@@ -230,6 +229,7 @@ export const doPublish = (params: PublishParams) => (
     licenseUrl,
     language,
     thumbnail,
+    fee: fee || undefined,
     description: description || undefined,
   };
 
@@ -237,23 +237,16 @@ export const doPublish = (params: PublishParams) => (
     name: ?string,
     channel_id: string,
     bid: ?number,
-    metadata: ?Metadata,
+    metadata: ?any,
     file_path?: string,
     sources?: Source,
   } = {
     name,
     channel_id: channelId,
-    bid: creditsToString(bid),
+    bid,
     metadata,
   };
 
-  if (fee) {
-    metadata.fee = {
-      currency: fee.currency,
-      amount: creditsToString(fee.amount),
-    };
-  }
-
   if (filePath) {
     publishPayload.file_path = filePath;
   } else {
@@ -265,6 +258,7 @@ export const doPublish = (params: PublishParams) => (
   const success = () => {
     dispatch({
       type: ACTIONS.PUBLISH_SUCCESS,
+      data: { pendingPublish: { ...publishPayload } },
     });
     dispatch(doNotify({ id: MODALS.PUBLISH }, { uri }));
   };
@@ -280,21 +274,28 @@ export const doPublish = (params: PublishParams) => (
 // Calls claim_list_mine until any pending publishes are confirmed
 export const doCheckPendingPublishes = () => (dispatch: Dispatch<Action>, getState: GetState) => {
   const state = getState();
-  const pendingById = selectPendingById(state);
-  if (!Object.keys(pendingById)) {
-    return;
-  }
+  const pendingPublishes = selectPendingPublishes(state);
 
   let publishCheckInterval;
 
   const checkFileList = () => {
     Lbry.claim_list_mine().then(claims => {
-      claims.forEach(claim => {
-        // If it's confirmed, check that it wasn't pending previously
-        if (claim.confirmations > 0 && pendingById[claim.claim_id]) {
-          delete pendingById[claim.claim_id];
+      const pendingPublishMap = {};
+      pendingPublishes.forEach(({ name }) => {
+        pendingPublishMap[name] = name;
+      });
 
-          // If it's confirmed, check if we should notify the user
+      const actions = [];
+      claims.forEach(claim => {
+        if (pendingPublishMap[claim.name]) {
+          actions.push({
+            type: ACTIONS.REMOVE_PENDING_PUBLISH,
+            data: {
+              name: claim.name,
+            },
+          });
+
+          delete pendingPublishMap[claim.name];
           if (selectosNotificationsEnabled(getState())) {
             const notif = new window.Notification('LBRY Publish Complete', {
               body: `${claim.value.stream.metadata.title} has been published to lbry://${
@@ -313,21 +314,25 @@ export const doCheckPendingPublishes = () => (dispatch: Dispatch<Action>, getSta
         }
       });
 
-      dispatch({
+      actions.push({
         type: ACTIONS.FETCH_CLAIM_LIST_MINE_COMPLETED,
         data: {
           claims,
         },
       });
 
-      if (!Object.keys(pendingById).length) {
+      dispatch(batchActions(...actions));
+
+      if (!Object.keys(pendingPublishMap).length) {
         clearInterval(publishCheckInterval);
       }
     });
   };
 
-  checkFileList();
-  publishCheckInterval = setInterval(() => {
+  if (pendingPublishes.length) {
     checkFileList();
-  }, 30000);
+    publishCheckInterval = setInterval(() => {
+      checkFileList();
+    }, 30000);
+  }
 };
diff --git a/src/renderer/redux/actions/subscriptions.js b/src/renderer/redux/actions/subscriptions.js
index 5ad5ba103..ab03efe8d 100644
--- a/src/renderer/redux/actions/subscriptions.js
+++ b/src/renderer/redux/actions/subscriptions.js
@@ -100,7 +100,7 @@ export const doFetchMySubscriptions = () => (dispatch: ReduxDispatch, getState:
         data: subscriptions,
       });
 
-      subscriptions.forEach(({ uri }) => dispatch(doFetchClaimsByChannel(uri, 1)));
+      subscriptions.forEach(({ uri }) => dispatch(doFetchClaimsByChannel(uri, 1, 20)));
     })
     .catch(() => {
       dispatch({
diff --git a/src/renderer/redux/reducers/publish.js b/src/renderer/redux/reducers/publish.js
index e32fe1814..53e20375c 100644
--- a/src/renderer/redux/reducers/publish.js
+++ b/src/renderer/redux/reducers/publish.js
@@ -29,6 +29,7 @@ type PublishState = {
   bidError: ?string,
   otherLicenseDescription: string,
   licenseUrl: string,
+  pendingPublishes: Array<any>,
 };
 
 export type UpdatePublishFormData = {
@@ -114,6 +115,7 @@ const defaultState: PublishState = {
   publishing: false,
   publishSuccess: false,
   publishError: undefined,
+  pendingPublishes: [],
 };
 
 export default handleActions(
@@ -125,9 +127,10 @@ export default handleActions(
         ...data,
       };
     },
-    [ACTIONS.CLEAR_PUBLISH]: (): PublishState => ({
-      ...defaultState,
-    }),
+    [ACTIONS.CLEAR_PUBLISH]: (state: PublishState): PublishState => {
+      const { pendingPublishes } = state;
+      return { ...defaultState, pendingPublishes };
+    },
     [ACTIONS.PUBLISH_START]: (state: PublishState): PublishState => ({
       ...state,
       publishing: true,
@@ -136,11 +139,29 @@ export default handleActions(
       ...state,
       publishing: false,
     }),
-    [ACTIONS.PUBLISH_SUCCESS]: (state: PublishState): PublishState => ({
-      ...state,
-      publishing: false,
-    }),
+    [ACTIONS.PUBLISH_SUCCESS]: (state: PublishState, action): PublishState => {
+      const { pendingPublish } = action.data;
+
+      const newPendingPublishes = state.pendingPublishes.slice();
+
+      newPendingPublishes.push(pendingPublish);
+
+      return {
+        ...state,
+        publishing: false,
+        pendingPublishes: newPendingPublishes,
+      };
+    },
+    [ACTIONS.REMOVE_PENDING_PUBLISH]: (state: PublishState, action) => {
+      const { name } = action.data;
+      const pendingPublishes = state.pendingPublishes.filter(publish => publish.name !== name);
+      return {
+        ...state,
+        pendingPublishes,
+      };
+    },
     [ACTIONS.DO_PREPARE_EDIT]: (state: PublishState, action) => {
+      const { pendingPublishes } = state;
       const { ...publishData } = action.data;
       const { channel, name, uri } = publishData;
 
@@ -154,6 +175,7 @@ export default handleActions(
       return {
         ...defaultState,
         ...publishData,
+        pendingPublishes,
         editingURI: uri,
         uri: shortUri,
       };
diff --git a/src/renderer/redux/selectors/publish.js b/src/renderer/redux/selectors/publish.js
index 536809f28..0d3c72bd5 100644
--- a/src/renderer/redux/selectors/publish.js
+++ b/src/renderer/redux/selectors/publish.js
@@ -10,11 +10,47 @@ import {
 
 const selectState = state => state.publish || {};
 
+export const selectPendingPublishes = createSelector(
+  selectState,
+  state => state.pendingPublishes.map(pendingClaim => ({ ...pendingClaim, pending: true })) || []
+);
+
+export const selectClaimsWithPendingPublishes = createSelector(
+  selectMyClaimsWithoutChannels,
+  selectPendingPublishes,
+  (claims, pendingPublishes) => {
+    // ensure there are no duplicates, they are being checked for in a setInterval
+    // no need to wait for it to complete though
+    // loop through myclaims
+    // if a claim has the same name as one in pendingPublish, remove it from pending
+    const claimMap = {};
+    claims.forEach(claim => {
+      claimMap[claim.name] = true;
+    });
+
+    const filteredPendingPublishes = pendingPublishes.filter(claim => !claimMap[claim.name]);
+    return [...filteredPendingPublishes, ...claims];
+  }
+);
+
 export const selectPublishFormValues = createSelector(selectState, state => {
   const { pendingPublish, ...formValues } = state;
   return formValues;
 });
 
+export const selectPendingPublish = uri =>
+  createSelector(selectPendingPublishes, pendingPublishes => {
+    const { claimName, contentName } = parseURI(uri);
+
+    if (!pendingPublishes.length) {
+      return null;
+    }
+
+    return pendingPublishes.filter(
+      publish => publish.name === claimName || publish.name === contentName
+    )[0];
+  });
+
 // Is the current uri the same as the uri they clicked "edit" on
 export const selectIsStillEditing = createSelector(selectPublishFormValues, publishState => {
   const { editingURI, uri } = publishState;
diff --git a/src/renderer/scss/component/_form-field.scss b/src/renderer/scss/component/_form-field.scss
index 58588df62..1fc15ac1f 100644
--- a/src/renderer/scss/component/_form-field.scss
+++ b/src/renderer/scss/component/_form-field.scss
@@ -92,7 +92,7 @@
 }
 
 .form-field__error {
-  color: $lbry-red-3 !important;
+  color: $lbry-red-5;
 }
 
 .form-field__help {
diff --git a/src/renderer/scss/themes/_dark.scss b/src/renderer/scss/themes/_dark.scss
index 4eb043ec1..45b1ba2e5 100644
--- a/src/renderer/scss/themes/_dark.scss
+++ b/src/renderer/scss/themes/_dark.scss
@@ -115,19 +115,4 @@ html[data-theme='dark'] {
   .item-list__item:not(:last-of-type) {
     border-bottom: 1px solid rgba($lbry-gray-1, 0.1);
   }
-
-  .modal-overlay,
-  .error-modal-overlay {
-    background-color: rgba($lbry-black, 0.7);
-  }
-
-  .btn {
-    color: $lbry-gray-3;
-  }
-
-  .modal {
-    background-color: rgba($lbry-black, 0.9);
-    border: 1px solid rgba($lbry-gray-1, 0.1);
-    color: $lbry-gray-3;
-  }
 }
diff --git a/src/renderer/util/formatCredits.js b/src/renderer/util/formatCredits.js
index 339ea3c42..98383c05f 100644
--- a/src/renderer/util/formatCredits.js
+++ b/src/renderer/util/formatCredits.js
@@ -1,7 +1,5 @@
-export function formatCredits(amount, precision = 1) {
-  return parseFloat(amount)
-    .toFixed(precision || 1)
-    .replace(/\.?0+$/, '');
+export function formatCredits(amount, precision) {
+  return amount.toFixed(precision || 1).replace(/\.?0+$/, '');
 }
 
 export function formatFullPrice(amount, precision = 1) {
diff --git a/yarn.lock b/yarn.lock
index 8df4ad01d..208228689 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5663,18 +5663,25 @@ lazy-val@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.3.tgz#bb97b200ef00801d94c317e29dc6ed39e31c5edc"
 
-lbry-redux@lbryio/lbry-redux#2375860d6269d0369418879c2531b1d48c4e47f2:
+lbry-redux@lbryio/lbry-redux:
   version "0.0.1"
-  resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/2375860d6269d0369418879c2531b1d48c4e47f2"
+  resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/a8e81949837171e94e649fce6f7c7a8b7faadd51"
   dependencies:
     proxy-polyfill "0.1.6"
     reselect "^3.0.0"
 
-lbryinc@lbryio/lbryinc#7a458ea13ceceffa0191e73139f94e5c953f22b1:
+lbry-redux@lbryio/lbry-redux#03aea43da5f12bc01546a92bdf460ebd08681013:
   version "0.0.1"
-  resolved "https://codeload.github.com/lbryio/lbryinc/tar.gz/7a458ea13ceceffa0191e73139f94e5c953f22b1"
+  resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/03aea43da5f12bc01546a92bdf460ebd08681013"
   dependencies:
-    lbry-redux lbryio/lbry-redux#2375860d6269d0369418879c2531b1d48c4e47f2
+    proxy-polyfill "0.1.6"
+    reselect "^3.0.0"
+
+lbryinc@lbryio/lbryinc#3f34af546ee73ff2ee7d8ad05e540b3b0aa658fb:
+  version "0.0.1"
+  resolved "https://codeload.github.com/lbryio/lbryinc/tar.gz/3f34af546ee73ff2ee7d8ad05e540b3b0aa658fb"
+  dependencies:
+    lbry-redux lbryio/lbry-redux
     reselect "^3.0.0"
 
 lcid@^1.0.0: