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

Fix encryption startup

Browse source 
1) remove wallet unlock message (outdated by new modal)
2) removed return which caused status updates to stop + restructured else statements
3) Prevent clicking out from modal (would close app)
4) update yarn.lock with proper redux version
This commit is contained in:
Thomas Zarebczan 2018-08-15 15:56:42 -04:00
parent d478a2b296
commit 00ad8ba372
3 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/renderer/component/splash/view.jsx
View file

@ -63,21 +63,15 @@ export class SplashScreen extends React.PureComponent<Props, State> {
updateStatusCallback(status) { updateStatusCallback(status) {
const { notifyUnlockWallet } = this.props; const { notifyUnlockWallet } = this.props;
const { launchedModal } = this.state; const { launchedModal } = this.state;
if (status.wallet && status.wallet.is_locked) {
if (status.wallet.is_locked) {
this.setState({ this.setState({
message: __('Unlock Wallet'),
details: __('Please unlock your wallet to proceed.'),
isRunning: true, isRunning: true,
}); });
if (launchedModal === false) { if (launchedModal === false) {
this.setState({ launchedModal: true }, () => notifyUnlockWallet()); this.setState({ launchedModal: true }, () => notifyUnlockWallet());
} }
return; } else if (status.is_running) {
}
if (status.is_running) {
// Wait until we are able to resolve a name before declaring // Wait until we are able to resolve a name before declaring
// that we are done. // that we are done.
// TODO: This is a hack, and the logic should live in the daemon // TODO: This is a hack, and the logic should live in the daemon
@ -95,9 +89,7 @@ export class SplashScreen extends React.PureComponent<Props, State> {
} }
}); });
return; return;
} } else if (status.blockchain_headers && status.blockchain_headers.download_progress < 100) {
if (status.blockchain_headers && status.blockchain_headers.download_progress < 100) {
this.setState({ this.setState({
message: __('Blockchain Sync'), message: __('Blockchain Sync'),
details: `${__('Catching up with the blockchain')} (${ details: `${__('Catching up with the blockchain')} (${

1
src/renderer/modal/modalWalletUnlock/view.jsx
View file

@ -38,6 +38,7 @@ class ModalWalletUnlock extends React.PureComponent<Props> {
isOpen isOpen
contentLabel={__('Unlock Wallet')} contentLabel={__('Unlock Wallet')}
type="confirm" type="confirm"
shouldCloseOnOverlayClick={false}
confirmButtonLabel={__('Unlock')} confirmButtonLabel={__('Unlock')}
abortButtonLabel={__('Exit')} abortButtonLabel={__('Exit')}
onConfirmed={() => unlockWallet(password)} onConfirmed={() => unlockWallet(password)}

4
yarn.lock
View file

@ -5651,9 +5651,9 @@ lazy-val@^1.0.3:
version "1.0.3" version "1.0.3"
resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.3.tgz#bb97b200ef00801d94c317e29dc6ed39e31c5edc" resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.3.tgz#bb97b200ef00801d94c317e29dc6ed39e31c5edc"
lbry-redux@lbryio/lbry-redux#f760f59dde7c5304bb4d0edda1de7fcbf7c1b02e: lbry-redux@lbryio/lbry-redux#ada4880c5d0758c7973aff9d443a87874d98b320:
version "0.0.1" version "0.0.1"
resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/f760f59dde7c5304bb4d0edda1de7fcbf7c1b02e" resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/ada4880c5d0758c7973aff9d443a87874d98b320"
dependencies: dependencies:
proxy-polyfill "0.1.6" proxy-polyfill "0.1.6"
reselect "^3.0.0" reselect "^3.0.0"