diff --git a/src/renderer/modals/UpdateFirmwareModal/index.js b/src/renderer/modals/UpdateFirmwareModal/index.js
index 29a0866a3f..8def83ba5c 100644
--- a/src/renderer/modals/UpdateFirmwareModal/index.js
+++ b/src/renderer/modals/UpdateFirmwareModal/index.js
@@ -5,6 +5,7 @@ import type { TFunction } from "react-i18next";
 import { log } from "@ledgerhq/logs";
 import type { DeviceModelId } from "@ledgerhq/devices";
 import type { DeviceInfo, FirmwareUpdateContext } from "@ledgerhq/live-common/lib/types/manager";
+import type { Device } from "~/renderer/reducers/devices";
 import logger from "~/logger";
 import Modal from "~/renderer/components/Modal";
 import Stepper from "~/renderer/components/Stepper";
@@ -23,6 +24,7 @@ export type StepProps = {
   onCloseModal: (proceedToAppReinstall?: boolean) => void,
   error: ?Error,
   setError: Error => void,
+  device: Device,
   deviceModelId: DeviceModelId,
   deviceInfo: DeviceInfo,
   t: TFunction,
@@ -77,7 +79,6 @@ const UpdateModal = ({
         id: "idCheck",
         label: t("manager.modal.identifier"),
         component: StepFullFirmwareInstall,
-        footer: null,
         onBack: null,
         hideFooter: true,
       };
@@ -95,7 +96,6 @@ const UpdateModal = ({
         id: "updateMCU",
         label: t("manager.modal.steps.updateMCU"),
         component: StepFlashMcu,
-        footer: null,
         onBack: null,
         hideFooter: true,
       };
@@ -168,6 +168,7 @@ const UpdateModal = ({
       preventBackdropClick={!["finish", "resetDevice"].includes(stepId) && !error}
       render={() => (
         <Stepper
+          {...additionalProps}
           key={nonce}
           onStepChange={handleStepChange}
           title={t("manager.firmware.update")}
@@ -175,7 +176,6 @@ const UpdateModal = ({
           steps={steps}
           errorSteps={errorSteps}
           deviceModelId={deviceModelId}
-          {...additionalProps}
           onClose={() => onClose()}
         >
           <HookMountUnmount onMountUnmount={setFirmwareUpdateOpened} />
diff --git a/src/renderer/modals/UpdateFirmwareModal/steps/01-step-install-full-firmware.js b/src/renderer/modals/UpdateFirmwareModal/steps/01-step-install-full-firmware.js
index c0d431f6bc..cda373a023 100644
--- a/src/renderer/modals/UpdateFirmwareModal/steps/01-step-install-full-firmware.js
+++ b/src/renderer/modals/UpdateFirmwareModal/steps/01-step-install-full-firmware.js
@@ -7,7 +7,6 @@ import { useSelector } from "react-redux";
 import type { DeviceModelId } from "@ledgerhq/devices";
 import manager from "@ledgerhq/live-common/lib/manager";
 import type { FirmwareUpdateContext, DeviceInfo } from "@ledgerhq/live-common/lib/types/manager";
-import type { Device } from "~/renderer/reducers/devices";
 import { command } from "~/renderer/commands";
 import { getCurrentDevice } from "~/renderer/reducers/devices";
 import TrackPage from "~/renderer/analytics/TrackPage";
@@ -107,10 +106,7 @@ const Body = ({
   );
 };
 
-type Props = StepProps & {
-  device: Device,
-  deviceModelId: DeviceModelId,
-};
+type Props = StepProps;
 
 const StepFullFirmwareInstall = ({
   firmware,
diff --git a/src/renderer/screens/exchange/Buy/SelectAccountAndCurrency.js b/src/renderer/screens/exchange/Buy/SelectAccountAndCurrency.js
index 45fe6d1a76..095ba66d8c 100644
--- a/src/renderer/screens/exchange/Buy/SelectAccountAndCurrency.js
+++ b/src/renderer/screens/exchange/Buy/SelectAccountAndCurrency.js
@@ -13,14 +13,18 @@ import SelectCurrency from "~/renderer/components/SelectCurrency";
 import Button from "~/renderer/components/Button";
 import { useSelector, useDispatch } from "react-redux";
 import { accountsSelector } from "~/renderer/reducers/accounts";
-import type { Account } from "@ledgerhq/live-common/lib/types";
+import type {
+  Account,
+  AccountLike,
+  CryptoCurrency,
+  TokenCurrency,
+} from "@ledgerhq/live-common/lib/types";
 import FakeLink from "~/renderer/components/FakeLink";
 import PlusIcon from "~/renderer/icons/Plus";
 import { openModal } from "~/renderer/actions/modals";
 import type { ThemedComponent } from "~/renderer/styles/StyleProvider";
 import { getAccountCurrency, isAccountEmpty } from "@ledgerhq/live-common/lib/account/helpers";
 import { track } from "~/renderer/analytics/segment";
-import type { AccountLike } from "@ledgerhq/live-common/lib/types/account";
 import { useCurrencyAccountSelect } from "~/renderer/components/PerCurrencySelectAccount/state";
 
 const Container: ThemedComponent<{}> = styled.div`