diff --git a/src/components/modals/UpdateFirmware/steps/01-step-install-full-firmware.js b/src/components/modals/UpdateFirmware/steps/01-step-install-full-firmware.js index 872121a9..afcf7b0e 100644 --- a/src/components/modals/UpdateFirmware/steps/01-step-install-full-firmware.js +++ b/src/components/modals/UpdateFirmware/steps/01-step-install-full-firmware.js @@ -156,7 +156,9 @@ class StepFullFirmwareInstall extends PureComponent { {t('app:manager.modal.identifier')}
- {firmware && firmware.hash && this.formatHashName(firmware.hash).join('\n')} + {firmware && + firmware.hash && + this.formatHashName(firmware.hash.toUpperCase()).join('\n')}
diff --git a/src/components/modals/UpdateFirmware/steps/03-step-confirmation.js b/src/components/modals/UpdateFirmware/steps/03-step-confirmation.js index 93391429..d47265e8 100644 --- a/src/components/modals/UpdateFirmware/steps/03-step-confirmation.js +++ b/src/components/modals/UpdateFirmware/steps/03-step-confirmation.js @@ -9,7 +9,7 @@ import Text from 'components/base/Text' import Button from 'components/base/Button' import TranslatedError from 'components/TranslatedError' import CheckCircle from 'icons/CheckCircle' -import Cross from 'icons/Cross' +import ExclamationCircleThin from 'icons/ExclamationCircleThin' import type { StepProps } from '../' @@ -31,13 +31,29 @@ function StepConfirmation({ t, error }: StepProps) { if (error) { return ( - - + + + + + + + + - - <TranslatedError error={error} /> - - ) } diff --git a/src/helpers/firmware/installOsuFirmware.js b/src/helpers/firmware/installOsuFirmware.js index 3d1a43c2..603404e5 100644 --- a/src/helpers/firmware/installOsuFirmware.js +++ b/src/helpers/firmware/installOsuFirmware.js @@ -10,10 +10,13 @@ import { createCustomErrorClass } from '../errors' const ManagerNotEnoughSpaceError = createCustomErrorClass('ManagerNotEnoughSpace') const ManagerDeviceLockedError = createCustomErrorClass('ManagerDeviceLocked') +const UserRefusedFirmwareUpdate = createCustomErrorClass('UserRefusedFirmwareUpdate') function remapError(promise) { return promise.catch((e: Error) => { switch (true) { + case e.message.endsWith('6985'): + throw new UserRefusedFirmwareUpdate() case e.message.endsWith('6982'): throw new ManagerDeviceLockedError() case e.message.endsWith('6a84') || e.message.endsWith('6a85'): diff --git a/static/i18n/en/errors.yml b/static/i18n/en/errors.yml index 7c787aae..221876df 100644 --- a/static/i18n/en/errors.yml +++ b/static/i18n/en/errors.yml @@ -89,6 +89,9 @@ TransportError: TransportStatusError: title: 'Something went wrong. Please replug your device.' description: '{{message}}' +UserRefusedFirmwareUpdate: + title: Firmware update refused on device + description: Please retry or contact Ledger Support UserRefusedOnDevice: title: Transaction refused on device description: Please retry or contact Ledger Support in case of doubt.