Fixes based on review from Pascal

NordicSemiconductor · Sep 26, 2022 · 122236f · 122236f
1 parent 456d558
commit 122236f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/actions/targetActions.ts b/src/actions/targetActions.ts
@@ -50,7 +50,6 @@ export const openDevice = (device: Device) => (dispatch: TDispatch) => {
         return;
     }
     // Trait changed between nrfdl-version, will be rectified in device-lib-js in later.
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const mcuBootTrait = device.traits.mcuboot || (<any>device.traits).mcuBoot;
     if (mcuBootTrait || mcubootTargetActions.isMcuboot(vid, pid)) {
         usageData.sendUsageData(EventAction.OPEN_DEVICE, 'mcuboot');

diff --git a/src/components/AppMainView.tsx b/src/components/AppMainView.tsx
@@ -11,7 +11,10 @@ import { getElf, getLoaded, getZipFilePath } from '../reducers/fileReducer';
 import { getDeviceInfo, getSerialNumber } from '../reducers/targetReducer';
 import useOpenFileFromArgs from '../useOpenFileFromArgs';
 import { DeviceDefinition } from '../util/devices';
+import McuUpdateDialogView from './McuUpdateDialogView';
 import MemoryBoxView from './MemoryBoxView';
+import ModemUpdateDialogView from './ModemUpdateDialogView';
+import UserInputDialogView from './UserInputDialogView';
 import WarningView from './WarningView';
 
 function getTargetTitle(
@@ -61,6 +64,9 @@ const AppMainView = () => {
                     isTarget={!!serialNumber}
                 />
             </div>
+            <UserInputDialogView />
+            <ModemUpdateDialogView />
+            <McuUpdateDialogView />
         </div>
     );
 };

diff --git a/src/reducers/fileReducer.ts b/src/reducers/fileReducer.ts
@@ -8,6 +8,7 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 import MemoryMap, { MemoryMaps } from 'nrf-intel-hex';
 
 import { Region } from '../util/regions';
+import { ElfFile } from './elf';
 import type { RootState } from './types';
 
 type Loaded = {
@@ -25,7 +26,7 @@ export interface FileState {
     memMaps: MemoryMaps;
     mruFiles: string[];
     regions: Region[];
-    elf?: object;
+    elf?: ElfFile;
 }
 
 const initialState: FileState = {
@@ -54,7 +55,7 @@ const fileSlice = createSlice({
                 mruFiles: state.mruFiles,
             };
         },
-        elfParse(state, action: PayloadAction<object>) {
+        elfParse(state, action: PayloadAction<ElfFile>) {
             state.elf = action.payload;
         },
         fileParse(state, action: PayloadAction<FileParsePayload>) {