+6 −0

messages.json

app/_locales/en/messages.json

+5 −0

enums.js

app/scripts/controllers/network/enums.js

+20 −9

network.js

app/scripts/controllers/network/network.js

+15 −0

preferences.js

app/scripts/controllers/preferences.js

+26 −0

metamask-controller.js

app/scripts/metamask-controller.js

+1 −0

navigate-txs.json

development/states/navigate-txs.json

+1 −0

2-state.json

test/data/2-state.json

+14 −0

metamask-controller-test.js

test/unit/app/controllers/metamask-controller-test.js

+1 −0

035-test.js

test/unit/migrations/035-test.js

+42 −0

actions.spec.js

test/unit/ui/app/actions.spec.js

+12 −2

metamask.spec.js

test/unit/ui/app/reducers/metamask.spec.js

+10 −0

metamask.js

ui/app/ducks/metamask/metamask.js

+29 −0

advanced-tab.component.js

...ages/settings/advanced-tab/advanced-tab.component.js

+8 −0

advanced-tab.container.js

...ages/settings/advanced-tab/advanced-tab.container.js

+1 −1

advanced-tab-component.test.js

...gs/advanced-tab/tests/advanced-tab-component.test.js

+25 −0

actions.js

ui/app/store/actions.js