diff --git a/package.json b/package.json
index abc06fca8..c1dcd0b99 100644
--- a/package.json
+++ b/package.json
@@ -116,7 +116,7 @@
},
"license": "MIT",
"lbrySettings": {
- "lbrynetDaemonVersion": "0.18.2",
+ "lbrynetDaemonVersion": "0.19.0",
"lbrynetDaemonUrlTemplate": "https://github.com/lbryio/lbry/releases/download/vDAEMONVER/lbrynet-daemon-vDAEMONVER-OSNAME.zip"
}
}
diff --git a/src/renderer/component/fileList/index.js b/src/renderer/component/fileList/index.js
index 3b6ced934..bfaff712a 100644
--- a/src/renderer/component/fileList/index.js
+++ b/src/renderer/component/fileList/index.js
@@ -1,8 +1,11 @@
import React from 'react';
import { connect } from 'react-redux';
import FileList from './view';
+import { selectClaimsById } from 'redux/selectors/claims';
-const select = state => ({});
+const select = state => ({
+ claimsById: selectClaimsById(state),
+});
const perform = dispatch => ({});
diff --git a/src/renderer/component/fileList/view.jsx b/src/renderer/component/fileList/view.jsx
index eef0993c6..686665078 100644
--- a/src/renderer/component/fileList/view.jsx
+++ b/src/renderer/component/fileList/view.jsx
@@ -13,48 +13,53 @@ class FileList extends React.PureComponent {
};
this._sortFunctions = {
- dateNew(fileInfos) {
- return fileInfos.slice().sort((fileInfo1, fileInfo2) => {
- const height1 = fileInfo1.height;
- const height2 = fileInfo2.height;
+ dateNew: fileInfos =>
+ fileInfos.slice().sort((fileInfo1, fileInfo2) => {
+ const height1 = this.props.claimsById[fileInfo1.claim_id]
+ ? this.props.claimsById[fileInfo1.claim_id].height
+ : 0;
+ const height2 = this.props.claimsById[fileInfo2.claim_id]
+ ? this.props.claimsById[fileInfo2.claim_id].height
+ : 0;
if (height1 > height2) {
return -1;
} else if (height1 < height2) {
return 1;
}
return 0;
- });
- },
- dateOld(fileInfos) {
- return fileInfos.slice().sort((fileInfo1, fileInfo2) => {
- const height1 = fileInfo1.height;
- const height2 = fileInfo2.height;
+ }),
+ dateOld: fileInfos =>
+ fileInfos.slice().sort((fileInfo1, fileInfo2) => {
+ const height1 = this.props.claimsById[fileInfo1.claim_id]
+ ? this.props.claimsById[fileInfo1.claim_id].height
+ : 999999;
+ const height2 = this.props.claimsById[fileInfo2.claim_id]
+ ? this.props.claimsById[fileInfo2.claim_id].height
+ : 999999;
if (height1 < height2) {
return -1;
} else if (height1 > height2) {
return 1;
}
return 0;
- });
- },
- title(fileInfos) {
- return fileInfos.slice().sort((fileInfo1, fileInfo2) => {
+ }),
+ title: fileInfos =>
+ fileInfos.slice().sort((fileInfo1, fileInfo2) => {
const title1 = fileInfo1.value
? fileInfo1.value.stream.metadata.title.toLowerCase()
- : fileInfo1.name;
+ : fileInfo1.claim_name;
const title2 = fileInfo2.value
? fileInfo2.value.stream.metadata.title.toLowerCase()
- : fileInfo2.name;
+ : fileInfo2.claim_name;
if (title1 < title2) {
return -1;
} else if (title1 > title2) {
return 1;
}
return 0;
- });
- },
- filename(fileInfos) {
- return fileInfos.slice().sort(({ file_name: fileName1 }, { file_name: fileName2 }) => {
+ }),
+ filename: fileInfos =>
+ fileInfos.slice().sort(({ file_name: fileName1 }, { file_name: fileName2 }) => {
const fileName1Lower = fileName1.toLowerCase();
const fileName2Lower = fileName2.toLowerCase();
if (fileName1Lower < fileName2Lower) {
@@ -63,8 +68,7 @@ class FileList extends React.PureComponent {
return 1;
}
return 0;
- });
- },
+ }),
};
}
@@ -72,7 +76,7 @@ class FileList extends React.PureComponent {
if (fileInfo.value) {
return fileInfo.value.publisherSignature.certificateId;
}
- return fileInfo.metadata.publisherSignature.certificateId;
+ return fileInfo.channel_claim_id;
}
handleSortChanged(event) {
@@ -91,11 +95,11 @@ class FileList extends React.PureComponent {
if (fileInfo.channel_name) {
uriParams.channelName = fileInfo.channel_name;
- uriParams.contentName = fileInfo.name;
+ uriParams.contentName = fileInfo.claim_name || fileInfo.name;
uriParams.claimId = this.getChannelSignature(fileInfo);
} else {
uriParams.claimId = fileInfo.claim_id;
- uriParams.name = fileInfo.name;
+ uriParams.claimName = fileInfo.claim_name || fileInfo.name;
}
const uri = buildURI(uriParams);
diff --git a/src/renderer/component/fileListSearch/view.jsx b/src/renderer/component/fileListSearch/view.jsx
index d29e9d967..89e99ca65 100644
--- a/src/renderer/component/fileListSearch/view.jsx
+++ b/src/renderer/component/fileListSearch/view.jsx
@@ -45,7 +45,7 @@ class FileListSearch extends React.PureComponent {
{uris && uris.length
? uris.map(
uri =>
- parseURI(uri).name[0] === '@' ? (
+ parseURI(uri).claimName[0] === '@' ? (