Fix bad firmware UI and ensure it comes up for bluetooth flow (#568)

Author: microbit-grace

lang/ui.en.json

@@ -703,10 +703,6 @@
     "defaultMessage": "Firmware update required",
     "description": "Connection error dialog"
   },
-  "firmware-outdated-skip": {
-    "defaultMessage": "Skip and transfer manually",
-    "description": "Connection error dialog content - firmware"
-  },
   "get-started-action": {
     "defaultMessage": "Get started",
     "description": "Get started action"

src/components/BrokenFirmwareDialog.tsx

@@ -26,13 +26,11 @@ interface BrokenFirmwareDialogProps {
   isOpen: boolean;
   onClose: () => void;
   onTryAgain: () => void;
-  onSkip: () => void;
 }
 
 const BrokenFirmwareDialog = ({
   isOpen,
   onClose,
-  onSkip,
   onTryAgain,
 }: BrokenFirmwareDialogProps) => {
   const { supportLinks } = useDeployment();
@@ -100,9 +98,6 @@ const BrokenFirmwareDialog = ({
               <Button onClick={onClose} variant="secondary" size="lg">
                 <FormattedMessage id="cancel-action" />
               </Button>
-              <Button onClick={onSkip} variant="secondary" size="lg">
-                <FormattedMessage id="firmware-outdated-skip" />
-              </Button>
               <Button onClick={onTryAgain} variant="primary" size="lg">
                 <FormattedMessage id="try-again-action" />
               </Button>

src/components/ConnectionFlowDialogs.tsx

@@ -211,9 +211,6 @@ const ConnectionDialogs = () => {
       return (
         <BrokenFirmwareDialog
           {...dialogCommonProps}
-          onSkip={() =>
-            actions.setFlowStep(ConnectionFlowStep.ManualFlashingTutorial)
-          }
           onTryAgain={actions.onTryAgain}
         />
       );

src/connection-stage-actions.ts

@@ -150,16 +150,14 @@ export class ConnectionStageActions {
   };
 
   private handleConnectAndFlashFail = (result: ConnectAndFlashFailResult) => {
+    if (result === ConnectResult.ErrorBadFirmware) {
+      return this.setFlowStep(ConnectionFlowStep.BadFirmware);
+    }
     if (this.stage.flowType === ConnectionFlowType.ConnectBluetooth) {
       downloadHex(bluetoothUniversalHex);
       return this.setFlowStep(ConnectionFlowStep.ManualFlashingTutorial);
     }
-
-    // TODO: Not sure if this is a good way of error handling because it means
-    // there are 2 levels of switch statements to go through to provide UI
     switch (result) {
-      case ConnectResult.ErrorBadFirmware:
-        return this.setFlowStep(ConnectionFlowStep.BadFirmware);
       case ConnectResult.ErrorNoDeviceSelected:
         return this.setFlowStep(
           ConnectionFlowStep.TryAgainWebUsbSelectMicrobit

src/messages/ui.en.json

@@ -1207,12 +1207,6 @@
       "value": "Firmware update required"
     }
   ],
-  "firmware-outdated-skip": [
-    {
-      "type": 0,
-      "value": "Skip and transfer manually"
-    }
-  ],
   "get-started-action": [
     {
       "type": 0,