Add encryption flow to redux #59
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
skhameneh
commented
Jul 18, 2018
| @@ -61,7 +95,7 @@ export const selectTransactionItems = createSelector(selectTransactionsById, byI | |||
| txid, | |||
| date: tx.timestamp ? new Date(Number(tx.timestamp) * 1000) : null, | |||
| amount, | |||
| fee: amount < 0 ? (-1 * tx.fee) / append.length : 0, | |||
| fee: amount < 0 ? -1 * tx.fee / append.length : 0, | |||
There was a problem hiding this comment.
This should not be here, I will check my local commits and try to find why this change is appearing.
neb-b
previously requested changes
Jul 18, 2018
src/redux/actions/wallet.js
Outdated
| type: ACTIONS.WALLET_LOCK_START, | ||
| }); | ||
|
|
||
| Lbry.wallet_lock().then(() => { |
src/redux/reducers/wallet.js
Outdated
| walletDecryptPending: false, | ||
| walletDecryptSucceded: null, | ||
| walletUnlockPending: false, | ||
| walletUnlockSucceded: null, |
There was a problem hiding this comment.
There should probably be an error attribute here too. Not sure what the daemon returns but it would be nice to know if there was an error decrypting or some unrelated error.
src/redux/selectors/wallet.js
Outdated
| @@ -2,6 +2,40 @@ import { createSelector } from 'reselect'; | |||
|
|
|||
| export const selectState = state => state.wallet || {}; | |||
|
|
|||
| export const selectWalletState = selectState; | |||
|
|
|||
| export const selectWalletIsEncrypted = state => selectWalletState(state).walletIsEncrypted === true; | |||
There was a problem hiding this comment.
I would use createSelector here like you did below.
neb-b
reviewed
Jul 20, 2018
| walletLockSucceded: false, | ||
| walletLockResult: action.result, | ||
| }); | ||
|
|
neb-b
reviewed
Jul 25, 2018
| @@ -6,6 +7,36 @@ const buildDraftTransaction = () => ({ | |||
| address: undefined, | |||
| }); | |||
|
|
|||
| // TODO: Split into common success and failure types | |||
| // See details in https://github.com/lbryio/lbry/issues/1307 | |||
| type ActionResult = { | |||
There was a problem hiding this comment.
Likely it'll split into multiple at some point.
We don't have any predictable pattern at the moment and this only contains result and could apply to any other action, I can change it but I still think we'll end up with another common pattern.
neb-b
approved these changes
Jul 25, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See #36
lbryio/lbry-desktop#1097 will be updated tomorrow with a dependency on these changes.