Merge branch 'master' into fonts-refactoring

2024-12-25 00:18:07 +00:00 · 2018-12-13 13:05:55 +01:00 · 2018-12-13 13:05:55 +01:00 · 42a38c5dc5
commit 42a38c5dc5
parent 38810afc07 a6f798ee0a
2 changed files with 1 additions and 1 deletions
--- a/package.json
+++ b/package.json
@ -68,7 +68,6 @@
        "redux-thunk": "^2.2.0",
        "rimraf": "^2.6.2",
        "styled-components": "^4.1.2",
-        "styled-media-query": "^2.0.2",
        "styled-normalize": "^8.0.4",
        "trezor-connect": "6.0.3-beta.4",
        "web3": "1.0.0-beta.35",
--- a/src/actions/ethereum/SendFormActions.js
+++ b/src/actions/ethereum/SendFormActions.js
@ -151,6 +151,7 @@ export const init = (): AsyncAction => async (dispatch: Dispatch, getState: GetS
 */
 export const toggleAdvanced = (): Action => ({
    type: SEND.TOGGLE_ADVANCED,
+    networkType: 'ethereum',
 });

 /*