File tree Expand file tree Collapse file tree 4 files changed +10
-5
lines changed Expand file tree Collapse file tree 4 files changed +10
-5
lines changed Original file line number Diff line number Diff line change @@ -22,7 +22,8 @@ export const alertsShowAlert = createAction(
2222 type : 'alerts.action.showAlert' ,
2323 domain,
2424 specific,
25- props,
25+ // HACK: using varargs to allow props to be optional, but it is only one arg
26+ props : props . at ( 0 ) ,
2627 } ) ,
2728) ;
2829
Original file line number Diff line number Diff line change @@ -35,7 +35,9 @@ function* handleShowAlert(action: ReturnType<typeof alertsShowAlert>): Generator
3535 try {
3636 const alertAction = yield * take ( chan ) ;
3737 // the dismiss actions will have called this already, but other actions don't
38- toaster . dismiss ( key ) ;
38+ if ( alertAction !== 'dismiss' ) {
39+ toaster . dismiss ( key ) ;
40+ }
3941
4042 yield * put ( alertsDidShowAlert ( action . domain , action . specific , alertAction ) ) ;
4143 } finally {
Original file line number Diff line number Diff line change @@ -26,7 +26,7 @@ const NoDfuHub: React.VoidFunctionComponent = () => {
2626 href = { pybricksUsbDfuTroubleshootingUrl }
2727 target = "_blank"
2828 >
29- { i18n . translate ( 'noDfuHub.suggestion2 ' ) }
29+ { i18n . translate ( 'noDfuHub.troubleshootButton ' ) }
3030 < ExternalLinkIcon />
3131 </ AnchorButton >
3232 </ >
Original file line number Diff line number Diff line change @@ -47,9 +47,11 @@ const store = configureStore({
4747 // copy of defaults
4848 'meta.arg' ,
4949 'meta.baseQueryMeta' ,
50- // HACK: technically serializable, can be removed after
51- // https://github.com/microsoft/vscode/pull/151993
50+ // monoco view state has class-based object but is technically serializable
5251 'viewState.viewState.firstPosition' ,
52+ // contain ArrayBuffer or DataView
53+ 'data' ,
54+ 'firmwareZip' ,
5355 ] ,
5456 } ,
5557 } )
You can’t perform that action at this time.
0 commit comments