From 3ca5f7a2e9c373c17c780059298808ceed5fdb4a Mon Sep 17 00:00:00 2001
From: Anna Melzer <anna@data-and-dragons.com>
Date: Wed, 31 Oct 2018 17:31:23 +0100
Subject: [PATCH 01/33] fix linting for button component

---
 src/renderer/component/button/index.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/renderer/component/button/index.js b/src/renderer/component/button/index.js
index 478015d09..c3bb8586d 100644
--- a/src/renderer/component/button/index.js
+++ b/src/renderer/component/button/index.js
@@ -6,4 +6,7 @@ const perform = dispatch => ({
   doNavigate: (path, params) => dispatch(doNavigate(path, params)),
 });
 
-export default connect(null, perform)(Button);
+export default connect(
+  null,
+  perform
+)(Button);
-- 
2.45.3


From ad0732eaf48cb5eb1164a68a92652a9c24a84288 Mon Sep 17 00:00:00 2001
From: Anna Melzer <anna@data-and-dragons.com>
Date: Wed, 31 Oct 2018 17:32:45 +0100
Subject: [PATCH 02/33] fix linting for channelTitle component

---
 src/renderer/component/channelTile/index.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/renderer/component/channelTile/index.js b/src/renderer/component/channelTile/index.js
index c272fc2bf..004816016 100644
--- a/src/renderer/component/channelTile/index.js
+++ b/src/renderer/component/channelTile/index.js
@@ -15,4 +15,7 @@ const perform = dispatch => ({
   resolveUri: uri => dispatch(doResolveUri(uri)),
 });
 
-export default connect(select, perform)(ChannelTile);
+export default connect(
+  select,
+  perform
+)(ChannelTile);
-- 
2.45.3


From 23a3b2dde6e1c96920f283248e909ce1887a19b3 Mon Sep 17 00:00:00 2001
From: Anna Melzer <anna@data-and-dragons.com>
Date: Wed, 31 Oct 2018 17:33:45 +0100
Subject: [PATCH 03/33] fix linting for credit-amount

---
 src/renderer/component/common/credit-amount.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/component/common/credit-amount.jsx b/src/renderer/component/common/credit-amount.jsx
index 79c4adc54..0f8d89338 100644
--- a/src/renderer/component/common/credit-amount.jsx
+++ b/src/renderer/component/common/credit-amount.jsx
@@ -82,7 +82,7 @@ class CreditAmount extends React.PureComponent<Props> {
           // TODO: remove inheritStyle prop
           // It just complicates things
           'credit-amount--inherit': inheritStyle,
-          badge: badge,
+          badge,
           'badge--cost': badge && !isFree,
           'badge--free': badge && isFree,
         })}
-- 
2.45.3


From 548dc4ae787b207a0b2edb188fb8a991a032f51b Mon Sep 17 00:00:00 2001
From: Anna Melzer <anna@data-and-dragons.com>
Date: Wed, 31 Oct 2018 17:35:12 +0100
Subject: [PATCH 04/33] fix linting for dateTime component

---
 src/renderer/component/dateTime/index.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/renderer/component/dateTime/index.js b/src/renderer/component/dateTime/index.js
index adae8f658..3e1ad14a1 100644
--- a/src/renderer/component/dateTime/index.js
+++ b/src/renderer/component/dateTime/index.js
@@ -10,4 +10,7 @@ const perform = dispatch => ({
   fetchBlock: height => dispatch(doFetchBlock(height)),
 });
 
-export default connect(select, perform)(DateTime);
+export default connect(
+  select,
+  perform
+)(DateTime);
-- 
2.45.3


From 256e09ac7439a9e65970380c24f58592aaf077af Mon Sep 17 00:00:00 2001
From: Anna Melzer <anna@data-and-dragons.com>
Date: Wed, 31 Oct 2018 17:37:06 +0100
Subject: [PATCH 05/33] fix linting for externalLink component

---
 src/renderer/component/externalLink/index.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/renderer/component/externalLink/index.js b/src/renderer/component/externalLink/index.js
index 2855016f2..81ad973d8 100644
--- a/src/renderer/component/externalLink/index.js
+++ b/src/renderer/component/externalLink/index.js
@@ -9,4 +9,7 @@ const perform = dispatch => ({
   openModal: (modal, props) => dispatch(doNotify(modal, props)),
 });
 
-export default connect(select, perform)(ExternalLink);
+export default connect(
+  select,
+  perform
+)(ExternalLink);
-- 
2.45.3


From 4d2f0ae3ce4dee762373663907e62b0562a9405b Mon Sep 17 00:00:00 2001
From: Anna Melzer <anna@data-and-dragons.com>
Date: Wed, 31 Oct 2018 17:40:17 +0100
Subject: [PATCH 06/33] fix linting for fileAction component

---
 src/renderer/component/fileActions/index.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/renderer/component/fileActions/index.js b/src/renderer/component/fileActions/index.js
index 1ee1cffe9..0a52424a8 100644
--- a/src/renderer/component/fileActions/index.js
+++ b/src/renderer/component/fileActions/index.js
@@ -18,4 +18,7 @@ const perform = dispatch => ({
   openModal: (modal, props) => dispatch(doNotify(modal, props)),
 });
 
-export default connect(select, perform)(FileActions);
+export default connect(
+  select,
+  perform
+)(FileActions);
-- 
2.45.3


From 76b71814965beea717ddf2a0434b680cfeccaf14 Mon Sep 17 00:00:00 2001
From: Anna Melzer <anna@data-and-dragons.com>
Date: Wed, 31 Oct 2018 17:41:25 +0100
Subject: [PATCH 07/33] fix linting for fileDetail component

---
 src/renderer/component/fileDetails/index.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/renderer/component/fileDetails/index.js b/src/renderer/component/fileDetails/index.js
index 18541f6da..fb92ce86f 100644
--- a/src/renderer/component/fileDetails/index.js
+++ b/src/renderer/component/fileDetails/index.js
@@ -19,4 +19,7 @@ const perform = dispatch => ({
   openFolder: path => dispatch(doOpenFileInFolder(path)),
 });
 
-export default connect(select, perform)(FileDetails);
+export default connect(
+  select,
+  perform
+)(FileDetails);
-- 
2.45.3


From a759ccb64bf7fb119f75813924e7ceeca95b8d7a Mon Sep 17 00:00:00 2001
From: Anna Melzer <anna@data-and-dragons.com>
Date: Wed, 31 Oct 2018 17:41:56 +0100
Subject: [PATCH 08/33] fix linting for filePrice component

