Browse Source

Fix important missing errors

master
Gaëtan Renaudeau 7 years ago
parent
commit
3a9949a295
  1. 4
      src/components/modals/UpdateFirmware/steps/01-step-install-full-firmware.js
  2. 30
      src/components/modals/UpdateFirmware/steps/03-step-confirmation.js
  3. 3
      src/helpers/firmware/installOsuFirmware.js
  4. 3
      static/i18n/en/errors.yml

4
src/components/modals/UpdateFirmware/steps/01-step-install-full-firmware.js

@ -156,7 +156,9 @@ class StepFullFirmwareInstall extends PureComponent<Props, State> {
{t('app:manager.modal.identifier')} {t('app:manager.modal.identifier')}
</Text> </Text>
<Address> <Address>
{firmware && firmware.hash && this.formatHashName(firmware.hash).join('\n')} {firmware &&
firmware.hash &&
this.formatHashName(firmware.hash.toUpperCase()).join('\n')}
</Address> </Address>
</Box> </Box>
<Box mt={5}> <Box mt={5}>

30
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 Button from 'components/base/Button'
import TranslatedError from 'components/TranslatedError' import TranslatedError from 'components/TranslatedError'
import CheckCircle from 'icons/CheckCircle' import CheckCircle from 'icons/CheckCircle'
import Cross from 'icons/Cross' import ExclamationCircleThin from 'icons/ExclamationCircleThin'
import type { StepProps } from '../' import type { StepProps } from '../'
@ -31,13 +31,29 @@ function StepConfirmation({ t, error }: StepProps) {
if (error) { if (error) {
return ( return (
<Container> <Container>
<Box mx={7} color="alertRed" my={4}> <Box color="alertRed">
<Cross size={44} /> <ExclamationCircleThin size={44} />
</Box>
<Box
color="dark"
mt={4}
fontSize={6}
ff="Museo Sans|Regular"
textAlign="center"
style={{ maxWidth: 350 }}
>
<TranslatedError error={error} field="title" />
</Box>
<Box
color="graphite"
mt={4}
fontSize={6}
ff="Open Sans"
textAlign="center"
style={{ maxWidth: 350 }}
>
<TranslatedError error={error} field="description" />
</Box> </Box>
<Title>
<TranslatedError error={error} />
</Title>
<Box mx={7} />
</Container> </Container>
) )
} }

3
src/helpers/firmware/installOsuFirmware.js

@ -10,10 +10,13 @@ import { createCustomErrorClass } from '../errors'
const ManagerNotEnoughSpaceError = createCustomErrorClass('ManagerNotEnoughSpace') const ManagerNotEnoughSpaceError = createCustomErrorClass('ManagerNotEnoughSpace')
const ManagerDeviceLockedError = createCustomErrorClass('ManagerDeviceLocked') const ManagerDeviceLockedError = createCustomErrorClass('ManagerDeviceLocked')
const UserRefusedFirmwareUpdate = createCustomErrorClass('UserRefusedFirmwareUpdate')
function remapError(promise) { function remapError(promise) {
return promise.catch((e: Error) => { return promise.catch((e: Error) => {
switch (true) { switch (true) {
case e.message.endsWith('6985'):
throw new UserRefusedFirmwareUpdate()
case e.message.endsWith('6982'): case e.message.endsWith('6982'):
throw new ManagerDeviceLockedError() throw new ManagerDeviceLockedError()
case e.message.endsWith('6a84') || e.message.endsWith('6a85'): case e.message.endsWith('6a84') || e.message.endsWith('6a85'):

3
static/i18n/en/errors.yml

@ -89,6 +89,9 @@ TransportError:
TransportStatusError: TransportStatusError:
title: 'Something went wrong. Please replug your device.' title: 'Something went wrong. Please replug your device.'
description: '{{message}}' description: '{{message}}'
UserRefusedFirmwareUpdate:
title: Firmware update refused on device
description: Please retry or contact Ledger Support
UserRefusedOnDevice: UserRefusedOnDevice:
title: Transaction refused on device title: Transaction refused on device
description: Please retry or contact Ledger Support in case of doubt. description: Please retry or contact Ledger Support in case of doubt.

Loading…
Cancel
Save