sdk 0.48 headers synchronization progress #92

Merged
akinwale merged 1 commit from headers-sync into master 2019-12-06 16:41:08 +01:00

View file

@ -170,8 +170,8 @@ class SplashScreen extends React.PureComponent {
} }
_updateStatusCallback(status) { _updateStatusCallback(status) {
console.log(status);
const { fetchSubscriptions, getSync, setClientSetting } = this.props; const { fetchSubscriptions, getSync, setClientSetting } = this.props;
const blockchainHeaders = status.blockchain_headers;
const startupStatus = status.startup_status; const startupStatus = status.startup_status;
const walletStatus = status.wallet; const walletStatus = status.wallet;
@ -222,10 +222,11 @@ class SplashScreen extends React.PureComponent {
return; return;
} }
if (blockchainHeaders) { const headerSyncProgress = walletStatus.headers_synchronization_progress;
if (headerSyncProgress && headerSyncProgress < 100) {
this.setState({ this.setState({
isDownloadingHeaders: blockchainHeaders.downloading_headers, isDownloadingHeaders: true,
headersDownloadProgress: blockchainHeaders.download_progress, headersDownloadProgress: headerSyncProgress,
}); });
} else { } else {
// set downloading flag to false if blockchain_headers isn't in the status response // set downloading flag to false if blockchain_headers isn't in the status response
@ -234,15 +235,16 @@ class SplashScreen extends React.PureComponent {
}); });
} }
if (blockchainHeaders && blockchainHeaders.downloading_headers) { if (headerSyncProgress < 100) {
const downloadProgress = blockchainHeaders.download_progress ? blockchainHeaders.download_progress : 0; const downloadProgress = headerSyncProgress || 0;
this.setState({ this.setState({
message: __('Blockchain Sync'), message: __('Blockchain Sync'),
details: `Catching up with the blockchain (${downloadProgress}%)`, // TODO: i18n tokenization details: __('Catching up with the blockchain (%progress%%)', { progress: downloadProgress }),
}); });
} else if (walletStatus && walletStatus.blocks_behind > 0) { } else if (walletStatus && walletStatus.blocks_behind > 0) {
const behind = walletStatus.blocks_behind; const behind = walletStatus.blocks_behind;
const behindText = behind + ' block' + (behind === 1 ? '' : 's') + ' behind'; // TODO: i18n tokenization const behindText =
behind === 1 ? __('%num% block behind', { num: behind }) : __('%num% blocks behind', { num: behind });
this.setState({ this.setState({
message: __('Blockchain Sync'), message: __('Blockchain Sync'),
details: behindText, details: behindText,