Merge pull request #1001 from pybricks/dlech

small fixes
This commit is contained in:
David Lechner
2022-07-22 16:31:06 -05:00
committed by GitHub
4 changed files with 10 additions and 5 deletions
+2 -1
View File
@@ -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),
}),
);
+3 -1
View File
@@ -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 {
+1 -1
View File
@@ -26,7 +26,7 @@ const NoDfuHub: React.VoidFunctionComponent = () => {
href={pybricksUsbDfuTroubleshootingUrl}
target="_blank"
>
{i18n.translate('noDfuHub.suggestion2')}
{i18n.translate('noDfuHub.troubleshootButton')}
<ExternalLinkIcon />
</AnchorButton>
</>
+4 -2
View File
@@ -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',
],
},
})