diff --git a/packages/neuron-ui/src/components/HardwareSign/index.tsx b/packages/neuron-ui/src/components/HardwareSign/index.tsx index 69a797f37d..7b53021f2d 100644 --- a/packages/neuron-ui/src/components/HardwareSign/index.tsx +++ b/packages/neuron-ui/src/components/HardwareSign/index.tsx @@ -322,8 +322,7 @@ const HardwareSign = ({ if (isSuccessResponse(res)) { history!.push(RoutePath.History) } else { - // @ts-ignore - setError(res.message.content) + setError(typeof res.message === 'string' ? res.message : res.message.content ?? 'migrate-acp error') } }) break @@ -425,7 +424,6 @@ const HardwareSign = ({ }, [offlineSignType, generatedTx, onCancel, description, experimental]) useDidMount(() => { - // @ts-ignore dialogRef.current?.showModal() ensureDeviceAvailable(deviceInfo) }) diff --git a/packages/neuron-ui/src/components/VerifyHardwareAddress/index.tsx b/packages/neuron-ui/src/components/VerifyHardwareAddress/index.tsx index b6955a052f..8937d543cb 100644 --- a/packages/neuron-ui/src/components/VerifyHardwareAddress/index.tsx +++ b/packages/neuron-ui/src/components/VerifyHardwareAddress/index.tsx @@ -172,7 +172,6 @@ const VerifyHardwareAddress = ({ address, wallet, onDismiss }: VerifyHardwareAdd }, [deviceInfo, address, userInputStatus, verifiedStatus, invalidStatus, ensureDeviceAvailable, t]) useDidMount(() => { - // @ts-ignore dialogRef.current?.showModal() ensureDeviceAvailable(deviceInfo) }) diff --git a/packages/neuron-ui/src/states/stateProvider/actionCreators/sudt.ts b/packages/neuron-ui/src/states/stateProvider/actionCreators/sudt.ts index 235b910e32..49ad1e6ffa 100644 --- a/packages/neuron-ui/src/states/stateProvider/actionCreators/sudt.ts +++ b/packages/neuron-ui/src/states/stateProvider/actionCreators/sudt.ts @@ -4,6 +4,7 @@ import { sendSUDTTransaction as sendSUDTTx, migrateAcp as migrateAcpIpc, } from 'services/remote' +import { FailureFromController } from 'services/remote/remoteApiWrapper' import { AppActions, StateDispatch } from '../reducer' import { addNotification } from './app' @@ -42,7 +43,13 @@ export const migrateAcp = (params: Controller.MigrateAcp.Params) => async (dispa return res } catch (err) { console.warn(err) - return { status: ResponseCode.FAILURE, message: err } + const res: FailureFromController = { + status: ResponseCode.FAILURE, + message: { + content: String(err), + }, + } + return res } finally { dispatch({ type: AppActions.UpdateLoadings, diff --git a/packages/neuron-wallet/src/block-sync-renderer/sync/indexer-cache-service.ts b/packages/neuron-wallet/src/block-sync-renderer/sync/indexer-cache-service.ts index 72bcf1f5e5..40aa9f77b7 100644 --- a/packages/neuron-wallet/src/block-sync-renderer/sync/indexer-cache-service.ts +++ b/packages/neuron-wallet/src/block-sync-renderer/sync/indexer-cache-service.ts @@ -104,7 +104,6 @@ export default class IndexerCacheService { ) const fetchedTxHashes = await transactionCollector.getTransactionHashes() - //@ts-ignore if (!fetchedTxHashes.length) { continue } diff --git a/packages/neuron-wallet/src/block-sync-renderer/task-wrapper.ts b/packages/neuron-wallet/src/block-sync-renderer/task-wrapper.ts index 427f9b714a..5f541defe5 100644 --- a/packages/neuron-wallet/src/block-sync-renderer/task-wrapper.ts +++ b/packages/neuron-wallet/src/block-sync-renderer/task-wrapper.ts @@ -1,9 +1,8 @@ -//@ts-nocheck import Module from 'module' const originalLoad = Module._load -Module._load = function (...args: unknown[]) { +Module._load = function (...args) { if (args[0] === 'electron') { return {} } diff --git a/packages/neuron-wallet/src/types/module.d.ts b/packages/neuron-wallet/src/types/module.d.ts new file mode 100644 index 0000000000..ff5b10ce32 --- /dev/null +++ b/packages/neuron-wallet/src/types/module.d.ts @@ -0,0 +1,8 @@ +import 'module' + +declare module 'module' { + namespace Module { + function _load(...args: unknown[]): unknown + } + export = Module +} diff --git a/packages/neuron-wallet/tests/setupAndTeardown/index.ts b/packages/neuron-wallet/tests/setupAndTeardown/index.ts index d524b0d544..24d2cec210 100644 --- a/packages/neuron-wallet/tests/setupAndTeardown/index.ts +++ b/packages/neuron-wallet/tests/setupAndTeardown/index.ts @@ -16,6 +16,7 @@ export const closeConnection = () => { export const saveTransactions = async (txs: any) => { for (const tx of txs) { // TODO: do not use private methods + // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Private method await TransactionPersistor.saveWithFetch(tx) } @@ -23,7 +24,7 @@ export const saveTransactions = async (txs: any) => { export const createAccounts = async (assetAccounts: AssetAccount[], outputEntities: OutputEntity[]) => { const entities = assetAccounts.map(aa => AssetAccountEntity.fromModel(aa)) - const accountIds = [] + const accountIds: number[] = [] for (const entity of entities) { await getConnection().manager.save([entity.sudtTokenInfo]) const [assetAccount] = await getConnection().manager.save([entity])