Skip to content

Commit

Permalink
fix: Reducer compatibility (#1454)
Browse files Browse the repository at this point in the history
  • Loading branch information
Gregor Herdmann authored May 9, 2018
1 parent 917afa9 commit a3f6cec
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion electron/js/preload.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
const {ipcRenderer, webFrame} = require('electron');
const environment = require('./environment');
const locale = require('../locale/locale');
const EVENT_TYPE = require('lib/eventType');
const EVENT_TYPE = require('./lib/eventType');

webFrame.setVisualZoomLevelLimits(1, 1);
webFrame.setLayoutZoomLevelLimits(1, 1);
Expand Down
2 changes: 1 addition & 1 deletion electron/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions electron/renderer/src/reducers/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
*/

import {combineReducers} from 'redux';
import accountsReducer from './accountReducer';
import accountReducer from './accountReducer';
import contextMenuReducer from './contextMenuReducer';

const store = combineReducers({
accountsReducer,
contextMenuReducer,
accounts: accountReducer,
contextMenuState: contextMenuReducer,
});

export default store;
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit a3f6cec

Please sign in to comment.