4570 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dan	aa60944e30	Remove default to confirm screen on login.	2017-09-07 10:25:56 -07:00
kumavis	440a42bbc3	inpage - add idRemapMiddleware	2017-09-07 10:08:07 -07:00
Chi Kei Chan	b670c8074e	Fix font sizes on Send Token	2017-09-07 04:26:29 -07:00
Chi Kei Chan	8b919758e5	Send Token screen partial UI	2017-09-07 04:24:03 -07:00
Chi Kei Chan	983fa2a117	Add Contract Tx List Item; Update Token Tx on select	2017-09-07 03:14:53 -07:00
frankiebee	50075c6df5	fix messy merge	2017-09-07 00:55:21 -07:00
Chi Kei Chan	14b2f3e391	Show token balance and identicon	2017-09-06 23:03:23 -07:00
frankiebee	00fca4f1f2	remove unused variable	2017-09-06 14:38:39 -07:00
Dan Finlay	74f7fc4613	Check balances in parallel	2017-09-06 14:37:46 -07:00
Dan Finlay	f9a052deed	Add first passing balance calc test	2017-09-06 14:36:15 -07:00
Dan Finlay	714df393b4	Add test template	2017-09-06 14:27:21 -07:00
Kevin Serrano	7ff5fd8691	Changelog bump	2017-09-06 14:04:17 -07:00
frankiebee	a73aecc796	fix merge and errors disaperaing on update	2017-09-06 14:01:07 -07:00
Kevin Serrano	0217984a40	Merge branch 'master' into readd-loose	2017-09-06 13:59:52 -07:00
Kevin Serrano	b5f48730cd	Properly update keyring state on new account addition.	2017-09-06 13:59:41 -07:00
kumavis	351db952c5	Merge pull request #2033 from MetaMask/Version-3.9.12 ... Version 3.9.12	2017-09-06 13:54:47 -07:00
frankiebee	6c83ba762e	Merge branch 'master' into transactionControllerRefractorPt3	2017-09-06 13:45:03 -07:00
Dan Finlay	5e934994d1	Version 3.9.12	2017-09-06 13:33:30 -07:00
kumavis	47340ca550	Merge pull request #2017 from MetaMask/DevEnviornment ... Update redux middleware imports	2017-09-06 13:18:14 -07:00
tmashuang	36a44ef61f	Update mock-store dependency	2017-09-06 11:04:17 -07:00
Dan Finlay	88556dce74	Merge pull request #2023 from MetaMask/web3-1.0-fix ... inpage - bug fix	2017-09-06 10:33:43 -07:00
Chi Kei Chan	f1fb9e10a0	Adding Token transaction detail screen	2017-09-06 03:17:49 -07:00
Chi Kei Chan	690ddf5ed7	Fix token list	2017-09-06 00:36:52 -07:00
Chi Kei Chan	bffdde2082	Fix html height	2017-09-06 00:36:44 -07:00
Chi Kei Chan	06b2a04a42	Implement tokens list UI	2017-09-06 00:36:31 -07:00
frankiebee	15c12ca4bb	add better comments	2017-09-05 21:50:36 -07:00
frankiebee	00bd5b143f	rename tx-utils.js -> tx-gas-utils.js	2017-09-05 20:33:50 -07:00
frankiebee	4c554f32ec	remove #buildEthTxFromParams	2017-09-05 20:13:43 -07:00
kumavis	ea7e46ed38	inpage - bug fix ... prevents mutation of original message object which causes problems with web3 1.0	2017-09-05 16:46:21 -07:00
Kevin Serrano	3e2bd19881	Merge branch 'master' into readd-loose	2017-09-05 15:48:15 -07:00
Dan	562d2fadae	Use .entries() instead of .keys(), and use more destructuring, for simpler code.	2017-09-05 13:00:50 -07:00
Dan	78f39bcce6	Send tx working; user is taken to confirm page with correct transaction information.	2017-09-05 13:00:50 -07:00
Kevin Serrano	32c799a135	Merge pull request #2019 from MetaMask/i2016-ImproveSignDeprecationWarning ... Make eth_sign deprecation warning more useful	2017-09-05 11:49:48 -07:00
Kevin Serrano	ba2d1f8d3e	Merge pull request #2018 from MetaMask/i2014-BetterWeb3DeprecationWarning ... Make web3 deprecation notice more useful	2017-09-05 11:49:18 -07:00
Dan Finlay	90272e252f	Make eth_sign deprecation warning more useful ... Link to descriptive article that demonstrates the new preferred method.	2017-09-05 11:44:26 -07:00
Dan Finlay	70a61f8712	Make web3 deprecation notice more useful ... Linking to a descriptive & precriptive article on a path forward.	2017-09-05 11:35:33 -07:00
Kevin Serrano	e647337a8a	Resolve merge conflict from master	2017-09-05 09:03:44 -07:00
Kevin Serrano	162aedb30b	Merge branch 'master' into new-currency-test	2017-09-05 09:01:05 -07:00
tmashuang	1172c6a94b	Update development store	2017-09-05 08:58:01 -07:00
Dan	6ef483be4a	Remove wallet-view scrollbars.	2017-09-04 18:46:14 -07:00
Dan	7d6ad48f15	Touch up transaction list item styles, remove main-content scroll bars, align buttons with main-content..	2017-09-04 18:46:14 -07:00
Dan	57b3cdf948	Fix styling of buy and send buttons on main screen.	2017-09-04 18:46:14 -07:00
Dan	3cb51e32c9	Capitalizations via text-transform for main screen transactions.	2017-09-04 18:46:14 -07:00
Dan	5d8bf6c86a	Adjust left margin in main container.	2017-09-04 18:46:14 -07:00
Chi Kei Chan	75c3009f83	Fix header style; Address comments	2017-09-04 15:57:43 -07:00
Chi Kei Chan	9213789c44	Fix merge conflict	2017-09-04 15:57:43 -07:00
Jacky Chan	b1fc290bed	Fix menu style	2017-09-04 15:57:43 -07:00
kumavis	2885a95471	Merge pull request #2008 from MetaMask/mascara-fix ... mascara - fix iframe stream constructor	2017-09-01 12:07:28 -07:00
Thomas Huang	33dfed15a6	Merge pull request #1897 from MetaMask/greenkeeper/sinon-3.2.0 ... Update sinon to the latest version 🚀	2017-09-01 12:05:08 -07:00
kumavis	dbcc82f5c4	mascara - fix iframe stream constructor	2017-09-01 12:03:28 -07:00