4292 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
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
Kevin Serrano	b47d3735fe	Merge pull request #2007 from MetaMask/i2005-HttpsLinjs ... Use HTTPS links when available	2017-09-01 11:57:57 -07:00
Dan Finlay	01f961976a	Bump changelog	2017-09-01 11:42:44 -07:00
Dan Finlay	8498daee88	Update etherscan links to https ... Fixes #2005	2017-09-01 11:41:47 -07:00
Dan Finlay	ddd559718f	Update support link	2017-09-01 11:01:53 -07:00
Dan	0d6e64bfbe	Use flex to ensure network name does not wrap.	2017-09-01 00:12:58 -07:00
Dan	c436b6ffb3	Adjust z-index of header so that it stays in place when scrolling.	2017-09-01 00:12:58 -07:00
Dan	799627189d	Fix margin, padding, height for header.	2017-09-01 00:12:58 -07:00
Dan	d5998d3b07	Fixed network font	2017-09-01 00:12:58 -07:00
Dan	5452a26b36	Fixes lint errors and adds stylelint-config-standard to package.json	2017-08-31 04:16:07 -07:00
Dan	e7b3ef0708	Lint fixes	2017-08-31 04:16:07 -07:00
Dan	3ea841e276	Refactor gas-fee-display to include usd and eth fee displays as separate components.	2017-08-30 16:46:24 -07:00
Dan	5a7e4c4e76	Move gas fee to a separate component.	2017-08-30 16:46:24 -07:00
Dan	1485ec7392	Move currency toggle to its own component.	2017-08-30 16:46:24 -07:00
Dan	3ce69e1b65	Clean up send.js and eth-balance.js with es6.	2017-08-30 16:46:24 -07:00
Kevin Serrano	48021f4f94	Merge pull request #1988 from MetaMask/i1986-AddVersionToStateLogs ... Add version to state logs	2017-08-29 18:17:17 -07:00
Kevin Serrano	4b058bc7eb	Merge branch 'master' into i1986-AddVersionToStateLogs	2017-08-29 18:09:39 -07:00
Kevin Serrano	ec286a2b33	Merge pull request #1992 from MetaMask/MultipleTokensText ... Multiple tokens shows the amount when greater than 1	2017-08-29 18:09:16 -07:00
Thomas Huang	725e4aae7f	Update changelog	2017-08-29 18:00:57 -07:00
Thomas Huang	04011f9ea7	Multiple tokens shows the amount when greater than 1	2017-08-29 17:54:01 -07:00
Chi Kei Chan	e23ae5371b	Merge pull request #1982 from danjm/send-gas-tooltip ... Send Gas Tooltip	2017-08-29 11:50:12 -07:00
Dan Finlay	54ce267a9f	Add version to state logs ... Fixes #1986	2017-08-29 11:42:44 -07:00
Dan	c605c9897d	Minor clean up.	2017-08-29 16:09:56 -02:30