-
Notifications
You must be signed in to change notification settings - Fork 984
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
bug #4921 - adds a workaround for the conflicting bugs #4876 and #4755 #4924
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
flexsurfer
approved these changes
Jun 25, 2018
mandrigin
approved these changes
Jun 25, 2018
jeluard
approved these changes
Jun 25, 2018
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you create an issue to track this today? Sounds like this is some area we want to clean sooner than later.
janherich
approved these changes
Jun 25, 2018
branch PR-4924: |
94% of end-end tests have passed
Failed tests (2)Click to expand
Passed tests (31)Click to expand
|
@Serhy okay, merging :) |
Signed-off-by: Igor Mandrigin <[email protected]>
mandrigin
force-pushed
the
bug/unlocked-chat-send-fields-4921
branch
from
June 25, 2018 10:53
e414e03
to
9a34839
Compare
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.
fixes #4921
Summary:
We've got two bugfixes causing each other's bugs.
If we clear
:from-chat?
from transaction, then we lose the read only state in chat transactions when user clicks cancel or say tries to sign with incorrect password. (bug #4755)If we don't clear
:from-chat?
then if we have a dapp transaction before wallet onboarding has been done, then app will think that there is a chat tx in progress and will redirect to onboarding. Since there is no chat tx the app will crash (bug #4876)This PR adds a workaround to have a special partial clean function for transactions started from chat - one that cleans everything except
:from-chat?
property. This will prevent the fields from getting unlocked and would not cause the onboarding crash since with chat transactions onboarding should happen before we get to this screen anyway (there is interception).This is merely a hotfix. A proper solution would involve:
Steps to test:
test for #4876 and #4755
status: ready