---
 src/renderer/component/filePrice/index.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/renderer/component/filePrice/index.js b/src/renderer/component/filePrice/index.js
index 8351dc6f1..688644316 100644
--- a/src/renderer/component/filePrice/index.js
+++ b/src/renderer/component/filePrice/index.js
@@ -18,4 +18,7 @@ const perform = dispatch => ({
   // cancelFetchCostInfo: (uri) => dispatch(doCancelFetchCostInfoForUri(uri))
 });
 
-export default connect(select, perform)(FilePrice);
+export default connect(
+  select,
+  perform
+)(FilePrice);
-- 
2.45.3


From d443158ae99779f72524fe65aef49877396c700d Mon Sep 17 00:00:00 2001
From: Anna Melzer <anna@data-and-dragons.com>
Date: Wed, 31 Oct 2018 17:43:38 +0100
Subject: [PATCH 09/33] fix linting for nsfw overlay  component

---
 src/renderer/component/nsfwOverlay/index.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/renderer/component/nsfwOverlay/index.js b/src/renderer/component/nsfwOverlay/index.js
index 515a0ecd6..7a2eec7c5 100644
--- a/src/renderer/component/nsfwOverlay/index.js
+++ b/src/renderer/component/nsfwOverlay/index.js
@@ -6,4 +6,7 @@ const perform = dispatch => ({
   navigateSettings: () => dispatch(doNavigate('/settings')),
 });
 
-export default connect(null, perform)(NsfwOverlay);
+export default connect(
+  null,
+  perform
+)(NsfwOverlay);
-- 
2.45.3


From 83481270f3154a80a94a981cc1490222ce957efb Mon Sep 17 00:00:00 2001
From: Anna Melzer <anna@data-and-dragons.com>
Date: Wed, 31 Oct 2018 17:44:19 +0100
Subject: [PATCH 10/33] fix linting for router  component

---
 src/renderer/component/router/index.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/renderer/component/router/index.js b/src/renderer/component/router/index.js
index 20933d960..1d795a0c3 100644
--- a/src/renderer/component/router/index.js
+++ b/src/renderer/component/router/index.js
@@ -7,4 +7,7 @@ const select = state => ({
   currentPage: selectCurrentPage(state),
 });
 
-export default connect(select, { doNotify })(Router);
+export default connect(
+  select,
+  { doNotify }
+)(Router);
-- 
2.45.3


From 317473c18d63dfeeb2ef7210cf14c56d7706dff1 Mon Sep 17 00:00:00 2001
From: Anna Melzer <anna@data-and-dragons.com>
Date: Wed, 31 Oct 2018 17:46:33 +0100
Subject: [PATCH 11/33] fix linting for snackBar component

---
 src/renderer/component/snackBar/index.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/renderer/component/snackBar/index.js b/src/renderer/component/snackBar/index.js
index 55ea7e0a1..4899c31e9 100644
--- a/src/renderer/component/snackBar/index.js
+++ b/src/renderer/component/snackBar/index.js
@@ -10,4 +10,7 @@ const select = state => ({
   snack: selectSnack(state),
 });
 
-export default connect(select, perform)(SnackBar);
+export default connect(
+  select,
+  perform
+)(SnackBar);
-- 
2.45.3


From d28fc1beea6f35f1f740a7de429c0590a494b524 Mon Sep 17 00:00:00 2001
From: Anna Melzer <anna@data-and-dragons.com>
Date: Wed, 31 Oct 2018 17:47:37 +0100
Subject: [PATCH 12/33] fix linting for spinner component

---
 src/renderer/component/spinner/index.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/renderer/component/spinner/index.js b/src/renderer/component/spinner/index.js
index 6589e05da..f87e67748 100644
--- a/src/renderer/component/spinner/index.js
+++ b/src/renderer/component/spinner/index.js
@@ -6,4 +6,7 @@ const mapStateToProps = state => ({
   theme: selectTheme(state),
 });
 
-export default connect(mapStateToProps, null)(Spinner);
+export default connect(
+  mapStateToProps,
+  null
+)(Spinner);
-- 
2.45.3


From 980184e7ce36adbc084704ea5b7f3681527a8182 Mon Sep 17 00:00:00 2001
From: Anna Melzer <anna@data-and-dragons.com>
Date: Wed, 31 Oct 2018 17:48:30 +0100
Subject: [PATCH 13/33] fix linting for transactionlistrecent component

---
 src/renderer/component/transactionListRecent/index.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/renderer/component/transactionListRecent/index.js b/src/renderer/component/transactionListRecent/index.js
index 3a59bc82f..f4890679f 100644
--- a/src/renderer/component/transactionListRecent/index.js
+++ b/src/renderer/component/transactionListRecent/index.js
@@ -17,4 +17,7 @@ const perform = dispatch => ({
   fetchTransactions: () => dispatch(doFetchTransactions()),
 });
 
-export default connect(select, perform)(TransactionListRecent);
+export default connect(
+  select,
+  perform
+)(TransactionListRecent);
-- 
2.45.3


From 620950fabbdd01a33bb603dcdc066c221c18138c Mon Sep 17 00:00:00 2001
From: Anna Melzer <anna@data-and-dragons.com>
Date: Wed, 31 Oct 2018 17:49:11 +0100
Subject: [PATCH 14/33] fix linting for uriIndicator component

---
 src/renderer/component/uriIndicator/index.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/renderer/component/uriIndicator/index.js b/src/renderer/component/uriIndicator/index.js
index 8524965d5..d7bf10ec6 100644
--- a/src/renderer/component/uriIndicator/index.js
+++ b/src/renderer/component/uriIndicator/index.js
@@ -17,4 +17,7 @@ const perform = dispatch => ({
   resolveUri: uri => dispatch(doResolveUri(uri)),
 });
 
-export default connect(select, perform)(UriIndicator);
+export default connect(
+  select,
+  perform
+)(UriIndicator);
-- 
2.45.3


From 79994e25edce2dfaf1fd7e2211050d5c7a4a1e48 Mon Sep 17 00:00:00 2001
From: Anna Melzer <anna@data-and-dragons.com>
Date: Wed, 31 Oct 2018 17:49:52 +0100
Subject: [PATCH 15/33] fix linting for walletAddress component

---
 src/renderer/component/walletAddress/index.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/renderer/component/walletAddress/index.js b/src/renderer/component/walletAddress/index.js
