Skip to content

Commit

Permalink
Merge pull request #144 from NordicSemiconductor/feat/update-shared
Browse files Browse the repository at this point in the history
feat: update shared
  • Loading branch information
boundlesscalm authored Feb 23, 2024
2 parents c59c934 + 9b39318 commit 1fc8412
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 21 deletions.
12 changes: 6 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"prepare": "husky install"
},
"devDependencies": {
"@nordicsemiconductor/pc-nrfconnect-shared": "^157.0.0",
"@nordicsemiconductor/pc-nrfconnect-shared": "^158.0.0",
"@testing-library/user-event": "^13.1.9",
"chart.js": "^4.0.1",
"chartjs-plugin-datalabels": "2.2.0",
Expand Down
33 changes: 19 additions & 14 deletions src/WarningView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,25 @@ const WarningView = () => {
{communicationError}
</div>
</Alert>
{device && readbackProtection === 'protected' && (
<Alert variant="warning" label="">
<div className="d-flex align-items-center readback-protection-warning flex-wrap">
Unable to verify compatible firmware because the
selected device has readback protection enabled.
<button
onClick={() => dispatch(recoverHex(device))}
type="button"
>
Program compatible firmware
</button>
</div>
</Alert>
)}
{device &&
readbackProtection !==
'NRFDL_PROTECTION_STATUS_NONE' && (
<Alert variant="warning" label="">
<div className="d-flex align-items-center readback-protection-warning flex-wrap">
Unable to verify compatible firmware because
the selected device has readback protection
enabled.
<button
onClick={() =>
dispatch(recoverHex(device))
}
type="button"
>
Program compatible firmware
</button>
</div>
</Alert>
)}
</>
)}
</>
Expand Down

0 comments on commit 1fc8412

Please sign in to comment.