fix: Export components with formStyles correctly

The Oscilloscope ChannelParameters and the Waveform SineWaveParameters have
both a global style, and a local style they need to be exported with. The use
of the withStyles function was previously incorrect, and as a result, neither
style was getting applied.

Author: cynthi8

src/screen/Oscilloscope/components/ChannelParameters.js

@@ -16,6 +16,7 @@ import { options } from './settingOptions';
 import formStyles from '../../../utils/formStyles';
 
 const styles = theme => ({
+  ...formStyles(theme),
   ch1ColorSwitchBase: {
     color: theme.palette.ch1Color,
     '&$colorChecked': {
@@ -289,6 +290,4 @@ class ChannelParameters extends Component {
   }
 }
 
-export default withTheme(
-  withStyles({ ...styles, ...formStyles })(ChannelParameters),
-);
+export default withTheme(withStyles(styles)(ChannelParameters));

src/screen/WaveGenerator/components/SineWaveParameters.js

@@ -22,6 +22,7 @@ import { options } from './settingOptions';
 import formStyles from '../../../utils/formStyles';
 
 const styles = theme => ({
+  ...formStyles(theme),
   s1colorSwitchBase: {
     color: theme.palette.s1Color,
     '&$colorChecked': {
@@ -203,6 +204,4 @@ class SineWaveParameters extends Component {
   }
 }
 
-export default withTheme(
-  withStyles({ ...styles, ...formStyles })(SineWaveParameters),
-);
+export default withTheme(withStyles(styles)(ChannelParameters));