m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-22 18:00:18 +01:00
Code

Fixing forgot password action after wallet creation (#16156)

Browse Source
This commit is contained in:
ryanml 2022-10-11 08:05:03 -07:00 committed by seaona
parent 9ed708cc86
commit de0e87e2b2
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/pages/routes/routes.component.js
View File

@ -113,6 +113,7 @@ export default class Routes extends Component {
currentChainId: PropTypes.string, currentChainId: PropTypes.string,
shouldShowSeedPhraseReminder: PropTypes.bool, shouldShowSeedPhraseReminder: PropTypes.bool,
portfolioTooltipIsBeingShown: PropTypes.bool, portfolioTooltipIsBeingShown: PropTypes.bool,
forgottenPassword: PropTypes.bool,
}; };
static contextTypes = { static contextTypes = {
@ -165,7 +166,10 @@ export default class Routes extends Component {
} }
renderRoutes() { renderRoutes() {
const { autoLockTimeLimit, setLastActiveTime } = this.props; const { autoLockTimeLimit, setLastActiveTime, forgottenPassword } =
this.props;
const RestoreVaultComponent = forgottenPassword ? Route : Initialized;
const routes = ( const routes = (
<Switch> <Switch>
{process.env.ONBOARDING_V2 && ( {process.env.ONBOARDING_V2 && (
@ -174,7 +178,7 @@ export default class Routes extends Component {
<Route path={LOCK_ROUTE} component={Lock} exact /> <Route path={LOCK_ROUTE} component={Lock} exact />
<Route path={INITIALIZE_ROUTE} component={FirstTimeFlow} /> <Route path={INITIALIZE_ROUTE} component={FirstTimeFlow} />
<Initialized path={UNLOCK_ROUTE} component={UnlockPage} exact /> <Initialized path={UNLOCK_ROUTE} component={UnlockPage} exact />
<Initialized <RestoreVaultComponent
path={RESTORE_VAULT_ROUTE} path={RESTORE_VAULT_ROUTE}
component={RestoreVaultPage} component={RestoreVaultPage}
exact exact

1
ui/pages/routes/routes.container.js
View File

@ -52,6 +52,7 @@ function mapStateToProps(state) {
currentChainId: getCurrentChainId(state), currentChainId: getCurrentChainId(state),
shouldShowSeedPhraseReminder: getShouldShowSeedPhraseReminder(state), shouldShowSeedPhraseReminder: getShouldShowSeedPhraseReminder(state),
portfolioTooltipIsBeingShown: getShowPortfolioTooltip(state), portfolioTooltipIsBeingShown: getShowPortfolioTooltip(state),
forgottenPassword: state.metamask.forgottenPassword,
}; };
} }