diff --git a/app/src/components/AppSettings/AppUpdateModal.js b/app/src/components/AppSettings/AppUpdateModal.js
deleted file mode 100644
index 1221ff0e8f9..00000000000
--- a/app/src/components/AppSettings/AppUpdateModal.js
+++ /dev/null
@@ -1,72 +0,0 @@
-// @flow
-// AlertModal for updating to newest app version
-import * as React from 'react'
-
-import {Icon, type ButtonProps} from '@opentrons/components'
-import {Portal} from '../portal'
-import {ScrollableAlertModal} from '../modals'
-import ReleaseNotes from '../ReleaseNotes'
-
-import type {ShellUpdateState} from '../../shell'
-
-type Props = {
- update: ShellUpdateState,
- availableVersion: ?string,
- downloadUpdate: () => mixed,
- applyUpdate: () => mixed,
- closeModal: () => mixed,
-}
-
-// TODO(mc, 2018-03-19): prop or component for text-height icons
-const Spinner = () =>
-
-export default function AppUpdateModal (props: Props) {
- const {
- closeModal,
- availableVersion,
- update: {downloading, info},
- } = props
- const buttonProps = mapPropsToButtonProps(props)
- const closeButtonChildren = downloading ? 'close' : 'not now'
-
- return (
-
-
-
-
-
- )
-}
-
-const DOWNLOAD = 'download'
-const DOWNLOAD_IN_PROGRESS = 'downloading'
-const RESTART = 'restart app'
-
-function mapPropsToButtonProps (props: Props): ButtonProps {
- const {downloaded, checking, downloading} = props.update
- const disabled = checking || downloading
- const onClick = downloaded ? props.applyUpdate : props.downloadUpdate
-
- let buttonProps: ButtonProps = {onClick, disabled}
-
- if (downloaded) {
- buttonProps.children = RESTART
- } else if (downloading) {
- buttonProps.children = (
-
- {`${DOWNLOAD_IN_PROGRESS} `}
-
-
- )
- } else {
- buttonProps.children = DOWNLOAD
- }
-
- return buttonProps
-}
diff --git a/app/src/components/AppSettings/index.js b/app/src/components/AppSettings/index.js
index 7d91621d78d..01a1a278f98 100644
--- 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) {
)
}
-
-export {AppUpdateModal}
diff --git a/app/src/pages/More/AppSettings.js b/app/src/pages/More/AppSettings.js
index 95695e64416..55283868a9f 100644
--- 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 ? (
-
- ) : (
-
- )
+
) : (