Fix FlashResults component

Change-type: patch

lib/gui/app/components/finish/finish.tsx

@@ -18,7 +18,6 @@ import * as _ from 'lodash';
 import * as React from 'react';
 import * as uuidV4 from 'uuid/v4';
 
-import * as messages from '../../../../shared/messages';
 import * as flashState from '../../models/flash-state';
 import * as selectionState from '../../models/selection-state';
 import { store } from '../../models/store';
@@ -67,18 +66,12 @@ const formattedErrors = () => {
 };
 
 function FinishPage({ goToMain }: { goToMain: () => void }) {
-	// @ts-ignore
 	const results = flashState.getFlashResults().results || {};
-	const progressMessage = messages.progress;
 	return (
 		<div className="page-finish row around-xs">
 			<div className="col-xs">
 				<div className="box center">
-					<FlashResults
+					<FlashResults results={results} errors={formattedErrors()} />
-						results={results}
-						message={progressMessage}
-						errors={formattedErrors}
-					></FlashResults>
 
 					<FlashAnother
 						onClick={(options: any) => restart(options, goToMain)}

lib/gui/app/components/flash-results/flash-results.tsx

@@ -18,24 +18,24 @@ import * as _ from 'lodash';
 import * as React from 'react';
 import styled from 'styled-components';
 import { left, position, space, top } from 'styled-system';
+
+import { progress } from '../../../../shared/messages';
 import { Underline } from '../../styled-components';
 
-const Div: any = styled.div<any>`
+const Div = styled.div<any>`
   ${position}
   ${top}
   ${left}
   ${space}
 `;
 
-export const FlashResults: any = ({
+export function FlashResults({
 	errors,
 	results,
-	message,
 }: {
-	errors: () => string;
+	errors: string;
-	results: any;
+	results: { devices: { failed: number; successful: number } };
-	message: any;
+}) {
-}) => {
 	return (
 		<Div position="absolute" left="153px" top="66px">
 			<div className="inline-flex title">
@@ -43,9 +43,12 @@ export const FlashResults: any = ({
 				<h3>Flash Complete!</h3>
 			</div>
 			<Div className="results" mt="11px" mr="0" mb="0" ml="40px">
-				<Underline tooltip={errors()}>
+				{_.map(results.devices, (quantity, type) => {
-					{_.map(results.devices, (quantity, type) => {
+					return quantity ? (
-						return quantity ? (
+						<Underline
+							tooltip={type === 'failed' ? errors : undefined}
+							key={type}
+						>
 							<div
 								key={type}
 								className={`target-status-line target-status-${type}`}
@@ -53,13 +56,13 @@ export const FlashResults: any = ({
 								<span className="target-status-dot"></span>
 								<span className="target-status-quantity">{quantity}</span>
 								<span className="target-status-message">
-									{message[type](quantity)}
+									{progress[type](quantity)}
 								</span>
 							</div>
-						) : null;
+						</Underline>
-					})}
+					) : null;
-				</Underline>
+				})}
 			</Div>
 		</Div>
 	);
-};
+}

lib/shared/messages.ts

@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-export const progress = {
+import { Dictionary } from 'lodash';
+
+export const progress: Dictionary<(quantity: number) => string> = {
 	successful: (quantity: number) => {
 		const plural = quantity === 1 ? '' : 's';
 		return `Successful device${plural}`;