-
-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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
Fix whats new modal #1983
Fix whats new modal #1983
Conversation
@@ -407,7 +408,7 @@ class DrawerView extends PureComponent { | |||
componentDidUpdate() { | |||
const route = this.findRouteNameFromNavigatorState(this.props.navigation.state); | |||
if (!this.props.passwordSet || !this.props.seedphraseBackedUp) { | |||
if (['SetPasswordFlow', 'Webview'].includes(route)) { | |||
if (['SetPasswordFlow', 'Webview', 'ChoosePassword'].includes(route)) { |
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.
if you move away from ChoosePassword
view, isn't the modal appearing again?
@@ -1045,6 +1055,11 @@ class DrawerView extends PureComponent { | |||
showReceiveModal={this.showReceiveModal} | |||
/> | |||
</Modal> | |||
<WhatsNewModal | |||
navigation={this.props.navigation} | |||
enabled={this.state.showProtectWalletModal === false} |
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.
was this on purpose? enabled if false
also why not !this.state.showProtectWalletModal?
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.
This was more or less a little hack that I had to do in order for the modals not to overlap one another, for some reason it was happening, I think it's because the native side was being faster then the render I am not sure.
So for this to work this.state.showProtectWalletModal starts with undefined. Then we update it either to true or false. Only when it's false it shows the whats new modal.
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.
QA Passed 👍
* Working * update tests * Fix show whats new modal
Description
This PR fixes whats new modal
Checklist
Issue
Resolves #???