Fix setting modal for pop sound

AlduinApp · Oct 9, 2017 · 207144d · 207144d
1 parent ee3ac00
commit 207144d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/script/components/modals/settings-modal.jsx b/src/script/components/modals/settings-modal.jsx
@@ -15,6 +15,7 @@ class SettingsModal extends React.Component {
   }
 
   render() {
+    console.log(this.props)
     return (
       <div className={'modal-background' + ' ' + (this.props.openModal === 'settings' ? '' : 'hidden')}>
         <div className='modal'>
@@ -45,7 +46,7 @@ class SettingsModal extends React.Component {
               <div className='modal-label'>Fetch sound</div>
               <div className='modal-input'>
                 <div className='modal-checkbox'>
-                  <input type='checkbox' id='pop-sound' ref={ref => this._inputs.pop = ref} defaultValue={this.props.popOnFetch} />
+                  <input type='checkbox' id='pop-sound' ref={ref => this._inputs.pop = ref} defaultChecked={this.props.popOnFetch} />
                   <label htmlFor='pop-sound'><span className='checkbox-border'><span /></span></label>
                 </div>
               </div>

diff --git a/src/script/reducers/settings-reducer.js b/src/script/reducers/settings-reducer.js
@@ -7,7 +7,7 @@ const defaultState = {
 
 export default function (state = defaultState, action) {
   switch (action.type) {
-    case 'SET_SETTINGS': return action.payload
+    case 'SET_SETTINGS': return {...state, ...action.payload}
     default: return state
   }
 }