-
-
Notifications
You must be signed in to change notification settings - Fork 317
feat(suite): display the progress bar when the trezor is done updatin… #22397
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: develop
Are you sure you want to change the base?
Conversation
if (uiEvent?.type === 'ui-firmware_reconnect') { | ||
const isDone = progress === 100; | ||
|
||
if (uiEvent?.type === 'ui-firmware_reconnect' && !isDone) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I kept this condition, coz I am not sure why is it here. But I keep rendering the progress when the installation is done
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll try to remove the condition completely
ba6cf38
to
b5a919b
Compare
b5a919b
to
eef217c
Compare
✅ Previously successful run of [Test] PR Suite Web e2e tests workflow has been found. |
✅ Previously successful run of [Test] PR Suite Desktop e2e tests workflow has been found. |
eef217c
to
93b948b
Compare
return { | ||
operation: 'restarting', | ||
// NOTE: when restarting to the normal mode, assume that the installation is finished | ||
progress: restartingToNormalModeAfterInstallation ? 100 : 0, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Altough, this works fine on Desktop, I will check the mobile if it doesn't break anything. I could put ti to mine userDesktopFirmwareIInstallation
82e7b04
to
3394a61
Compare
firmwareUpdate: desktopFirmwareUpdate, | ||
toggleLowBatteryModal: useCallback(() => setShowLowBatteryModal(prev => !prev), []), | ||
showLowBatteryModal, | ||
reconnectEvent, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
so this is only for desktop, it is not the pretiest, but prevetns problem with mobile guys
return ( | ||
<Modal.Backdrop onClick={isCancelable ? handleClose : undefined}> | ||
{showConfirmationPill && ( | ||
<ConfirmOnDevicePill |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am removing the pill here @jvaclavik which I hope it is correct. The Device sercuirty check is within <OnboardinCard>
and that has got its own pill
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't understand this comment. This has nothing to do with onboarding, since this only affects the firmware installation in settings, not the one in onboarding, no?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, but @jvaclavik mentioned it on Slack taht this pill is used in the onboarding. So I was ensuring that this usage of the pill is only within the update context.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Still don't get it. This pill has to be used anywhere there's device action required, it has nothing to do with onboarding.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It has to do with onboardin that it is also used in onboardin eg. in the security check. But Komar requested this pill to be removed from the FW update steps because these steps are handled with modals.
So I did that. ANd here I am making sure that the pill is only removed from the FW update, and not from eg. security check in onboarding.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@vojtatranta could you please add video of passing through the firmware install?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"But Komar requested this pill to be removed from the FW update steps because these steps are handled with modals." This doesn't make sense. The pill has to remain, it is present in all modals requiring device action.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It does make sense in the Firmware update modal, because there the actions required on the device are replaced with the modals.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I get it now, sorry!
ba64db7
to
e112215
Compare
completed: 'TR_FIRMWARE_STATUS_INSTALLATION_COMPLETED', | ||
}; | ||
|
||
if (uiEvent?.type === 'ui-firmware_reconnect') { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
FYI: I am looking if this won't break anything
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looks fine @komret objections, ideas?
|
||
const restartingToBootloader = reconnectEvent && reconnectEvent.target === 'bootloader'; | ||
|
||
const updateOperation: FirmwareOperationStatus = |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
no the prettiest, but workign safely (won't affect mobile)
e112215
to
7ebc047
Compare
491cb4c
to
93e114b
Compare
I tested also when connected via USB and it looks good. |
}, | ||
TR_RESTARTING_TREZOR_ENTER_PIN_IF_NEEDED: { | ||
defaultMessage: 'Restarting Trezor. Enter PIN if prompted.', | ||
TR_RESTARTING_TREZOR_ENTER_PIN_WHEN_NEEDED: { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
well, the text means somethign different now. I think overriding the original makes sense right now. There is also "IF" in the text.
return ( | ||
<Modal.Backdrop onClick={isCancelable ? handleClose : undefined}> | ||
{showConfirmationPill && ( | ||
<ConfirmOnDevicePill |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No idea, I went through onboarding and it looked OK, but not sure if there is also this screen 🤷♂️
@jvaclavik in which scenario trezore disapears? I tried it now and it didn't disapear? |
93e114b
to
b155c53
Compare
I don't know, I saw it in your screenshot above 😅 |
ah, cool, I am removing that, so it is on the pill in the modal, cool. |
…g and waiting for restart
…100 before instalation starts
b155c53
to
59d68c9
Compare
…g and waiting for restart
Description
Related Issue
Resolve #22256
Resolve #22257
Screenshots:
🔍🖥️ Suite web test results: View in Currents
🔍🖥️ Suite desktop test results: View in Currents
🔍🖥️ Suite native android test results: View in Currents