index 8955c6651..603cf704e 100644
--- a/src/renderer/component/walletAddress/index.js
+++ b/src/renderer/component/walletAddress/index.js
@@ -17,4 +17,7 @@ const perform = dispatch => ({
   getNewAddress: () => dispatch(doGetNewAddress()),
 });
 
-export default connect(select, perform)(WalletAddress);
+export default connect(
+  select,
+  perform
+)(WalletAddress);
-- 
2.45.3


From 9f938432083075470a6c076e54214d2f58fc0a5b Mon Sep 17 00:00:00 2001
From: Anna Melzer <anna@data-and-dragons.com>
Date: Wed, 31 Oct 2018 17:50:34 +0100
Subject: [PATCH 16/33] fix linting for walletBalance component

---
 src/renderer/component/walletBalance/index.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/renderer/component/walletBalance/index.js b/src/renderer/component/walletBalance/index.js
index 9f69e655b..6e136f1bd 100644
--- a/src/renderer/component/walletBalance/index.js
+++ b/src/renderer/component/walletBalance/index.js
@@ -6,4 +6,7 @@ const select = state => ({
   balance: selectBalance(state),
 });
 
-export default connect(select, null)(WalletBalance);
+export default connect(
+  select,
+  null
+)(WalletBalance);
-- 
2.45.3


From 14ef8acc95032b133856c519787dcf9fb0ab7f93 Mon Sep 17 00:00:00 2001
From: Anna Melzer <anna@data-and-dragons.com>
Date: Wed, 31 Oct 2018 17:51:23 +0100
Subject: [PATCH 17/33] fix linting for walletSend component

---
 src/renderer/component/walletSend/index.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/renderer/component/walletSend/index.js b/src/renderer/component/walletSend/index.js
index a734be4c4..e009b175d 100644
--- a/src/renderer/component/walletSend/index.js
+++ b/src/renderer/component/walletSend/index.js
@@ -10,4 +10,7 @@ const select = state => ({
   balance: selectBalance(state),
 });
 
-export default connect(select, perform)(WalletSend);
+export default connect(
+  select,
+  perform
+)(WalletSend);
-- 
2.45.3


From 39d0b0c805b5cdff3e0bba714d8bc2bbe5c15487 Mon Sep 17 00:00:00 2001
From: Siddhant Sharma <siddhaantsharma.ss@gmail.com>
Date: Wed, 31 Oct 2018 23:07:47 +0530
Subject: [PATCH 18/33] Added release badge to the Readme and updated
 contributions!

