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

Remove unreachable branches from first time flow switch (#9795)

Browse Source 
The conditions `isUnlocked` and `!isUnlocked` did account for all
cases, so any branches after that were unreachable.
This commit is contained in:
Mark Stacey 2020-11-05 12:41:56 -03:30 committed by GitHub
parent 314125e6fd
commit ad478f8393
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ui/app/pages/first-time-flow/first-time-flow-switch/first-time-flow-switch.component.js
View File

@ -6,7 +6,6 @@ import {
LOCK_ROUTE,
INITIALIZE_WELCOME_ROUTE,
INITIALIZE_UNLOCK_ROUTE,
INITIALIZE_METAMETRICS_OPT_IN_ROUTE,
} from '../../../helpers/constants/routes'
export default class FirstTimeFlowSwitch extends PureComponent {
@ -14,16 +13,10 @@ export default class FirstTimeFlowSwitch extends PureComponent {
completedOnboarding: PropTypes.bool,
isInitialized: PropTypes.bool,
isUnlocked: PropTypes.bool,
optInMetaMetrics: PropTypes.bool,
}
render() {
const {
completedOnboarding,
isInitialized,
isUnlocked,
optInMetaMetrics,
} = this.props
const { completedOnboarding, isInitialized, isUnlocked } = this.props
if (completedOnboarding) {
return <Redirect to={{ pathname: DEFAULT_ROUTE }} />
@ -37,14 +30,6 @@ export default class FirstTimeFlowSwitch extends PureComponent {
return <Redirect to={{ pathname: INITIALIZE_WELCOME_ROUTE }} />
}
if (!isUnlocked) {
return <Redirect to={{ pathname: INITIALIZE_UNLOCK_ROUTE }} />
}
if (optInMetaMetrics === null) {
return <Redirect to={{ pathname: INITIALIZE_WELCOME_ROUTE }} />
}
return <Redirect to={{ pathname: INITIALIZE_METAMETRICS_OPT_IN_ROUTE }} />
return <Redirect to={{ pathname: INITIALIZE_UNLOCK_ROUTE }} />
}
}

8
ui/app/pages/first-time-flow/first-time-flow-switch/first-time-flow-switch.container.js
View File

@ -2,18 +2,12 @@ import { connect } from 'react-redux'
import FirstTimeFlowSwitch from './first-time-flow-switch.component'
const mapStateToProps = ({ metamask }) => {
const {
completedOnboarding,
isInitialized,
isUnlocked,
participateInMetaMetrics: optInMetaMetrics,
} = metamask
const { completedOnboarding, isInitialized, isUnlocked } = metamask
return {
completedOnboarding,
isInitialized,
isUnlocked,
optInMetaMetrics,
}
}