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

update splash % call to use headers_synchronization_progress

Browse source
This commit is contained in:
jessop 2019-12-03 13:47:03 -05:00 • committed by Sean Yesmunt
parent 35ed493af4
commit 38c954853e
3 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
static/app-strings.json
View file

@ -917,4 +917,4 @@
"Loading 3D model.": "Loading 3D model.", "Loading 3D model.": "Loading 3D model.",
"Click here": "Click here", "Click here": "Click here",
"PDF opened externally. %click_here% to open it again.": "PDF opened externally. %click_here% to open it again." "PDF opened externally. %click_here% to open it again.": "PDF opened externally. %click_here% to open it again."
} }

2
ui/component/app/view.jsx
View file

@ -97,7 +97,7 @@ function App(props: Props) {
if (!uploadCount) return; if (!uploadCount) return;
const handleBeforeUnload = event => { const handleBeforeUnload = event => {
event.preventDefault(); event.preventDefault();
event.returnValue = 'magic'; event.returnValue = 'magic'; // without setting this to something it doesn't work
}; };
window.addEventListener('beforeunload', handleBeforeUnload); window.addEventListener('beforeunload', handleBeforeUnload);
return () => window.removeEventListener('beforeunload', handleBeforeUnload); return () => window.removeEventListener('beforeunload', handleBeforeUnload);

13
ui/component/splash/view.jsx
View file

@ -146,19 +146,10 @@ export default class SplashScreen extends React.PureComponent<Props, State> {
}); });
return; return;
} else if (blockchainHeaders) { } else if (wallet && wallet.blocks_behind > 0) {
const blockChainHeaders = blockchainHeaders;
if (blockChainHeaders.download_progress < 100) {
this.setState({
message: __('Blockchain Sync'),
details: `${__('Catching up...')} (${blockchainHeaders.download_progress}%)`,
});
}
} else if (wallet && wallet.blocks_behind > 0) {
const amountBehind = wallet.blocks_behind === 1 ? '%amountBehind% block behind' : '%amountBehind% blocks behind';
this.setState({ this.setState({
message: __('Blockchain Sync'), message: __('Blockchain Sync'),
details: `${__('Catching up...')} (${__(amountBehind, { amountBehind: wallet.blocks_behind })})`, details: `${__('Catching up...')} (${wallet.headers_synchronization_progress}%)`,
}); });
} else if (wallet && wallet.blocks_behind === 0 && !status.is_running && startupStatus.database) { } else if (wallet && wallet.blocks_behind === 0 && !status.is_running && startupStatus.database) {
this.setState({ this.setState({