feat(app): Enable new app update modal (#3044)

Opentrons · Feb 13, 2019 · d36071e · d36071e
1 parent c4a5f88
commit d36071e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 89 deletions.
diff --git a/app/src/components/AppSettings/AppUpdateModal.js b/app/src/components/AppSettings/AppUpdateModal.js
diff --git a/app/src/components/AppSettings/index.js b/app/src/components/AppSettings/index.js
@@ -5,7 +5,6 @@ import * as React from 'react'
 import {AnalyticsSettingsCard} from '../analytics-settings'
 import AdvancedSettingsCard from './AdvancedSettingsCard'
 import AppInfoCard from './AppInfoCard'
-import AppUpdateModal from './AppUpdateModal'
 import {CardContainer, CardRow} from '../layout'
 
 type Props = {
@@ -31,5 +30,3 @@ export default function AppSettings (props: Props) {
     </CardContainer>
   )
 }
-
-export {AppUpdateModal}
diff --git a/app/src/pages/More/AppSettings.js b/app/src/pages/More/AppSettings.js
@@ -2,12 +2,9 @@
 // view info about the app and update
 import * as React from 'react'
 import {connect} from 'react-redux'
-import {getIn} from '@thi.ng/paths'
 import {Route, Switch, Redirect, type ContextRouter} from 'react-router'
 import {push} from 'react-router-redux'
 
-import {getConfig} from '../../config'
-
 import {
   getShellUpdateState,
   getAvailableShellUpdate,
@@ -18,7 +15,7 @@ import {
 } from '../../shell'
 
 import Page from '../../components/Page'
-import AppSettings, {AppUpdateModal} from '../../components/AppSettings'
+import AppSettings from '../../components/AppSettings'
 import UpdateApp from '../../components/AppSettings/UpdateApp'
 import {ErrorModal} from '../../components/modals'
 
@@ -30,7 +27,6 @@ type OP = ContextRouter
 type SP = {
   update: ShellUpdateState,
   availableVersion: ?string,
-  __featureEnabled: boolean,
 }
 
 type DP = {
@@ -42,8 +38,6 @@ type DP = {
 
 type Props = OP & SP & DP
 
-const __FEATURE_FLAG = 'devInternal.newUpdateModal'
-
 export default connect(
   mapStateToProps,
   mapDispatchToProps
@@ -56,7 +50,6 @@ function AppSettingsPage (props: Props) {
     closeModal,
     update: {available, seen, error},
     match: {path},
-    __featureEnabled,
   } = props
 
   return (
@@ -72,11 +65,7 @@ function AppSettingsPage (props: Props) {
           path={`${path}/update`}
           render={() =>
             !error ? (
-              __featureEnabled ? (
-                <UpdateApp {...props} />
-              ) : (
-                <AppUpdateModal {...props} />
-              )
+              <UpdateApp {...props} />
             ) : (
               <ErrorModal
                 heading="Update Error"
@@ -101,7 +90,6 @@ function mapStateToProps (state: State): SP {
   return {
     update: getShellUpdateState(state),
     availableVersion: getAvailableShellUpdate(state),
-    __featureEnabled: !!getIn(getConfig(state), __FEATURE_FLAG),
   }
 }