---
 README.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 76ffec921..efc8b20a1 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,7 @@
 [![Build Status](https://travis-ci.org/lbryio/lbry-desktop.svg?branch=master)](https://travis-ci.org/lbryio/lbry-desktop)
 [![Dependencies](https://david-dm.org/lbryio/lbry-desktop/status.svg)](https://david-dm.org/lbryio/lbry-desktop)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/78b627d4f5524792adc48719835e1523)](https://www.codacy.com/app/LBRY/lbry-desktop?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=lbryio/lbry-desktop&amp;utm_campaign=Badge_Grade)
+[![GitHub release](https://img.shields.io/github/release/lbryio/lbry-desktop.svg)](https://GitHub.com/lbryio/lbry-desktop/releases/)
 [![chat on Discord](https://img.shields.io/discord/362322208485277697.svg?logo=discord)](https://chat.lbry.io)
 
 [![forthebadge](https://forthebadge.com/images/badges/60-percent-of-the-time-works-every-time.svg)](https://forthebadge.com)
@@ -64,9 +65,10 @@ distributable packages.
 
 If the app isn't building, or `yarn xxx` commands aren't working you may need to just reset your `node_modules`. To do so you can run: `rm -r node_modules && yarn` or `del /s /q node_modules && yarn` on Windows.
 
-## Contributing
+## Contributing 
+We :heart: contributions from everyone and contributions to this project are encouraged, and compensated. We welcome [bug reports](https://github.com/lbryio/lbry-desktop/issues/), [bug fixes](https://github.com/lbryio/lbry-desktop/pulls) and feedback is always appreciated. For more details, see [CONTRIBUTING.md](CONTRIBUTING.md).
 
-Contributions to this project are welcome, encouraged, and compensated. For more details, see [CONTRIBUTING.md](CONTRIBUTING.md).
+## [![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/lbryio/lbry-desktop/issues) [![GitHub contributors](https://img.shields.io/github/contributors/lbryio/lbry-desktop.svg)](https://GitHub.com/lbryio/lbry-desktop/graphs/contributors/)
 
 ## License
 
-- 
2.45.3


From 9ab45619a691f0e007eba0535ca31161ce0c2733 Mon Sep 17 00:00:00 2001
From: czakarian <31866115+czakarian@users.noreply.github.com>
Date: Wed, 31 Oct 2018 16:29:26 -0700
Subject: [PATCH 19/33] Fix grammatical error

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3ad36a747..b0931d0f5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -119,7 +119,7 @@ You can also use the following command:
 
 `$ yarn format`
 
-for applying formatting rules to all project's code sources. For formatting a specific file or
+for applying formatting rules to all projects' code sources. For formatting a specific file or
 directory, use:
 
 `$ yarn prettier 'glob/pattern'`
-- 
2.45.3


From e5db270b1cdaec2b8b509200e246c8beb8f153d6 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Wed, 31 Oct 2018 20:48:42 -0400
Subject: [PATCH 20/33] fix: channel button color on dark mode

---
 src/renderer/scss/themes/_dark.scss | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/renderer/scss/themes/_dark.scss b/src/renderer/scss/themes/_dark.scss
index 41b62c0b0..7460769d0 100644
--- a/src/renderer/scss/themes/_dark.scss
+++ b/src/renderer/scss/themes/_dark.scss
@@ -121,10 +121,6 @@ html[data-theme='dark'] {
     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);
-- 
2.45.3


From c3ef95daaa65077f0fdd4a4c4cf594e7d30787f4 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Wed, 31 Oct 2018 20:53:23 -0400
Subject: [PATCH 21/33] fix: disabled primary button in dark mode

---
 src/renderer/scss/component/_button.scss |  3 +--
 src/renderer/scss/themes/_dark.scss      | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/renderer/scss/component/_button.scss b/src/renderer/scss/component/_button.scss
index 182ec462a..a12d1a77e 100644
--- a/src/renderer/scss/component/_button.scss
+++ b/src/renderer/scss/component/_button.scss
@@ -74,8 +74,7 @@
     }
   }
 
-  &.btn--disabled:disabled {
-    // wtf?
+  &:disabled {
     cursor: default;
 
     &.btn--primary {
diff --git a/src/renderer/scss/themes/_dark.scss b/src/renderer/scss/themes/_dark.scss
index 7460769d0..6248f3e9f 100644
--- a/src/renderer/scss/themes/_dark.scss
+++ b/src/renderer/scss/themes/_dark.scss
@@ -82,9 +82,18 @@ html[data-theme='dark'] {
     background-color: rgba($lbry-red-1, 0.1);
   }
 
-  .btn.btn--alt:not(:disabled) {
-    background-color: rgba($lbry-white, 0.1);
-    color: $lbry-gray-1;
+  //
+  // BUTTON
+  //
+  .btn {
+    &.btn--alt:not(:disabled) {
+      background-color: rgba($lbry-white, 0.1);
+      color: $lbry-gray-1;
+    }
+
+    &.btn--primary:disabled {
+      background-color: rgba($lbry-teal-5, 0.15);
+    }
   }
 
   .search__top {
-- 
2.45.3


From abb5917329c2c07d30217be8ae4c614a360b471c Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Thu, 1 Nov 2018 09:30:04 -0400
Subject: [PATCH 22/33] fix: show pending publishes immediately

---
 .eslintrc.json                               |  3 +-
 src/renderer/page/fileListPublished/index.js |  7 ++--
 src/renderer/page/fileListPublished/view.jsx |  1 -
 src/renderer/redux/actions/publish.js        | 35 ++++++++++++++++----
 src/renderer/types/claim.js                  | 12 +++++++
 5 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 6a992f8bf..a8f285504 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -43,6 +43,7 @@
     "class-methods-use-this": 0,
     "jsx-a11y/interactive-supports-focus": 0,
     "jsx-a11y/click-events-have-key-events": 0,
-    "consistent-return": 0
+    "consistent-return": 0,
+    "flowtype/space-after-type-colon": [ 2, "always", { "allowLineBreak": true } ]
   }
 }
diff --git a/src/renderer/page/fileListPublished/index.js b/src/renderer/page/fileListPublished/index.js
index d3b4e90fd..1826fb78d 100644
--- a/src/renderer/page/fileListPublished/index.js
+++ b/src/renderer/page/fileListPublished/index.js
@@ -1,6 +1,9 @@
 import { connect } from 'react-redux';
-import { selectPendingPublishes } from 'redux/selectors/publish';
-import { selectIsFetchingClaimListMine, selectFileListPublishedSort, selectMyClaimsWithoutChannels } from 'lbry-redux';
+import {
+  selectIsFetchingClaimListMine,
+  selectFileListPublishedSort,
+  selectMyClaimsWithoutChannels,
+} from 'lbry-redux';
 import { doNavigate } from 'redux/actions/navigation';
 import { doCheckPendingPublishes } from 'redux/actions/publish';
 import FileListPublished from './view';
diff --git a/src/renderer/page/fileListPublished/view.jsx b/src/renderer/page/fileListPublished/view.jsx
index 338da3b60..478a79999 100644
--- a/src/renderer/page/fileListPublished/view.jsx
+++ b/src/renderer/page/fileListPublished/view.jsx
@@ -22,7 +22,6 @@ class FileListPublished extends React.PureComponent<Props> {
 
   render() {
     const { fetching, claims, navigate, sortBy } = this.props;
-
     return (
       <Page notContained loading={fetching}>
         {claims && claims.length ? (
diff --git a/src/renderer/redux/actions/publish.js b/src/renderer/redux/actions/publish.js
index af0e9709a..22e930213 100644
--- a/src/renderer/redux/actions/publish.js
+++ b/src/renderer/redux/actions/publish.js
@@ -16,6 +16,7 @@ import {
   batchActions,
   creditsToString,
   selectPendingById,
+  selectMyClaimsWithoutChannels,
 } from 'lbry-redux';
 import { selectosNotificationsEnabled } from 'redux/selectors/settings';
 import { doNavigate } from 'redux/actions/navigation';
@@ -199,6 +200,7 @@ export const doPublish = (params: PublishParams) => (
 ) => {
   const state = getState();
   const myChannels = selectMyChannelClaims(state);
+  const myClaims = selectMyClaimsWithoutChannels(state);
 
   const {
     name,
@@ -223,7 +225,7 @@ export const doPublish = (params: PublishParams) => (
   const channelId = namedChannelClaim ? namedChannelClaim.claim_id : '';
   const fee = contentIsFree || !price.amount ? undefined : { ...price };
 
-  const metadata = {
+  const metadata: Metadata = {
     title,
     nsfw,
     license,
@@ -262,11 +264,30 @@ export const doPublish = (params: PublishParams) => (
 
   dispatch({ type: ACTIONS.PUBLISH_START });
 
-  const success = () => {
-    dispatch({
+  const success = pendingClaim => {
+    const actions = [];
+
+    actions.push({
       type: ACTIONS.PUBLISH_SUCCESS,
     });
-    dispatch(doNotify({ id: MODALS.PUBLISH }, { uri }));
+
+    actions.push(doNotify({ id: MODALS.PUBLISH }, { uri }));
+
+    // We have to fake a temp claim until the new pending one is returned by claim_list_mine
+    // We can't rely on claim_list_mine because there might be some delay before the new claims are returned
+    // Doing this allows us to show the pending claim immediately, it will get overwritten by the real one
+    const myNewClaims = myClaims.map(
+      claim => (claim.claim_id === pendingClaim.claim_id ? pendingClaim.output : claim)
+    );
+
+    actions.push({
+      type: ACTIONS.FETCH_CLAIM_LIST_MINE_COMPLETED,
+      data: {
+        claims: myNewClaims,
+      },
+    });
+
+    dispatch(batchActions(...actions));
   };
 
   const failure = error => {
@@ -281,7 +302,8 @@ export const doPublish = (params: PublishParams) => (
 export const doCheckPendingPublishes = () => (dispatch: Dispatch<Action>, getState: GetState) => {
   const state = getState();
   const pendingById = selectPendingById(state);
-  if (!Object.keys(pendingById)) {
+
+  if (!Object.keys(pendingById).length) {
     return;
   }
 
@@ -290,7 +312,7 @@ export const doCheckPendingPublishes = () => (dispatch: Dispatch<Action>, getSta
   const checkFileList = () => {
     Lbry.claim_list_mine().then(claims => {
       claims.forEach(claim => {
-        // If it's confirmed, check that it wasn't pending previously
+        // If it's confirmed, check if it was pending previously
         if (claim.confirmations > 0 && pendingById[claim.claim_id]) {
           delete pendingById[claim.claim_id];
 
@@ -326,7 +348,6 @@ export const doCheckPendingPublishes = () => (dispatch: Dispatch<Action>, getSta
     });
   };
 
-  checkFileList();
   publishCheckInterval = setInterval(() => {
     checkFileList();
   }, 30000);
diff --git a/src/renderer/types/claim.js b/src/renderer/types/claim.js
index dcc8fef1e..a7b86a39e 100644
--- a/src/renderer/types/claim.js
+++ b/src/renderer/types/claim.js
@@ -14,6 +14,18 @@ export type Metadata = {
   title: string,
   thumbnail: ?string,
   description: ?string,
+  fee?:
+    | {
+        amount: number, // should be a string https://github.com/lbryio/lbry/issues/1576
+        currency: string,
+        address: string,
+        version: string,
+      }
+    | {
+        // We don't include a version or address in the metadata field when publishing
+        amount: number,
+        currency: string,
+      },
 };
 
 // Actual claim type has more values than this
-- 
2.45.3


From a910229c76f84cd5cbac6cbdb8d73bfb8981e195 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Thu, 1 Nov 2018 09:38:03 -0400
Subject: [PATCH 23/33] update lbry-redux

---
 package.json | 2 +-
 yarn.lock    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 0787f6304..373b72964 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
     "formik": "^0.10.4",
     "hast-util-sanitize": "^1.1.2",
     "keytar": "^4.2.1",
-    "lbry-redux": "lbryio/lbry-redux#f193d38c61ea061679ebc7b4ca139a0e9c95ef8a",
+    "lbry-redux": "lbryio/lbry-redux#c0e006825356fa00e1591838babe77540547624e",
     "lbryinc": "lbryio/lbryinc#7a458ea13ceceffa0191e73139f94e5c953f22b1",
     "localforage": "^1.7.1",
     "mammoth": "^1.4.6",
diff --git a/yarn.lock b/yarn.lock
index 43fed3243..829a32810 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5670,9 +5670,9 @@ lbry-redux@lbryio/lbry-redux#2375860d6269d0369418879c2531b1d48c4e47f2:
     proxy-polyfill "0.1.6"
     reselect "^3.0.0"
 
-lbry-redux@lbryio/lbry-redux#f193d38c61ea061679ebc7b4ca139a0e9c95ef8a:
+lbry-redux@lbryio/lbry-redux#c0e006825356fa00e1591838babe77540547624e:
   version "0.0.1"
-  resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/f193d38c61ea061679ebc7b4ca139a0e9c95ef8a"
+  resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/c0e006825356fa00e1591838babe77540547624e"
   dependencies:
     proxy-polyfill "0.1.6"
     reselect "^3.0.0"
-- 
2.45.3


From af813d48a009315c106f2d2d998651ab0254e51b Mon Sep 17 00:00:00 2001
From: Thomas Zarebczan <tzarebczan@users.noreply.github.com>
Date: Thu, 1 Nov 2018 13:40:02 -0400
Subject: [PATCH 24/33] Update CONTRIBUTING.md

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b0931d0f5..639ae499e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -119,7 +119,7 @@ You can also use the following command:
 
 `$ yarn format`
 
-for applying formatting rules to all projects' code sources. For formatting a specific file or
+for applying formatting rules to the entire project's code. For formatting a specific file or
 directory, use:
 
 `$ yarn prettier 'glob/pattern'`
-- 
2.45.3


From d96604130e92d89539fd6747cc3115624638c190 Mon Sep 17 00:00:00 2001
From: Siddhant Sharma <siddhaantsharma.ss@gmail.com>
Date: Thu, 1 Nov 2018 23:47:12 +0530
Subject: [PATCH 25/33] Updated as per required changes!

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index efc8b20a1..3615803c0 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,9 @@
 # LBRY App
 
 [![MIT licensed](https://img.shields.io/dub/l/vibe-d.svg?style=flat)](https://github.com/lbryio/lbry-desktop/blob/master/LICENSE)
+[![GitHub release](https://img.shields.io/github/release/lbryio/lbry-desktop.svg)](https://GitHub.com/lbryio/lbry-desktop/releases/)
 [![Build Status](https://travis-ci.org/lbryio/lbry-desktop.svg?branch=master)](https://travis-ci.org/lbryio/lbry-desktop)
 [![Dependencies](https://david-dm.org/lbryio/lbry-desktop/status.svg)](https://david-dm.org/lbryio/lbry-desktop)
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/78b627d4f5524792adc48719835e1523)](https://www.codacy.com/app/LBRY/lbry-desktop?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=lbryio/lbry-desktop&amp;utm_campaign=Badge_Grade)
-[![GitHub release](https://img.shields.io/github/release/lbryio/lbry-desktop.svg)](https://GitHub.com/lbryio/lbry-desktop/releases/)
 [![chat on Discord](https://img.shields.io/discord/362322208485277697.svg?logo=discord)](https://chat.lbry.io)
 
 [![forthebadge](https://forthebadge.com/images/badges/60-percent-of-the-time-works-every-time.svg)](https://forthebadge.com)
-- 
2.45.3


From bbf66960545bfc62ffa954a5402356092ca67021 Mon Sep 17 00:00:00 2001
From: Anna Melzer <anna@data-and-dragons.com>
Date: Thu, 1 Nov 2018 22:55:25 +0100
Subject: [PATCH 26/33] Linting/quick wins modal & pages (#2086)

* fix linting for affirmPurchase modal

* fix linting for confirmTransaction modal

* fix linting for error modal

* fix linting for filetimeout modal

* fix linting for first transaction modal

* fix linting for incompatible daemon  modal

* fix linting for external link modal

* fix linting for remove file  modal

* fix linting for revoke claim modal

* fix linting for reward approval  modal

* fix linting for send tip modal

* fix linting for welcome modal

* fix linting for page files
---
 src/renderer/modal/modalAffirmPurchase/index.js         | 5 ++++-
 src/renderer/modal/modalConfirmTransaction/index.js     | 5 ++++-
 src/renderer/modal/modalError/index.js                  | 5 ++++-
 src/renderer/modal/modalFileTimeout/index.js            | 5 ++++-
 src/renderer/modal/modalFirstSubscription/index.js      | 5 ++++-
 src/renderer/modal/modalIncompatibleDaemon/index.js     | 5 ++++-
 src/renderer/modal/modalOpenExternalLink/index.js       | 5 ++++-
 src/renderer/modal/modalRemoveFile/index.js             | 5 ++++-
 src/renderer/modal/modalRevokeClaim/index.js            | 5 ++++-
 src/renderer/modal/modalRewardApprovalRequired/index.js | 5 ++++-
 src/renderer/modal/modalSendTip/index.js                | 5 ++++-
 src/renderer/modal/modalWelcome/index.js                | 5 ++++-
 src/renderer/page/report/index.js                       | 3 +--
 src/renderer/page/show/index.js                         | 5 ++++-
 src/renderer/page/transactionHistory/index.js           | 5 ++++-
 src/renderer/page/userHistory/index.js                  | 3 +--
 16 files changed, 58 insertions(+), 18 deletions(-)

diff --git a/src/renderer/modal/modalAffirmPurchase/index.js b/src/renderer/modal/modalAffirmPurchase/index.js
index 623ae7b88..1bd9f854e 100644
--- a/src/renderer/modal/modalAffirmPurchase/index.js
+++ b/src/renderer/modal/modalAffirmPurchase/index.js
@@ -16,4 +16,7 @@ const perform = dispatch => ({
   loadVideo: uri => dispatch(doLoadVideo(uri)),
 });
 
-export default connect(select, perform)(ModalAffirmPurchase);
+export default connect(
+  select,
+  perform
+)(ModalAffirmPurchase);
diff --git a/src/renderer/modal/modalConfirmTransaction/index.js b/src/renderer/modal/modalConfirmTransaction/index.js
index fa9f1a520..b29b86285 100644
--- a/src/renderer/modal/modalConfirmTransaction/index.js
+++ b/src/renderer/modal/modalConfirmTransaction/index.js
@@ -7,4 +7,7 @@ const perform = dispatch => ({
   sendToAddress: (address, amount) => dispatch(doSendDraftTransaction(address, amount)),
 });
 
-export default connect(null, perform)(ModalConfirmTransaction);
+export default connect(
+  null,
+  perform
+)(ModalConfirmTransaction);
diff --git a/src/renderer/modal/modalError/index.js b/src/renderer/modal/modalError/index.js
index e8c07bc17..b37d57a88 100644
--- a/src/renderer/modal/modalError/index.js
+++ b/src/renderer/modal/modalError/index.js
@@ -6,4 +6,7 @@ const perform = dispatch => ({
   closeModal: () => dispatch(doHideNotification()),
 });
 
-export default connect(null, perform)(ModalError);
+export default connect(
+  null,
+  perform
+)(ModalError);
diff --git a/src/renderer/modal/modalFileTimeout/index.js b/src/renderer/modal/modalFileTimeout/index.js
index 04fdec82b..cff75810a 100644
--- a/src/renderer/modal/modalFileTimeout/index.js
+++ b/src/renderer/modal/modalFileTimeout/index.js
@@ -10,4 +10,7 @@ const perform = dispatch => ({
   closeModal: () => dispatch(doHideNotification()),
 });
 
-export default connect(select, perform)(ModalFileTimeout);
+export default connect(
+  select,
+  perform
+)(ModalFileTimeout);
diff --git a/src/renderer/modal/modalFirstSubscription/index.js b/src/renderer/modal/modalFirstSubscription/index.js
index 5831c1094..f3fd08438 100644
--- a/src/renderer/modal/modalFirstSubscription/index.js
+++ b/src/renderer/modal/modalFirstSubscription/index.js
@@ -8,4 +8,7 @@ const perform = dispatch => () => ({
   navigate: path => dispatch(doNavigate(path)),
 });
 
-export default connect(null, perform)(ModalFirstSubscription);
+export default connect(
+  null,
+  perform
+)(ModalFirstSubscription);
diff --git a/src/renderer/modal/modalIncompatibleDaemon/index.js b/src/renderer/modal/modalIncompatibleDaemon/index.js
index 8feed2ca7..a676fdd88 100644
--- a/src/renderer/modal/modalIncompatibleDaemon/index.js
+++ b/src/renderer/modal/modalIncompatibleDaemon/index.js
@@ -7,4 +7,7 @@ const perform = dispatch => ({
   quitAnyDaemon: () => dispatch(doQuitAnyDaemon()),
 });
 
-export default connect(null, perform)(ModalIncompatibleDaemon);
+export default connect(
+  null,
+  perform
+)(ModalIncompatibleDaemon);
diff --git a/src/renderer/modal/modalOpenExternalLink/index.js b/src/renderer/modal/modalOpenExternalLink/index.js
index 2703b100e..4ff2f30cb 100644
--- a/src/renderer/modal/modalOpenExternalLink/index.js
+++ b/src/renderer/modal/modalOpenExternalLink/index.js
@@ -6,4 +6,7 @@ const perform = dispatch => ({
   closeModal: () => dispatch(doHideNotification()),
 });
 
-export default connect(null, perform)(ModalOpenExternalLink);
+export default connect(
+  null,
+  perform
+)(ModalOpenExternalLink);
diff --git a/src/renderer/modal/modalRemoveFile/index.js b/src/renderer/modal/modalRemoveFile/index.js
index b6f7780fe..363772dcb 100644
--- a/src/renderer/modal/modalRemoveFile/index.js
+++ b/src/renderer/modal/modalRemoveFile/index.js
@@ -21,4 +21,7 @@ const perform = dispatch => ({
   },
 });
 
-export default connect(select, perform)(ModalRemoveFile);
+export default connect(
+  select,
+  perform
+)(ModalRemoveFile);
diff --git a/src/renderer/modal/modalRevokeClaim/index.js b/src/renderer/modal/modalRevokeClaim/index.js
index a79039529..b99715697 100644
--- a/src/renderer/modal/modalRevokeClaim/index.js
+++ b/src/renderer/modal/modalRevokeClaim/index.js
@@ -11,4 +11,7 @@ const perform = dispatch => ({
   abandonClaim: (txid, nout) => dispatch(doAbandonClaim(txid, nout)),
 });
 
-export default connect(select, perform)(ModalRevokeClaim);
+export default connect(
+  select,
+  perform
+)(ModalRevokeClaim);
diff --git a/src/renderer/modal/modalRewardApprovalRequired/index.js b/src/renderer/modal/modalRewardApprovalRequired/index.js
index 88efa5355..af651ca2d 100644
--- a/src/renderer/modal/modalRewardApprovalRequired/index.js
+++ b/src/renderer/modal/modalRewardApprovalRequired/index.js
@@ -11,4 +11,7 @@ const perform = dispatch => ({
   closeModal: () => dispatch(doHideNotification()),
 });
 
-export default connect(null, perform)(ModalRewardApprovalRequired);
+export default connect(
+  null,
+  perform
+)(ModalRewardApprovalRequired);
diff --git a/src/renderer/modal/modalSendTip/index.js b/src/renderer/modal/modalSendTip/index.js
index f6c67325d..b830c384e 100644
--- a/src/renderer/modal/modalSendTip/index.js
+++ b/src/renderer/modal/modalSendTip/index.js
@@ -6,4 +6,7 @@ const perform = dispatch => ({
   closeModal: () => dispatch(doHideNotification()),
 });
 
-export default connect(null, perform)(ModalSendTip);
+export default connect(
+  null,
+  perform
+)(ModalSendTip);
diff --git a/src/renderer/modal/modalWelcome/index.js b/src/renderer/modal/modalWelcome/index.js
index 201af1904..2e030ef9e 100644
--- a/src/renderer/modal/modalWelcome/index.js
+++ b/src/renderer/modal/modalWelcome/index.js
@@ -11,4 +11,7 @@ const perform = dispatch => () => ({
   },
 });
 
-export default connect(null, perform)(ModalWelcome);
+export default connect(
+  null,
+  perform
+)(ModalWelcome);
diff --git a/src/renderer/page/report/index.js b/src/renderer/page/report/index.js
index a43d54529..0fed73d36 100644
--- a/src/renderer/page/report/index.js
+++ b/src/renderer/page/report/index.js
@@ -1,4 +1,3 @@
-import { connect } from 'react-redux';
 import ReportPage from './view';
 
-export default connect(null, null)(ReportPage);
+export default ReportPage;
diff --git a/src/renderer/page/show/index.js b/src/renderer/page/show/index.js
index 122c6774a..9f67c04b1 100644
--- a/src/renderer/page/show/index.js
+++ b/src/renderer/page/show/index.js
@@ -17,4 +17,7 @@ const perform = dispatch => ({
   resolveUri: uri => dispatch(doResolveUri(uri)),
 });
 
-export default connect(select, perform)(ShowPage);
+export default connect(
+  select,
+  perform
+)(ShowPage);
diff --git a/src/renderer/page/transactionHistory/index.js b/src/renderer/page/transactionHistory/index.js
index b31414474..33af4fc09 100644
--- a/src/renderer/page/transactionHistory/index.js
+++ b/src/renderer/page/transactionHistory/index.js
@@ -15,4 +15,7 @@ const perform = dispatch => ({
   fetchTransactions: () => dispatch(doFetchTransactions()),
 });
 
-export default connect(select, perform)(TransactionHistoryPage);
+export default connect(
+  select,
+  perform
+)(TransactionHistoryPage);
diff --git a/src/renderer/page/userHistory/index.js b/src/renderer/page/userHistory/index.js
index 650e45760..d55e88a48 100644
--- a/src/renderer/page/userHistory/index.js
+++ b/src/renderer/page/userHistory/index.js
@@ -1,4 +1,3 @@
-import { connect } from 'react-redux';
 import UserHistoryPage from './view';
 
-export default connect(null, null)(UserHistoryPage);
+export default UserHistoryPage;
-- 
2.45.3


From ad5eb105c87e05b741b557d7009e166f55a00452 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Thu, 1 Nov 2018 18:07:43 -0400
Subject: [PATCH 27/33] remove duplicate import

---
 src/renderer/scss/all.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/scss/all.scss b/src/renderer/scss/all.scss
index b2d980ef2..8b421609c 100644
--- a/src/renderer/scss/all.scss
+++ b/src/renderer/scss/all.scss
@@ -5,5 +5,5 @@
   'component/snack-bar', 'component/content', 'component/pagination', 'component/markdown-preview',
   'component/markdown-editor', 'component/scrollbar', 'component/spinner', 'component/nav',
   'component/file-list', 'component/file-render', 'component/search', 'component/toggle',
-  'component/search', 'component/dat-gui', 'component/item-list', 'component/time', 'component/icon',
+  'component/dat-gui', 'component/item-list', 'component/time', 'component/icon',
   'component/placeholder', 'component/badge', 'themes/dark';
-- 
2.45.3


From 209bcda5a44ab9bab6726a782a8907f2b6b9f4aa Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Thu, 1 Nov 2018 18:09:49 -0400
Subject: [PATCH 28/33] use lbry colors for 'new' badge

---
 src/renderer/scss/component/_badge.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/renderer/scss/component/_badge.scss b/src/renderer/scss/component/_badge.scss
index e6aaf4eb9..8f3cec21b 100644
--- a/src/renderer/scss/component/_badge.scss
+++ b/src/renderer/scss/component/_badge.scss
@@ -6,8 +6,8 @@
 }
 
 .badge--alert {
-  background-color: #e45454;
-  color: white;
+  background-color: $lbry-red-3;
+  color: $lbry-white;
 }
 
 .badge--free {
-- 
2.45.3


From c4adce252499f6a957bcc8a8eec82829cd49cd97 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Thu, 1 Nov 2018 18:16:14 -0400
Subject: [PATCH 29/33] fix: don't filter transactions in recent transactions

---
 src/renderer/component/transactionList/view.jsx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/renderer/component/transactionList/view.jsx b/src/renderer/component/transactionList/view.jsx
index 4aaf9ae27..e8297cf79 100644
--- a/src/renderer/component/transactionList/view.jsx
+++ b/src/renderer/component/transactionList/view.jsx
@@ -48,6 +48,11 @@ class TransactionList extends React.PureComponent<Props> {
   }
 
   filterTransaction(transaction: Transaction) {
+    // The shorter "recent transactions" list shouldn't be filtered
+    if (this.props.slim) {
+      return transaction;
+    }
+
     return (
       this.props.filterSetting === TRANSACTIONS.ALL || this.props.filterSetting === transaction.type
     );
-- 
2.45.3


From 6e88160e040305a42e5283c1f3cb1e27c94fbfcf Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Thu, 1 Nov 2018 18:36:24 -0400
Subject: [PATCH 30/33] fix: remove unread subscriptions on un-subscribe

---
 src/renderer/redux/reducers/subscriptions.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/renderer/redux/reducers/subscriptions.js b/src/renderer/redux/reducers/subscriptions.js
index 5f007b7c0..ccde02056 100644
--- a/src/renderer/redux/reducers/subscriptions.js
+++ b/src/renderer/redux/reducers/subscriptions.js
@@ -41,13 +41,18 @@ export default handleActions(
       action: DoChannelUnsubscribe
     ): SubscriptionState => {
       const subscriptionToRemove: Subscription = action.data;
-
       const newSubscriptions = state.subscriptions
         .slice()
         .filter(subscription => subscription.channelName !== subscriptionToRemove.channelName);
 
+      // Check if we need to remove it from the 'unread' state
+      const { unread } = state.unread;
+      if (unread[subscriptionToRemove.uri]) {
+        delete unread[subscriptionToRemove.uri];
+      }
       return {
         ...state,
+        ...unread,
         subscriptions: newSubscriptions,
       };
     },
-- 
2.45.3


From af3a36787530b5c07e8c53ddcb6e47761572de68 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Fri, 2 Nov 2018 12:44:21 -0400
Subject: [PATCH 31/33] handle edits and new files the same for pending
 publishes

---
 package.json                          | 2 +-
 src/renderer/redux/actions/publish.js | 9 ++++++---
 yarn.lock                             | 8 ++++----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 373b72964..89a94cbde 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
     "formik": "^0.10.4",
     "hast-util-sanitize": "^1.1.2",
     "keytar": "^4.2.1",
-    "lbry-redux": "lbryio/lbry-redux#c0e006825356fa00e1591838babe77540547624e",
+    "lbry-redux": "lbryio/lbry-redux#0e13dd1972e3b40821fee2f9f06e1a0631913aa9",
     "lbryinc": "lbryio/lbryinc#7a458ea13ceceffa0191e73139f94e5c953f22b1",
     "localforage": "^1.7.1",
     "mammoth": "^1.4.6",
diff --git a/src/renderer/redux/actions/publish.js b/src/renderer/redux/actions/publish.js
index 22e930213..4894e6200 100644
--- a/src/renderer/redux/actions/publish.js
+++ b/src/renderer/redux/actions/publish.js
@@ -276,9 +276,11 @@ export const doPublish = (params: PublishParams) => (
     // We have to fake a temp claim until the new pending one is returned by claim_list_mine
     // We can't rely on claim_list_mine because there might be some delay before the new claims are returned
     // Doing this allows us to show the pending claim immediately, it will get overwritten by the real one
-    const myNewClaims = myClaims.map(
-      claim => (claim.claim_id === pendingClaim.claim_id ? pendingClaim.output : claim)
-    );
+    const isMatch = claim => claim.claim_id === pendingClaim.claim_id;
+    const isEdit = myClaims.some(isMatch);
+    const myNewClaims = isEdit
+      ? myClaims.map(claim => (isMatch(claim) ? pendingClaim.output : claim))
+      : myClaims.concat(pendingClaim.output);
 
     actions.push({
       type: ACTIONS.FETCH_CLAIM_LIST_MINE_COMPLETED,
@@ -311,6 +313,7 @@ export const doCheckPendingPublishes = () => (dispatch: Dispatch<Action>, getSta
 
   const checkFileList = () => {
     Lbry.claim_list_mine().then(claims => {
+      console.log('check');
       claims.forEach(claim => {
         // If it's confirmed, check if it was pending previously
         if (claim.confirmations > 0 && pendingById[claim.claim_id]) {
diff --git a/yarn.lock b/yarn.lock
index 829a32810..df771ac20 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5663,16 +5663,16 @@ 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#0e13dd1972e3b40821fee2f9f06e1a0631913aa9:
   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/0e13dd1972e3b40821fee2f9f06e1a0631913aa9"
   dependencies:
     proxy-polyfill "0.1.6"
     reselect "^3.0.0"
 
-lbry-redux@lbryio/lbry-redux#c0e006825356fa00e1591838babe77540547624e:
+lbry-redux@lbryio/lbry-redux#2375860d6269d0369418879c2531b1d48c4e47f2:
   version "0.0.1"
-  resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/c0e006825356fa00e1591838babe77540547624e"
+  resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/2375860d6269d0369418879c2531b1d48c4e47f2"
   dependencies:
     proxy-polyfill "0.1.6"
     reselect "^3.0.0"
-- 
2.45.3


From e7e58b3e08a6ca04eb9c384f32525115dcd416db Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Fri, 2 Nov 2018 12:58:40 -0400
Subject: [PATCH 32/33] don't loop over transactions if we don't have to

---
 src/renderer/component/transactionList/view.jsx | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/renderer/component/transactionList/view.jsx b/src/renderer/component/transactionList/view.jsx
index e8297cf79..c5f043d89 100644
--- a/src/renderer/component/transactionList/view.jsx
+++ b/src/renderer/component/transactionList/view.jsx
@@ -48,11 +48,6 @@ class TransactionList extends React.PureComponent<Props> {
   }
 
   filterTransaction(transaction: Transaction) {
-    // The shorter "recent transactions" list shouldn't be filtered
-    if (this.props.slim) {
-      return transaction;
-    }
-
     return (
       this.props.filterSetting === TRANSACTIONS.ALL || this.props.filterSetting === transaction.type
     );
@@ -71,7 +66,10 @@ class TransactionList extends React.PureComponent<Props> {
 
   render() {
     const { emptyMessage, rewards, transactions, slim, filterSetting } = this.props;
-    const transactionList = transactions.filter(this.filterTransaction);
+
+    // The shorter "recent transactions" list shouldn't be filtered
+    const transactionList = slim ? transactions : transactions.filter(this.filterTransaction);
+
     // Flow offers little support for Object.values() typing.
     // https://github.com/facebook/flow/issues/2221
     // $FlowFixMe
-- 
2.45.3


From eb21c463cc279fe30111634aa96cd9cafe9f073c Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Fri, 2 Nov 2018 14:10:28 -0400
Subject: [PATCH 33/33] bump lbry-redux

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 89a94cbde..10da3eb23 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
     "formik": "^0.10.4",
     "hast-util-sanitize": "^1.1.2",
     "keytar": "^4.2.1",
-    "lbry-redux": "lbryio/lbry-redux#0e13dd1972e3b40821fee2f9f06e1a0631913aa9",
+    "lbry-redux": "lbryio/lbry-redux#dd26422a86a37b5a492dc0702269ad6fc04ecdd7",
     "lbryinc": "lbryio/lbryinc#7a458ea13ceceffa0191e73139f94e5c953f22b1",
     "localforage": "^1.7.1",
     "mammoth": "^1.4.6",
-- 
2.45.3