Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/alerts/actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ export const alertsShowAlert = createAction(
type: 'alerts.action.showAlert',
domain,
specific,
props,
// HACK: using varargs to allow props to be optional, but it is only one arg
props: props.at(0),
}),
);

Expand Down
4 changes: 3 additions & 1 deletion src/alerts/sagas.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ function* handleShowAlert(action: ReturnType<typeof alertsShowAlert>): Generator
try {
const alertAction = yield* take(chan);
// the dismiss actions will have called this already, but other actions don't
toaster.dismiss(key);
if (alertAction !== 'dismiss') {
toaster.dismiss(key);
}

yield* put(alertsDidShowAlert(action.domain, action.specific, alertAction));
} finally {
Expand Down
2 changes: 1 addition & 1 deletion src/firmware/alerts/NoDfuHub.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const NoDfuHub: React.VoidFunctionComponent = () => {
href={pybricksUsbDfuTroubleshootingUrl}
target="_blank"
>
{i18n.translate('noDfuHub.suggestion2')}
{i18n.translate('noDfuHub.troubleshootButton')}
<ExternalLinkIcon />
</AnchorButton>
</>
Expand Down
6 changes: 4 additions & 2 deletions src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,11 @@ const store = configureStore({
// copy of defaults
'meta.arg',
'meta.baseQueryMeta',
// HACK: technically serializable, can be removed after
// https://github.com/microsoft/vscode/pull/151993
// monoco view state has class-based object but is technically serializable
'viewState.viewState.firstPosition',
// contain ArrayBuffer or DataView
'data',
'firmwareZip',
],
},
})
Expand Down