Skip to content

Commit 5242eb5

Browse files
committed
fix: delete unuse setIntalval code
1 parent dac70bb commit 5242eb5

File tree

6 files changed

+6
-21
lines changed

6 files changed

+6
-21
lines changed

src/components/Firmware/ProgressBar.tsx

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,10 @@ export default function ProgressBar() {
2020
const updateTip = useSelector((state: RootState) => state.firmware.updateTip);
2121

2222
const getIntervalTime = useCallback(() => {
23-
const bootloaderVersion = getDeviceBootloaderVersion(device?.features).join(
24-
'.'
25-
);
2623
const deviceType = getDeviceType(device?.features);
2724
const isBle = uploadType === 'ble';
28-
const isV3Update =
29-
semver.gte(bootloaderVersion, '2.8.0') && deviceType === EDeviceType.Pro;
30-
3125
let time = 100;
32-
if (isV3Update) {
33-
time = 1500;
34-
} else if (deviceType === 'classic' || deviceType === 'classic1s') {
26+
if (deviceType === 'classic' || deviceType === 'classic1s') {
3527
time = isBle ? 100 : 300;
3628
} else if (deviceType === 'mini') {
3729
time = 500;

src/components/Firmware/Table.tsx

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,13 @@ import {
77
Features,
88
getFirmwareUpdateFieldArray,
99
} from '@onekeyfe/hd-core';
10+
import type { IFirmwareField } from '@onekeyfe/hd-core';
1011
import { RootState } from '@/store';
1112
import {
1213
setSelectedReleaseInfo,
1314
setSelectedUploadType,
1415
} from '@/store/reducers/runtime';
15-
import {
16-
IFirmwareReleaseInfo,
17-
IBLEFirmwareReleaseInfo,
18-
IFirmwareField,
19-
} from '@/types';
16+
import { IFirmwareReleaseInfo, IBLEFirmwareReleaseInfo } from '@/types';
2017
import type { TabType } from './ReleaseInfo';
2118

2219
type DataSource = {

src/hardware/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import {
1010
UI_RESPONSE,
1111
FirmwareUpdateV3Params,
1212
} from '@onekeyfe/hd-core';
13+
import type { IFirmwareField } from '@onekeyfe/hd-core';
1314
import { createDeferred, Deferred } from '@onekeyfe/hd-shared';
1415
import { store } from '@/store';
1516
import {
@@ -28,7 +29,6 @@ import {
2829
} from '@/store/reducers/firmware';
2930
import type {
3031
BridgeReleaseMap,
31-
IFirmwareField,
3232
RemoteConfigResponse,
3333
IFirmwareReleaseInfo,
3434
} from '@/types';

src/store/reducers/runtime.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import { createSlice, PayloadAction } from '@reduxjs/toolkit';
2-
import type { KnownDevice } from '@onekeyfe/hd-core';
2+
import type { KnownDevice, IFirmwareField } from '@onekeyfe/hd-core';
33
import {
44
BridgeReleaseMap,
55
DeviceTypeMap,
66
IFirmwareReleaseInfo,
77
IBLEFirmwareReleaseInfo,
8-
IFirmwareField,
98
} from '@/types';
109
import { getDefaultLocale } from '@/utils';
1110

src/types.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ export type IBLEFirmwareReleaseInfo = {
3737
};
3838
};
3939

40-
export type IFirmwareField = 'firmware' | 'ble' | 'firmware-v2' | 'firmware-v6';
41-
4240
export type DeviceTypeMap = {
4341
[k in IDeviceType]: {
4442
firmware: IFirmwareReleaseInfo[];

src/utils/touchFirmware.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { store } from '@/store';
2-
import { IFirmwareField } from '@/types';
32
import axios from 'axios';
4-
3+
import type { IFirmwareField } from '@onekeyfe/hd-core';
54
// download 3.4 firmware
65
export const downloadLegacyTouchFirmware = async (
76
firmwareField: 'firmware' | 'ble' | 'firmware-v2'

0 commit comments

Comments
 (0)