Show unsupported micro:bit V1 dialog for radio bridge (#396)

- Fix for triggering the unsupported micro:bit v1 dialog
- Removal of impossible logic for attempting to trigger the dialog.

---------

Co-authored-by: Matt Hillsdon <[email protected]>

Author: microbit-grace

lang/ui.en.json

@@ -1040,11 +1040,11 @@
     "description": "Unplug radio link micro:bit dialog title"
   },
   "unsupported-device-explain": {
-    "defaultMessage": "Unfortunately, we only support using micro:bit V2 when connecting two micro:bits. You have connected a <link>micro:bit V1</link>.",
+    "defaultMessage": "Unfortunately, we only support using micro:bit V2 when connecting using micro:bit radio. You have connected a <link>micro:bit V1</link>.",
     "description": "Unsupported device dialog"
   },
   "unsupported-device-header": {
-    "defaultMessage": "micro:bit V1 is not supported for connecting two micro:bits",
+    "defaultMessage": "micro:bit radio connections do not support micro:bit V1",
     "description": "Unsupported device dialog"
   },
   "unsupported-device-with-bluetooth": {

src/connect-actions.ts

@@ -18,7 +18,6 @@ import { Logging } from "./logging/logging";
 export enum ConnectResult {
   Success = "Success",
   Failed = "Failed",
-  ErrorMicrobitUnsupported = "ErrorMicrobitUnsupported",
   ErrorBadFirmware = "ErrorBadFirmware",
   ErrorNoDeviceSelected = "ErrorNoDeviceSelected",
   ErrorUnableToClaimInterface = "ErrorUnableToClaimInterface",
@@ -71,7 +70,6 @@ export class ConnectActions {
   }
 
   requestUSBConnection = async (
-    // Used for MakeCode hex downloads.
     options?: ConnectionAndFlashOptions
   ): Promise<
     | {
@@ -121,10 +119,6 @@ export class ConnectActions {
     const data = Object.values(HexType).includes(hex as HexType)
       ? getFlashDataSource(hex as HexType)
       : createUniversalHexFlashDataSource(hex);
-
-    if (!data) {
-      return ConnectResult.ErrorMicrobitUnsupported;
-    }
     try {
       await usb.flash(data, {
         partial: true,
@@ -137,36 +131,6 @@ export class ConnectActions {
     }
   };
 
-  requestUSBConnectionAndFlash = async (
-    hex: string | HexType,
-    progressCallback: (progress: number) => void
-  ): Promise<
-    | {
-        result: ConnectResult.Success;
-        deviceId: number;
-        boardVersion?: BoardVersion;
-      }
-    | {
-        result: ConnectAndFlashFailResult;
-        deviceId?: number;
-        boardVersion?: BoardVersion;
-      }
-  > => {
-    const { result, deviceId, usb } = await this.requestUSBConnection();
-    if (result !== ConnectResult.Success) {
-      return { result };
-    }
-    try {
-      const result = await this.flashMicrobit(hex, progressCallback);
-      return { result, deviceId, boardVersion: usb.getBoardVersion() };
-    } catch (e) {
-      this.logging.error(
-        `USB request device failed/cancelled: ${JSON.stringify(e)}`
-      );
-      return { result: this.handleConnectAndFlashError(e) };
-    }
-  };
-
   private handleConnectAndFlashError = (
     err: unknown
   ): ConnectAndFlashFailResult => {

src/connection-stage-actions.ts

@@ -66,12 +66,27 @@ export class ConnectionStageActions {
   ) => {
     this.setFlowStep(ConnectionFlowStep.WebUsbChooseMicrobit);
     const hex = this.getHexType();
-    const { result, deviceId, boardVersion } =
-      await this.actions.requestUSBConnectionAndFlash(hex, progressCallback);
-    if (result !== ConnectResult.Success) {
-      return this.handleConnectAndFlashFail(result);
-    }
 
+    const {
+      result: usbResult,
+      usb,
+      deviceId,
+    } = await this.actions.requestUSBConnection();
+    if (usbResult !== ConnectResult.Success) {
+      return this.handleConnectAndFlashFail(usbResult);
+    }
+    const boardVersion = usb?.getBoardVersion();
+    if (
+      usbResult === ConnectResult.Success &&
+      boardVersion === "V1" &&
+      this.stage.flowType !== ConnectionFlowType.ConnectBluetooth
+    ) {
+      return this.setFlowStep(ConnectionFlowStep.MicrobitUnsupported);
+    }
+    const flashResult = await this.actions.flashMicrobit(hex, progressCallback);
+    if (flashResult !== ConnectResult.Success) {
+      return this.handleConnectAndFlashFail(flashResult);
+    }
     await this.onFlashSuccess(deviceId, onSuccess, boardVersion);
   };
 
@@ -133,8 +148,6 @@ export class ConnectionStageActions {
     // 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.ErrorMicrobitUnsupported:
-        return this.setFlowStep(ConnectionFlowStep.MicrobitUnsupported);
       case ConnectResult.ErrorBadFirmware:
         return this.setFlowStep(ConnectionFlowStep.BadFirmware);
       case ConnectResult.ErrorNoDeviceSelected:

src/messages/ui.en.json

@@ -1824,7 +1824,7 @@
   "unsupported-device-explain": [
     {
       "type": 0,
-      "value": "Unfortunately, we only support using micro:bit V2 when connecting two micro:bits. You have connected a "
+      "value": "Unfortunately, we only support using micro:bit V2 when connecting using micro:bit radio. You have connected a "
     },
     {
       "children": [
@@ -1844,7 +1844,7 @@
   "unsupported-device-header": [
     {
       "type": 0,
-      "value": "micro:bit V1 is not supported for connecting two micro:bits"
+      "value": "micro:bit radio connections do not support micro:bit V1"
     }
   ],
   "unsupported-device-with-bluetooth": [