2477 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Kevin Serrano	e66035254f	More conflict resolution.	2017-03-01 10:04:25 -08:00
Kevin Serrano	0a3849ec84	Fix merge conflicts.	2017-03-01 10:01:21 -08:00
Kevin Serrano	f162a11585	Merge pull request #1154 from MetaMask/i765-gaslimits ... Add ability to customize gas and gasPrice on tx confirmation screen	2017-02-28 16:54:10 -08:00
Kevin Serrano	a600ccd4f8	Add reset button to reset gas fields.	2017-02-28 16:36:05 -08:00
Dan Finlay	af66e2b9ac	Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i765-gaslimits	2017-02-28 15:46:47 -08:00
Dan Finlay	865764dff5	Bump changelog	2017-02-28 15:46:26 -08:00
Dan Finlay	ddc136a7c2	Add a couple more debug logs	2017-02-28 15:41:20 -08:00
Kevin Serrano	9bffe2d11a	Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i765-gaslimits	2017-02-28 15:23:03 -08:00
Kevin Serrano	576cc9eb75	Gas and Gaslimit revert to default if set to 0	2017-02-28 15:21:48 -08:00
Dan Finlay	513a9d72ef	Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i765-gaslimits	2017-02-28 14:45:44 -08:00
Dan Finlay	f908aaafbc	Use correct action to update and submit tx	2017-02-28 14:45:21 -08:00
Kevin Serrano	9fb4b4a77f	lints	2017-02-28 14:21:44 -08:00
Kevin Serrano	d21915c605	Remove advanced options for now.	2017-02-28 14:19:32 -08:00
Dan Finlay	39c824f2f3	Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i765-gaslimits	2017-02-28 14:16:27 -08:00
Dan Finlay	e07e4b7bc7	Linted	2017-02-28 14:13:58 -08:00
Kevin Serrano	486583e203	lint	2017-02-28 14:12:50 -08:00
Dan Finlay	157dd994f0	Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i765-gaslimits	2017-02-28 14:09:00 -08:00
Dan Finlay	da88481560	Remove gasMultiplier txMeta param ... This was used by the custom gas slider on the `send` screen, and it was used to modify the gas value before sending it out, breaking our new custom gas field logic. Removed it and the logic that referred to this now-outdated parameter.	2017-02-28 14:08:00 -08:00
Kevin Serrano	acfb6ff0f8	Hide gas options behind an advanced options checkbox.	2017-02-28 14:07:19 -08:00
Kevin Serrano	e925caf3c3	Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i765-gaslimits	2017-02-28 13:53:49 -08:00
Dan Finlay	5a74c0fcad	Fix bug that showed conf-tx screen on boot at wrong times	2017-02-28 12:12:18 -08:00
Kevin Serrano	6f2d14fde4	Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i765-gaslimits	2017-02-28 12:06:46 -08:00
Dan Finlay	2e16e1eb94	Fixed bug that made send screen sometimes transition to account detail	2017-02-28 12:00:07 -08:00
Kevin Serrano	61a19a028b	Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i765-gaslimits	2017-02-28 11:37:05 -08:00
Dan Finlay	45138af6c6	Fix infinite loop bug	2017-02-28 11:36:01 -08:00
Kevin Serrano	666044d417	Add margins to align.	2017-02-28 10:23:47 -08:00
Dan Finlay	04df5c1f2d	Fix reference	2017-02-28 10:06:59 -08:00
Dan Finlay	0e817c9e7f	Reorder rows for better table logic	2017-02-27 18:36:43 -08:00
Dan Finlay	3ddfdfff98	Emit updated tx values on accept click	2017-02-27 18:33:33 -08:00
Dan Finlay	2e80e8f722	Remove unused function	2017-02-27 18:26:18 -08:00
Dan Finlay	d844769c92	Add action for updating and approving a tx in one action	2017-02-27 18:26:04 -08:00
Dan Finlay	1eb4a5d62c	Add background method for updating and approving a tx in one call	2017-02-27 18:25:46 -08:00
Dan Finlay	4370ca0cef	Got gas live re-estimating	2017-02-27 18:19:05 -08:00
Kevin Serrano	2b0e939abd	Align input fields for gas.	2017-02-27 16:55:58 -08:00
Kevin Serrano	98e80e6740	Fix merge conflicts.	2017-02-27 16:35:25 -08:00
Kevin Serrano	5d1a4db5e5	Further styling to get hex component working. Fix some typos.	2017-02-27 16:33:58 -08:00
Dan Finlay	c4e9354575	Linted	2017-02-27 16:09:46 -08:00
Dan Finlay	57fec36a7d	Add non-working gas recalculating logic to tx-details view	2017-02-27 16:06:28 -08:00
Kevin Serrano	9e6e3f55b7	Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i765-gaslimits	2017-02-27 13:54:07 -08:00
Kevin Serrano	a77a5f0ab3	Move input boxes into table and into details component.	2017-02-27 13:53:43 -08:00
Kevin Serrano	c46f3d59de	Fix state to render gasPrice for ui dev.	2017-02-27 13:53:08 -08:00
Dan Finlay	462c7ae213	Merge branch 'master' into i765-gaslimits	2017-02-27 12:59:19 -08:00
Dan Finlay	6fb33853f2	Fix test reference	2017-02-27 10:53:36 -08:00
Dan Finlay	b5d03cd524	add controllers to root scripts folder	2017-02-27 10:40:37 -08:00
Dan Finlay	5edb3db969	Merge branch 'master' into i1144-moarrpc	2017-02-27 10:36:48 -08:00
Dan Finlay	ab01fef1c0	Merge pull request #1149 from MetaMask/i1114-AddPersonalSign ... Add personal_sign	2017-02-27 10:28:31 -08:00
Dan Finlay	ca5cf06ae9	Concatenate custom RPC labels that are too long	2017-02-27 10:25:10 -08:00
Dan Finlay	c831043a51	Remove claim for ecRecover support	2017-02-27 10:16:16 -08:00
Dan Finlay	7cbb2fc689	Reduce provider-engine requirement	2017-02-24 17:38:11 -08:00
Dan Finlay	8c66260bdb	Removed redundant personal_recover logic	2017-02-24 17:07:54 -08:00