diff --git a/app/src/pages/OnDeviceDisplay/RunSummary.tsx b/app/src/pages/OnDeviceDisplay/RunSummary.tsx
index 06b39f0824d..6bfec24840e 100644
--- a/app/src/pages/OnDeviceDisplay/RunSummary.tsx
+++ b/app/src/pages/OnDeviceDisplay/RunSummary.tsx
@@ -1,29 +1,28 @@
import * as React from 'react'
import { useSelector } from 'react-redux'
-import { useParams, useHistory, Link } from 'react-router-dom'
+import { useParams, useHistory } from 'react-router-dom'
import { useTranslation } from 'react-i18next'
import styled, { css } from 'styled-components'
+
import {
- Flex,
- DIRECTION_COLUMN,
- TYPOGRAPHY,
- SPACING,
- COLORS,
- JUSTIFY_CENTER,
ALIGN_CENTER,
- POSITION_RELATIVE,
- OVERFLOW_HIDDEN,
- ALIGN_FLEX_END,
- POSITION_ABSOLUTE,
- Icon,
- JUSTIFY_SPACE_BETWEEN,
- ALIGN_STRETCH,
ALIGN_FLEX_START,
+ ALIGN_STRETCH,
BORDERS,
+ Btn,
+ COLORS,
+ DIRECTION_COLUMN,
DIRECTION_ROW,
DISPLAY_FLEX,
- SIZE_2,
- Btn,
+ Flex,
+ Icon,
+ JUSTIFY_CENTER,
+ JUSTIFY_SPACE_BETWEEN,
+ OVERFLOW_HIDDEN,
+ POSITION_ABSOLUTE,
+ POSITION_RELATIVE,
+ SPACING,
+ TYPOGRAPHY,
} from '@opentrons/components'
import {
RUN_STATUS_FAILED,
@@ -32,7 +31,7 @@ import {
} from '@opentrons/api-client'
import { useProtocolQuery, useRunQuery } from '@opentrons/react-api-client'
-import { LargeButton, TertiaryButton } from '../../atoms/buttons'
+import { LargeButton } from '../../atoms/buttons'
import {
useRunTimestamps,
useRunControls,
@@ -134,147 +133,135 @@ export function RunSummary(): JSX.Element {
}
return (
- <>
-
- {showSplash ? (
-
-
-
-
-
- {didRunSucceed
- ? t('run_complete_splash')
- : t('run_failed_splash')}
-
-
-
- {protocolName}
-
-
-
- ) : (
+
+ {showSplash ? (
+
+
+
+
+
+ {didRunSucceed
+ ? t('run_complete_splash')
+ : t('run_failed_splash')}
+
+
+
+ {protocolName}
+
+
+
+ ) : (
+
+ {showRunFailedModal ? (
+
+ ) : null}
- {showRunFailedModal ? (
-
+
- ) : null}
-
-
- {headerText}
+
+ {protocolName}
+
+ {`${t(
+ 'run'
+ )}: ${createdAtTimestamp}`}
+
+ {`${t('duration')}: `}
+
- {headerText}
-
- {protocolName}
-
- {`${t(
- 'run'
- )}: ${createdAtTimestamp}`}
-
- {`${t('duration')}: `}
-
-
- {`${t(
- 'start'
- )}: ${startedAtTimestamp}`}
- {`${t(
- 'end'
- )}: ${completedAtTimestamp}`}
-
+
+ {`${t(
+ 'start'
+ )}: ${startedAtTimestamp}`}
+ {`${t(
+ 'end'
+ )}: ${completedAtTimestamp}`}
-
-
+
+
+
+
+ {!didRunSucceed ? (
- {!didRunSucceed ? (
-
- ) : null}
-
+ ) : null}
- )}
-
-
-
- back to RobotDashboard
-
-
- >
+
+ )}
+
)
}
diff --git a/app/src/pages/OnDeviceDisplay/RunningProtocol.tsx b/app/src/pages/OnDeviceDisplay/RunningProtocol.tsx
index 80ddb9c8284..2f6e3069214 100644
--- a/app/src/pages/OnDeviceDisplay/RunningProtocol.tsx
+++ b/app/src/pages/OnDeviceDisplay/RunningProtocol.tsx
@@ -1,20 +1,19 @@
import * as React from 'react'
-import { useParams, Link } from 'react-router-dom'
+import { useParams } from 'react-router-dom'
import styled from 'styled-components'
import { useSelector } from 'react-redux'
import {
- Flex,
+ ALIGN_CENTER,
+ COLORS,
DIRECTION_COLUMN,
DIRECTION_ROW,
- SPACING,
- useSwipe,
- COLORS,
+ Flex,
JUSTIFY_CENTER,
- ALIGN_CENTER,
- POSITION_RELATIVE,
OVERFLOW_HIDDEN,
- ALIGN_FLEX_END,
+ POSITION_RELATIVE,
+ SPACING,
+ useSwipe,
} from '@opentrons/components'
import {
useProtocolQuery,
@@ -22,7 +21,7 @@ import {
useRunActionMutations,
} from '@opentrons/react-api-client'
import { RUN_STATUS_STOP_REQUESTED } from '@opentrons/api-client'
-import { TertiaryButton } from '../../atoms/buttons'
+
import { StepMeter } from '../../atoms/StepMeter'
import { useMostRecentCompletedAnalysis } from '../../organisms/LabwarePositionCheck/useMostRecentCompletedAnalysis'
import { useLastRunCommandKey } from '../../organisms/Devices/hooks/useLastRunCommandKey'
@@ -147,7 +146,6 @@ export function RunningProtocol(): JSX.Element {
return (
<>
{runStatus === RUN_STATUS_STOP_REQUESTED ? : null}
-
- {/* temporary */}
-
-
- back to RobotDashboard
-
-
>
)
}