Browse Source
Merge pull request #897 from valpinkman/fix/mcu-flashing
exit from mcu flashing state and add wording to loading state
master
Valentin D. Pinkman
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
8 additions and
1 deletions
-
src/components/modals/UpdateFirmware/Installing.js
-
src/components/modals/UpdateFirmware/steps/02-step-flash-mcu.js
|
|
@ -18,11 +18,16 @@ function Installing({ t }: Props) { |
|
|
|
<Box mx={7} align="center"> |
|
|
|
<Spinner color="fog" size={44} /> |
|
|
|
</Box> |
|
|
|
<Box mx={7} mt={4} mb={7}> |
|
|
|
<Box mx={7} mt={4} mb={2}> |
|
|
|
<Text ff="Museo Sans|Regular" align="center" color="dark" fontSize={6}> |
|
|
|
{t('app:manager.modal.installing')} |
|
|
|
</Text> |
|
|
|
</Box> |
|
|
|
<Box mx={7} mt={4} mb={7}> |
|
|
|
<Text ff="Open Sans|Regular" align="center" color="graphite" fontSize={4}> |
|
|
|
{t('app:manager.modal.mcuPin')} |
|
|
|
</Text> |
|
|
|
</Box> |
|
|
|
</Fragment> |
|
|
|
) |
|
|
|
} |
|
|
|
|
|
@ -127,6 +127,8 @@ class StepFlashMcu extends PureComponent<Props, State> { |
|
|
|
} else if (deviceInfo.isOSU) { |
|
|
|
await installFinalFirmware(device) |
|
|
|
transitionTo('finish') |
|
|
|
} else { |
|
|
|
transitionTo('finish') |
|
|
|
} |
|
|
|
} catch (error) { |
|
|
|
setError(error) |
|
|
|