fix(suite-native): onboarding device disconnected error while onboarding

Author: PeKne

suite-native/device/src/hooks/useHandleDeviceConnection.ts

@@ -96,11 +96,13 @@ export const useHandleDeviceConnection = () => {
         if (
             isDeviceSetupSupported &&
             isDeviceConnected &&
+            isOnboardingFinished &&
             !isDeviceInitialized &&
             !isPortfolioTrackerDevice &&
             !isBiometricsOverlayVisible &&
-            !isOnboardingStackFocused &&
-            !isOnboardingDeviceDisconnectedAlertDisplayed
+            !isDeviceOnboardingStackFocused &&
+            !isOnboardingDeviceDisconnectedAlertDisplayed &&
+            !isFirmwareInstallationRunning
         ) {
             navigation.navigate(RootStackRoutes.DeviceOnboardingStack, {
                 screen: DeviceOnboardingStackRoutes.UninitializedDeviceLanding,
@@ -109,12 +111,14 @@ export const useHandleDeviceConnection = () => {
     }, [
         dispatch,
         isDeviceConnected,
-        isOnboardingStackFocused,
+        isOnboardingFinished,
         isBiometricsOverlayVisible,
         navigation,
         isDeviceInitialized,
         isPortfolioTrackerDevice,
         isDeviceSetupSupported,
+        isDeviceOnboardingStackFocused,
+        isFirmwareInstallationRunning,
         isOnboardingDeviceDisconnectedAlertDisplayed,
     ]);
 
@@ -169,7 +173,7 @@ export const useHandleDeviceConnection = () => {
     // set connecting screen to be displayed again on the next device connection.
     useEffect(() => {
         if (
-            (isFirmwareInstallationRunning && !isOnboardingStackFocused) ||
+            isFirmwareInstallationRunning ||
             !isOnboardingFinished ||
             isConnectAndUnlockDeviceScreenFocused
         )

suite-native/device/src/hooks/useHandleOnboardingDeviceDisconnection.tsx

@@ -82,7 +82,10 @@ export const useHandleOnboardingDeviceDisconnection = () => {
                         secondaryButtonTitle: translate('generic.buttons.cancel'),
                         secondaryButtonVariant: 'redElevation0',
                         onPressPrimaryButton: hideDeviceDisconnectedAlert,
-                        onPressSecondaryButton: hideDeviceDisconnectedAlert,
+                        onPressSecondaryButton: () => {
+                            hideDeviceDisconnectedAlert();
+                            navigation.goBack();
+                        },
                     });
                 }, 300);
             }

suite-native/device/src/index.ts

@@ -5,6 +5,7 @@ export * from './hooks/useDetectDeviceError';
 export * from './hooks/useReportDeviceConnectToAnalytics';
 export * from './hooks/useReportDeviceCompromised';
 export * from './hooks/useRetryFwAuthenticityChecks';
+export * from './hooks/useHandleOnboardingDeviceDisconnection';
 export * from './components/ConnectDeviceAnimation';
 export * from './components/ConfirmOnTrezorImage';
 export * from './components/ConnectorImage';

suite-native/firmware/src/components/FirmwareInstallationScreenContent.tsx

@@ -45,6 +45,7 @@ type FirmwareInstallationScreenContentProps = {
     onFirmwareInstallationSuccess: () => void;
     onFirmwareInstallationFailure?: () => void;
     isCancellationAllowed?: boolean;
+    isRetryAllowed?: boolean;
 };
 
 // This component is shared between `module-onboarding` and `module-device-settings`.
@@ -53,6 +54,7 @@ export const FirmwareInstallationScreenContent = ({
     onFirmwareInstallationSuccess,
     onFirmwareInstallationFailure,
     isCancellationAllowed = true,
+    isRetryAllowed = true,
 }: FirmwareInstallationScreenContentProps) => {
     const dispatch = useDispatch();
     const { applyStyle } = useNativeStyles();
@@ -228,9 +230,11 @@ export const FirmwareInstallationScreenContent = ({
                         bottom: bottomButtonOffset,
                     })}
                 >
-                    <Button onPress={handleRetry} colorScheme="redBold">
-                        <Translation id="firmware.firmwareUpdateProgress.retryButton" />
-                    </Button>
+                    {isRetryAllowed && (
+                        <Button onPress={handleRetry} colorScheme="redBold">
+                            <Translation id="firmware.firmwareUpdateProgress.retryButton" />
+                        </Button>
+                    )}
                     <Button onPress={handleContactSupport} colorScheme="tertiaryElevation0">
                         <Translation id="firmware.firmwareUpdateProgress.contactSupportButton" />
                     </Button>

suite-native/firmware/src/hooks/useFirmware.tsx

@@ -15,7 +15,7 @@ import { useFirmwareAnalytics } from './useFirmwareAnalytics';
 // If progress doesn't change for 1 minute
 const MAYBE_STUCKED_TIMEOUT = 1 * 60 * 1000; // 1 minute
 
-export const useFirmware = (params: UseFirmwareInstallationParams) => {
+export const useFirmware = (params?: UseFirmwareInstallationParams) => {
     const dispatch = useDispatch();
     const {
         firmwareUpdate: firmwareUpdateCommon,

suite-native/firmware/src/index.ts

@@ -4,3 +4,4 @@ export * from './components/FirmwareInstallationScreenContent';
 export * from './components/ConfirmFirmwareUpdateScreenContent';
 export * from './components/ConfirmFirmwareUpdateScreenFooter';
 export * from './hooks/useIsFirmwareUpdateFeatureEnabled';
+export * from './hooks/useFirmware';

suite-native/module-device-onboarding/src/components/OnboardingScreenWithExitButton.tsx

@@ -7,6 +7,7 @@ import { useSetAtom } from 'jotai';
 import { deviceActions, selectSelectedDevice } from '@suite-common/wallet-core';
 import { useAlert } from '@suite-native/alerts';
 import { wasDeviceDisconnectedByUserActionAtom } from '@suite-native/device';
+import { useFirmware } from '@suite-native/firmware';
 import { useTranslate } from '@suite-native/intl';
 import { Screen, ScreenHeader, ScreenProps } from '@suite-native/navigation';
 
@@ -17,6 +18,7 @@ const DeviceOnboardingExitButtonScreenHeader = () => {
     const dispatch = useDispatch();
     const selectedDevice = useSelector(selectSelectedDevice);
     const setWasDeviceDisconnectedByUserAction = useSetAtom(wasDeviceDisconnectedByUserActionAtom);
+    const { setIsFirmwareInstallationRunning } = useFirmware();
 
     const handleExitButtonPress = useCallback(() => {
         showAlert({
@@ -30,12 +32,20 @@ const DeviceOnboardingExitButtonScreenHeader = () => {
             secondaryButtonVariant: 'redElevation0',
             onPressPrimaryButton: () => {
                 if (selectedDevice) {
+                    setIsFirmwareInstallationRunning(false);
                     setWasDeviceDisconnectedByUserAction(true);
                     dispatch(deviceActions.deviceDisconnect(selectedDevice));
                 }
             },
         });
-    }, [dispatch, selectedDevice, setWasDeviceDisconnectedByUserAction, translate, showAlert]);
+    }, [
+        dispatch,
+        selectedDevice,
+        setWasDeviceDisconnectedByUserAction,
+        setIsFirmwareInstallationRunning,
+        translate,
+        showAlert,
+    ]);
 
     useEffect(() => {
         // Override default navigation GO_BACK action to align it with the exit button behavior.

suite-native/module-device-onboarding/src/screens/FirmwareInstallationScreen.tsx

@@ -17,6 +17,7 @@ export const FirmwareInstallationScreen = () => {
             <FirmwareInstallationScreenContent
                 onFirmwareInstallationSuccess={handleFirmwareInstallationSuccess}
                 isCancellationAllowed={false}
+                isRetryAllowed={false}
             />
         </DeviceOnboardingScreenWithExitButton>
     );