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

The conditions `isUnlocked` and `!isUnlocked` did account for all
cases, so any branches after that were unreachable.
feature/default_network_editable
Mark Stacey 4 years ago committed by GitHub
parent 314125e6fd
commit ad478f8393
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 19
      ui/app/pages/first-time-flow/first-time-flow-switch/first-time-flow-switch.component.js
  2. 8
      ui/app/pages/first-time-flow/first-time-flow-switch/first-time-flow-switch.container.js

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

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

Loading…
Cancel
Save