Frankie df3169d1c7 I#5956 fix2 dont overwrite existing rpc settings (#6044) ... * mm-controller - dont overwrite existing rpc settings * ui-networkDropdown - dont pass old network as chainId * add methods preferencesController.updateRpc and metamaskController.updateAndSetCustomRpc * use updateAndSetCustomRpc in settings to allow rpcs to be updated * use new rpc as nickname if no nick name has been supplied * fix update rpc method		2019-01-29 08:13:51 -10:00
..
data	Add support for RPC endpoints with custom chain IDs (#5134)	2018-10-26 10:26:43 +02:00
e2e	Fix bugs in e2e tests related to gas customization inputs.	2019-01-24 19:31:30 -03:30
integration	Add integration test for ordering of shapeshift txs in history list.	2019-01-24 19:31:30 -03:30
lib	Tx controller now uses safe event emitter (#5769)	2018-11-16 10:34:08 -08:00
screens	fix warning for new-ui screen tests	2018-07-02 20:13:04 -04:00
stub	Merge branch 'develop' into testing	2018-05-21 14:57:57 -07:00
unit	I#5956 fix2 dont overwrite existing rpc settings (#6044)	2019-01-29 08:13:51 -10:00
base.conf.js	eslint --fix .	2018-07-02 18:49:33 -04:00
flat.conf.js	eslint --fix .	2018-07-02 18:49:33 -04:00
helper.js	fix merge conflicts	2018-08-17 12:56:07 -04:00
mascara.conf.js	fix test/mascara.conf.js warnings	2018-07-02 19:53:45 -04:00
setup.js	Adds not yet functional gas price chart.	2018-12-04 00:06:05 -03:30