From 8e08ac588cfe37ec8cb8e77ed9ddcf4617150e5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=83=9D=E3=83=BC=E3=83=AB=20=E3=82=A6=E3=82=A7=E3=83=83?=
 =?UTF-8?q?=E3=83=96?= <netopwibby@thenetwork.email>
Date: Thu, 25 Oct 2018 12:13:25 -0500
Subject: [PATCH 1/2] Fixes

---
 src/renderer/scss/component/_form-field.scss |  2 +-
 src/renderer/scss/themes/_dark.scss          | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/renderer/scss/component/_form-field.scss b/src/renderer/scss/component/_form-field.scss
index 1fc15ac1f..58588df62 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-5;
+  color: $lbry-red-3 !important;
 }
 
 .form-field__help {
diff --git a/src/renderer/scss/themes/_dark.scss b/src/renderer/scss/themes/_dark.scss
index 45b1ba2e5..4eb043ec1 100644
--- a/src/renderer/scss/themes/_dark.scss
+++ b/src/renderer/scss/themes/_dark.scss
@@ -115,4 +115,19 @@ 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;
+  }
 }
-- 
2.45.2


From 968661474e37b8aed9773fdd012c45eca652141d Mon Sep 17 00:00:00 2001
From: Jessop Breth <jessopb@gmail.com>
Date: Fri, 26 Oct 2018 00:04:53 -0400
Subject: [PATCH 2/2] adds sortBy default prop

---
 package.json                             |  2 +-
 src/renderer/component/fileList/view.jsx |  5 +++--
 src/renderer/page/subscriptions/index.js |  2 --
 src/renderer/page/subscriptions/view.jsx | 13 +++----------
 4 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index 0dce4c7e0..fcb17211c 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#03aea43da5f12bc01546a92bdf460ebd08681013",
+    "lbry-redux": "lbryio/lbry-redux#ecd1ab156fb755c8bff4d890679399d66f41ad17",
     "lbryinc": "lbryio/lbryinc#3f34af546ee73ff2ee7d8ad05e540b3b0aa658fb",
     "localforage": "^1.7.1",
     "mammoth": "^1.4.6",
diff --git a/src/renderer/component/fileList/view.jsx b/src/renderer/component/fileList/view.jsx
index b2b1eaa45..52867ff52 100644
--- a/src/renderer/component/fileList/view.jsx
+++ b/src/renderer/component/fileList/view.jsx
@@ -12,13 +12,14 @@ type Props = {
   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) {
diff --git a/src/renderer/page/subscriptions/index.js b/src/renderer/page/subscriptions/index.js
index 70fb57fc3..a62734e5d 100644
--- a/src/renderer/page/subscriptions/index.js
+++ b/src/renderer/page/subscriptions/index.js
@@ -15,7 +15,6 @@ 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 => ({
@@ -26,7 +25,6 @@ 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 fa039d318..5b7b80578 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, PAGES } from 'lbry-redux';
+import { parseURI } from 'lbry-redux';
 
 type Props = {
   subscribedChannels: Array<string>, // The channels a user is subscribed to
@@ -25,7 +25,6 @@ type Props = {
   doSetViewMode: ViewMode => void,
   doFetchMySubscriptions: () => void,
   doSetClientSetting: (string, boolean) => void,
-  sortBy: string,
 };
 
 export default class extends React.PureComponent<Props> {
@@ -45,19 +44,13 @@ export default class extends React.PureComponent<Props> {
   }
 
   renderSubscriptions() {
-    const { viewMode, unreadSubscriptions, allSubscriptions, sortBy } = this.props;
+    const { viewMode, unreadSubscriptions, allSubscriptions } = this.props;
 
     if (viewMode === VIEW_ALL) {
       return (
         <React.Fragment>
           <div className="card__title">{__('Your subscriptions')}</div>
-          <FileList
-            hideFilter
-            sortByHeight
-            fileInfos={allSubscriptions}
-            sortBy={sortBy}
-            page={PAGES.SUBSCRIPTIONS}
-          />
+          <FileList hideFilter sortByHeight fileInfos={allSubscriptions} />
         </React.Fragment>
       );
     }
-- 
2.45.2