LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

0.45 support (#3182)

Browse source 
* maint: support 0.44 SDK

* remove un-needed is_encrypted value on splash page and add unique key to paginate component
This commit is contained in:
Sean Yesmunt 2019-11-05 15:16:41 -05:00
parent f04c0303b8
commit d9ff20595e
7 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
package.json
View file

@ -127,8 +127,8 @@
"husky": "^0.14.3",
"json-loader": "^0.5.4",
"lbry-format": "https://github.com/lbryio/lbry-format.git",
"lbry-redux": "lbryio/lbry-redux#861880a029a748bb4300bec9b16b7136ac51c5c3",
"lbryinc": "lbryio/lbryinc#f962cdf31a4c36f7bdb8b71fc403a3377d58a460",
"lbry-redux": "lbryio/lbry-redux#ba429043e6fa8144a62bcf4d45ed8d183ea5aff9",
"lbryinc": "lbryio/lbryinc#31299530d0404b928689b59a0fb0ca56d369096a",
"lint-staged": "^7.0.2",
"localforage": "^1.7.1",
"lodash-es": "^4.17.14",
@ -203,7 +203,7 @@
"yarn": "^1.3"
},
"lbrySettings": {
"lbrynetDaemonVersion": "0.43.3",
"lbrynetDaemonVersion": "0.45.0",
"lbrynetDaemonUrlTemplate": "https://github.com/lbryio/lbry/releases/download/vDAEMONVER/lbrynet-OSNAME.zip",
"lbrynetDaemonDir": "static/daemon",
"lbrynetDaemonFileName": "lbrynet"

2
src/platforms/electron/unpackByOutpoint.js
View file

@ -3,7 +3,7 @@ import path from 'path';
import { unpackDirectory } from 'lbry-format';
async function unpackByOutpoint(lbry, outpoint) {
const claimFiles = await lbry.file_list({ outpoint, full_status: true });
const { items: claimFiles } = await lbry.file_list({ outpoint, full_status: true, page: 1, page_size: 1 });
if (claimFiles && claimFiles.length) {
const claimFileInfo = claimFiles[0];

2
src/ui/component/channelContent/view.jsx
View file

@ -27,6 +27,7 @@ function ChannelContent(props: Props) {
totalPages,
channelIsMine,
channelIsBlocked,
fetchClaims,
channelIsBlackListed,
} = props;
@ -72,6 +73,7 @@ function ChannelContent(props: Props) {
{!channelIsBlocked && !channelIsBlackListed && (
<Paginate
key={uri}
onPageChange={page => fetchClaims(uri, page)}
totalPages={totalPages}
loading={fetching && !hasContent}

10
src/ui/component/splash/view.jsx
View file

@ -102,15 +102,7 @@ export default class SplashScreen extends React.PureComponent<Props, State> {
Lbry.status().then(status => {
if (status.is_running) {
Lbry.wallet_status().then(walletStatus => {
// Fix blank password bug related to synced Android users and reset encryption status
// Remove this on 12/21/2019 to make sure we don't accidentilly decrypt any wallets
// This could happen if SDK is already running and app is started.
// This may be patched in a future SDK to support lbry.tv
// https://github.com/lbryio/lbry-sdk/issues/2576
if (walletStatus.is_encrypted && walletStatus.is_locked === false && launchedModal === false) {
this.setState({ launchedModal: true }, () => notifyUnlockWallet(true));
this.updateStatusCallback(status);
} else if (walletStatus.is_locked) {
if (walletStatus.is_locked) {
// Clear the error timeout, it might sit on this step for a while until someone enters their password
if (this.timeout) {
clearTimeout(this.timeout);

6
src/ui/redux/actions/content.js
View file

@ -48,7 +48,11 @@ export function doUpdateLoadStatus(uri: string, outpoint: string) {
Lbry.file_list({
outpoint,
full_status: true,
}).then(([fileInfo]) => {
page: 1,
page_size: 1,
}).then(result => {
const { items: fileInfos } = result;
const fileInfo = fileInfos[0];
if (!fileInfo || fileInfo.written_bytes === 0) {
// download hasn't started yet
setNextStatusUpdate();

6
static/app-strings.json
View file

@ -857,5 +857,9 @@
"Your %publishMessage% pending on LBRY. It will take a few minutes to appear for other users.": "Your %publishMessage% pending on LBRY. It will take a few minutes to appear for other users.",
"Upload will continue in the background, please do not shut down immediately. Leaving the app running helps the network, thank you!": "Upload will continue in the background, please do not shut down immediately. Leaving the app running helps the network, thank you!",
"Are you sure want to revoke this claim?": "Are you sure want to revoke this claim?",
"This will prevent others from resolving and accessing the content you published. It will return the LBC to your spendable balance, less a small transaction fee.": "This will prevent others from resolving and accessing the content you published. It will return the LBC to your spendable balance, less a small transaction fee."
"This will prevent others from resolving and accessing the content you published. It will return the LBC to your spendable balance, less a small transaction fee.": "This will prevent others from resolving and accessing the content you published. It will return the LBC to your spendable balance, less a small transaction fee.",
"No results for %query%": "No results for %query%",
"You haven't downloaded anything from LBRY yet.": "You haven't downloaded anything from LBRY yet.",
"Explore new content": "Explore new content",
"Use this address to receive LBC.": "Use this address to receive LBC."
}

8
yarn.lock
View file

@ -6843,17 +6843,17 @@ lazy-val@^1.0.3, lazy-val@^1.0.4:
yargs "^13.2.2"
zstd-codec "^0.1.1"
lbry-redux@lbryio/lbry-redux#861880a029a748bb4300bec9b16b7136ac51c5c3:
lbry-redux@lbryio/lbry-redux#ba429043e6fa8144a62bcf4d45ed8d183ea5aff9:
version "0.0.1"
resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/861880a029a748bb4300bec9b16b7136ac51c5c3"
resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/ba429043e6fa8144a62bcf4d45ed8d183ea5aff9"
dependencies:
proxy-polyfill "0.1.6"
reselect "^3.0.0"
uuid "^3.3.2"
lbryinc@lbryio/lbryinc#f962cdf31a4c36f7bdb8b71fc403a3377d58a460:
lbryinc@lbryio/lbryinc#31299530d0404b928689b59a0fb0ca56d369096a:
version "0.0.1"
resolved "https://codeload.github.com/lbryio/lbryinc/tar.gz/f962cdf31a4c36f7bdb8b71fc403a3377d58a460"
resolved "https://codeload.github.com/lbryio/lbryinc/tar.gz/31299530d0404b928689b59a0fb0ca56d369096a"
dependencies:
reselect "^3.0.0"