Fix old key overwrites new key #2290
Merged
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.
Description
We were always using the old key to decrypt wallets if it was found.
This means that if device sync was enabled before #2169, the existing key could decrypt the migrated wallets.
However, when the passphrase is shown, we encrypt the wallets with a new key. Same is true on passphrase reset.
But on page load, we will still load the old key instead of the new key so the 'unlock wallets' prompt is shown.
This PR fixes this by only loading the old key if a new key was not found.
Checklist
Are your changes backward compatible? Please answer below:
yes
On a scale of 1-10 how well and how have you QA'd this change and any features it might affect? Please answer below:
8. We now always use the new key if it exists. If not but old key exists, we use that. Else we generate a new key.For frontend changes: Tested on mobile, light and dark mode? Please answer below:
n/a
Did you introduce any new environment variables? If so, call them out explicitly here:
no