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

Merge pull request #1881 from lbryio/encryption

Browse source 
Handle new daemon startup for encryption
This commit is contained in:
Sean Yesmunt 2018-08-15 14:41:12 -04:00 • committed by GitHub
commit d478a2b296
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -51,7 +51,7 @@
"formik": "^0.10.4", "formik": "^0.10.4",
"hast-util-sanitize": "^1.1.2", "hast-util-sanitize": "^1.1.2",
"keytar": "^4.2.1", "keytar": "^4.2.1",
"lbry-redux": "lbryio/lbry-redux#8794a775bf71e7b8b7d1ac44392196bb58a0042a", "lbry-redux": "lbryio/lbry-redux#ada4880c5d0758c7973aff9d443a87874d98b320",
"localforage": "^1.7.1", "localforage": "^1.7.1",
"mammoth": "^1.4.6", "mammoth": "^1.4.6",
"mime": "^2.3.1", "mime": "^2.3.1",

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

@ -63,7 +63,8 @@ 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.is_unlocked) {
if (status.wallet.is_locked) {
this.setState({ this.setState({
message: __('Unlock Wallet'), message: __('Unlock Wallet'),
details: __('Please unlock your wallet to proceed.'), details: __('Please unlock your wallet to proceed.'),

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#8794a775bf71e7b8b7d1ac44392196bb58a0042a: lbry-redux@lbryio/lbry-redux#f760f59dde7c5304bb4d0edda1de7fcbf7c1b02e:
version "0.0.1" version "0.0.1"
resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/8794a775bf71e7b8b7d1ac44392196bb58a0042a" resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/f760f59dde7c5304bb4d0edda1de7fcbf7c1b02e"
dependencies: dependencies:
proxy-polyfill "0.1.6" proxy-polyfill "0.1.6"
reselect "^3.0.0" reselect "^3.0.0"