Revert "fix(connect): rebootToBootloader misbehaviour"

This reverts commit 6b01416.

(cherry picked from commit 094b11f)

packages/connect/src/core/index.ts

@@ -668,16 +668,17 @@ const onCall = async (message: IFrameCallMessage) => {
         const response = messageResponse;
 
         if (response) {
-            // Wait for device to switch to bootloader
-            // This delay is crucial see https://github.com/trezor/trezor-firmware/issues/1983
-            if (method.device.isT1() && method.name === 'rebootToBootloader' && response.success) {
+            if (method.name === 'rebootToBootloader' && response.success) {
+                // Wait for device to switch to bootloader
+                // This delay is crucial see https://github.com/trezor/trezor-firmware/issues/1983
                 await resolveAfter(1000).promise;
                 // call Device.run with empty function to fetch new Features
                 // (acquire > Initialize > nothing > release)
                 try {
                     await device.run(() => Promise.resolve(), { skipFinalReload: true });
                 } catch (err) {
-                    // empty
+                    // ignore. on model T, this block of code is probably not needed at all. but I am keeping it here for
+                    // backwards compatibility
                 }
             }
 

packages/suite/src/hooks/firmware/useRebootRequest.ts

@@ -8,6 +8,7 @@ import { getFirmwareVersion } from '@trezor/device-utils';
 import type { TrezorDevice } from 'src/types/suite';
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { SUITE } from 'src/actions/suite/constants';
+import { isWebUsb } from 'src/utils/suite/transport';
 
 export type RebootRequestedMode = 'bootloader' | 'normal';
 export type RebootPhase = 'initial' | 'wait-for-confirm' | 'disconnected' | 'done';
@@ -23,11 +24,16 @@ export const useRebootRequest = (
 ): RebootRequest => {
     const [phase, setPhase] = useState<RebootPhase>('initial');
 
+    const transport = useSelector(state => state.suite.transport);
+
+    const isWebUsbTransport = isWebUsb(transport);
+
     // Default reboot method is 'manual'. If the device is connected when
     // the hook is first called and fw version is sufficient,
     // then the 'automatic' method is enabled.
+    // Automatic reboot to bootloader not working properly with WebUSB so it's disabled for now.
     const [method, setMethod] = useState<RebootMethod>(() => {
-        if (!device?.connected || !device?.features) return 'manual';
+        if (!device?.connected || !device?.features || isWebUsbTransport) return 'manual';
 
         const deviceFwVersion = getFirmwareVersion(device);