5102 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Chi Kei Chan	9959aea598	Merge branch 'NewUI-flat' into merge-master-to-newUI-flat-dec20	2017-12-20 17:38:28 -08:00
Dan	e7e1b7a951	Clone transaction while editing instead of mutating object from state.	2017-12-20 17:37:18 -08:00
Dan	9ced63584b	Add constanst for token transfer function signature.	2017-12-20 17:37:18 -08:00
Dan	5fe3c5aae6	Lint fixes.	2017-12-20 17:37:18 -08:00
Dan	bf4043c59b	Adds updateTransaction to background and used it to update after editing in send-v2.	2017-12-20 17:37:18 -08:00
Dan	1f1fc2c49e	Canceled, edited transactions show edited amount.	2017-12-20 17:37:18 -08:00
Dan	7915e62d65	Merge branch 'master' into NewUI-flat	2017-12-20 19:16:12 -03:30
Dan J Miller	bccbf14b39	[NewUI] Hide UI toggle in mascara (#2772) ... * Hides old-UI on mascara. * Improve code clarity in select-app.js	2017-12-20 10:22:50 -08:00
Dan	109e4e5d96	Hide fiat values on account details screen when eth/token value is 0.	2017-12-20 10:21:36 -08:00
Dan	0feb5b210b	Hides the sidebar after the an account menu actions changes the screen behind the sidebar.	2017-12-20 10:17:29 -08:00
Thomas Huang	d3f5ad874e	Merge pull request #2763 from MetaMask/AddRecentBlocksController ... Add Recent Blocks controller	2017-12-20 13:07:34 -05:00
Dan Finlay	30b45c8a38	Do not log whole txs in recent block controller. ... Only record gas prices, because that has a current use.	2017-12-19 12:23:59 -08:00
Thomas Huang	80b8098a27	Merge pull request #2771 from MetaMask/i2173-UpdateTokenValues ... Allow updating token details	2017-12-19 13:26:40 -05:00
Dan Finlay	8cc7e47369	Bump changelog	2017-12-18 15:57:37 -08:00
Dan Finlay	975f7279c7	Allow updating token details ... Fixes #2173	2017-12-18 15:57:04 -08:00
Dan Finlay	9bb701f063	Add failing test for updating token details	2017-12-18 15:56:50 -08:00
Thomas Huang	84dece92a6	Merge pull request #2751 from MetaMask/i#2720 ... transactions:gas-utils - handle new type of estimateGas error	2017-12-18 13:11:38 -05:00
Dan Finlay	10ff77477c	Add Recent Blocks controller ... Tracks recent blocks, useful for estimating recent successful gas prices.	2017-12-17 16:36:55 -08:00
Thomas Huang	60081b88d6	Merge pull request #2757 from MetaMask/kumavis-patch-2 ... readme - fix "plugin" to "extension"	2017-12-15 18:30:27 -05:00
kumavis	1fb57d8cb8	readme - fix "plugin" to "extension"	2017-12-15 15:06:06 -08:00
frankiebee	0daeaeb4a8	Merge branch 'master' into i#2720	2017-12-15 12:59:43 -08:00
Frankie	6861a218e7	Merge pull request #2755 from MetaMask/tests ... Change `console.log` to `log.info` for configureInfuraProvider	2017-12-15 12:58:10 -08:00
Thomas Huang	fb8744771a	Change console.log for opts in _configureInfuraProvider	2017-12-15 14:43:55 -06:00
Thomas Huang	c6e7bc0a5d	Add exit flag to mocha to exit after tests run	2017-12-15 14:41:58 -06:00
frankiebee	828734b977	transactions:gas-utils - handle new type of estimateGas error	2017-12-15 01:31:48 -08:00
Thomas Huang	115c5e3a43	Merge pull request #2747 from MetaMask/Version-3.13.3 ... Version 3.13.3	2017-12-14 15:33:55 -05:00
Thomas Huang	453bfd34e3	Merge pull request #2706 from danjm/MM-fix-buy-cancel-button ... Fixes the cancel button in the buy screen to take the user home.	2017-12-14 15:06:53 -05:00
Dan Finlay	622a1f7f4a	Version 3.13.3	2017-12-14 11:45:51 -08:00
Thomas Huang	fb5edfe69e	Merge pull request #2662 from williamchong007/master ... fix #1398, prevent injecting xml without xml suffix	2017-12-14 14:34:21 -05:00
Thomas Huang	6843a79fe9	Merge pull request #2733 from MetaMask/i2380-ShowNoBalance ... Show watched tokens with no balance	2017-12-14 13:12:18 -05:00
Frankie	4301e6b2bd	Merge pull request #2744 from MetaMask/infura-block-tracker ... re-add Infura block tracker provider	2017-12-13 19:30:28 -08:00
kumavis	161aa66cb4	Revert "Revert "network - for infura networks use the infura block tracker provider"" ... This reverts commit 5df7dcd758.	2017-12-13 18:57:27 -08:00
kumavis	adb3de5283	Merge branch 'master' of github.com:MetaMask/metamask-plugin into infura-block-tracker	2017-12-13 18:56:27 -08:00
kumavis	222e80dbbe	deps - bump eth-json-rpc-infura	2017-12-13 18:43:12 -08:00
Thomas Huang	b33f516fb7	Merge pull request #2743 from MetaMask/revert-2741-infura-block-tracker ... Revert "network - for infura networks use the infura block tracker provider"	2017-12-13 21:07:57 -05:00
Frankie	5df7dcd758	Revert "network - for infura networks use the infura block tracker provider"	2017-12-13 17:46:56 -08:00
Frankie	0935e22d30	Merge pull request #2741 from MetaMask/infura-block-tracker ... network - for infura networks use the infura block tracker provider	2017-12-13 17:15:26 -08:00
kumavis	3ebeec1818	Merge pull request #2740 from MetaMask/i#2729infura-chill-out ... dont aggressively query account data	2017-12-13 13:57:39 -08:00
kumavis	33e6befdaa	network - for infura networks use the infura block tracker provider	2017-12-13 13:51:36 -08:00
frankiebee	da209a9cfd	dont aggresively query account data	2017-12-13 11:19:18 -08:00
Dan J Miller	339eb7d1a6	Fix edit to field bug. (#2738)	2017-12-12 22:24:41 -08:00
Dan	68ef52e183	Remove inline style.	2017-12-12 12:31:52 -08:00
Dan	a67caee767	Make transaction list and item more flexible.	2017-12-12 12:31:52 -08:00
Dan	70557e0448	Flex account-data-subsection	2017-12-12 12:31:52 -08:00
Dan	71d6403304	Fix old ui width in mobile and extension.	2017-12-12 12:31:52 -08:00
Dan	4e0485938a	Fix height of login screen	2017-12-12 12:31:52 -08:00
Chi Kei Chan	515437a4c9	Fix isMascara and update yarn.lock	2017-12-12 12:22:22 -08:00
Dan	57c91435a7	Substitute isMascara check for explicit check if user is on mobile browser.	2017-12-12 12:14:40 -08:00
Dan	4b654669e6	Hide open in browser button on mobile (but still show on extension); adds a function to detect if viewing with mobile browser.	2017-12-12 12:14:40 -08:00
Dan	05c6789030	Adds button for opening app in main browser window in extension.	2017-12-12 12:14:40 -08:00