3815 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
kumavis	0188e7b94d	Merge branch 'master' into NewUI-flat	2017-08-08 23:30:58 -07:00
Frankie	57f6fce6b2	Merge pull request #1882 from MetaMask/tx-cont-fixes ... Tx cont fixes	2017-08-09 00:16:49 -04:00
kumavis	25f9746dab	tx controller - fix error serialization	2017-08-08 21:09:28 -07:00
kumavis	5e6962342d	tx controller - fix getBalance fn	2017-08-08 21:08:30 -07:00
kumavis	5418813ed1	util - sufficientBalance - validate input	2017-08-08 21:05:59 -07:00
sdtsui	5e9926b0d0	Fix dropdown z-index value	2017-08-08 19:02:58 -07:00
sdtsui	6be6f56ac5	Add z indicies to settings-variables	2017-08-08 19:01:33 -07:00
Frankie	d40bd9a726	Merge pull request #1880 from MetaMask/pendingFix ... fix getPendingTransactions function for pendingTxTracker	2017-08-08 22:00:17 -04:00
frankiebee	9c9165e930	filter by network for pending txs	2017-08-08 21:54:26 -04:00
sdtsui	67213e7583	Add backdrop styles and box shadow to new global modal defaults	2017-08-08 18:51:06 -07:00
frankiebee	5bb84f6e21	fix getPendingTransactions function for pendingTxTracker	2017-08-08 21:49:48 -04:00
Thomas Huang	02a6cd255b	Merge pull request #1879 from MetaMask/build-err-fix ... Build sys - prevent err from being swallowed	2017-08-08 18:44:53 -07:00
sdtsui	bdf5436c2d	Add minor comments and cleanup for new components	2017-08-08 18:44:20 -07:00
sdtsui	c8893fb9ca	Hook up 'Buy with Fiat', redirect to Coinbase	2017-08-08 18:37:20 -07:00
sdtsui	dc702705bf	Move buy view into its own component - BuyOptions	2017-08-08 18:34:04 -07:00
sdtsui	eab5718a40	Add an additional font-size breakpoint for buy modal on the largest screens	2017-08-08 18:12:50 -07:00
sdtsui	3072d2d178	Add minor positioning tweaks for buy modal, laptop view	2017-08-08 17:57:47 -07:00
kumavis	59e83d2b80	build - factor watcify into bundler generation	2017-08-08 17:53:34 -07:00
sdtsui	b97dcf09ac	Move inline styles out into explicitly named BEM classes	2017-08-08 17:51:06 -07:00
sdtsui	e260ab46cb	Implement utility helper for checking viewport size in js	2017-08-08 17:50:29 -07:00
kumavis	4a4736195f	build - fix error swallowing on dev	2017-08-08 17:46:31 -07:00
kumavis	6767430aa2	deps - bump watchify	2017-08-08 17:46:09 -07:00
sdtsui	928adae104	Implement modal content for buy flow - mobile view	2017-08-08 17:11:25 -07:00
Thomas Huang	0e6bc6647e	Merge pull request #1854 from MetaMask/greenkeeper/initial ... Greenkeeper/initial	2017-08-08 16:32:55 -07:00
kumavis	922ecb9149	Merge branch 'master' into greenkeeper/initial	2017-08-08 16:23:14 -07:00
kumavis	7db1f30590	Merge pull request #1877 from MetaMask/hotfix/mobile-buy-layout ... Improve layout for legacy buy screen	2017-08-08 15:56:02 -07:00
kumavis	cd1437fdd3	Merge pull request #1861 from MetaMask/transactionControllerRefractor ... Transaction controller refractor part 2	2017-08-08 15:54:08 -07:00
frankiebee	88b84e3895	add json-rpc-engine && eth-json-rpc-middleware to devDependencies	2017-08-08 18:34:59 -04:00
frankiebee	a13643bdb5	fix class names	2017-08-08 18:30:49 -04:00
frankiebee	e761fb0ef7	use provider stub	2017-08-08 18:30:22 -04:00
frankiebee	be4011c310	create a provider stub	2017-08-08 18:30:03 -04:00
sdtsui	9d3b5348aa	Fix layout issues flagged by @tmashuang	2017-08-08 15:17:52 -07:00
sdtsui	b6a7281737	Make buy ui more central to the screen	2017-08-08 15:17:24 -07:00
Thomas Huang	67e4855b9d	Updated commonjs require path for redux-logger and redux-thunk modules	2017-08-08 14:15:45 -07:00
sdtsui	922a272e81	Add note for responsive modal styles	2017-08-08 14:05:19 -07:00
sdtsui	29c8f448ca	Hook up global modal to Tx view, Buy button	2017-08-08 13:37:52 -07:00
sdtsui	f72f57dc6c	Implement global modal	2017-08-08 13:37:41 -07:00
sdtsui	aab0fda9ac	Add actions and reducers for global modal	2017-08-08 13:37:16 -07:00
sdtsui	da51f56df9	Add dependencies and JSX support (reactify), for global modal implementation	2017-08-08 13:36:54 -07:00
Simon Liang	0db627d979	refactored and added unit test	2017-08-08 20:15:30 +08:00
Simon Liang	e8ade42f2a	extracted balance component and renders to the format, also wired in the account name	2017-08-08 16:49:45 +08:00
frankiebee	3a2190ec3c	fix the bind on pending tx watchers	2017-08-07 16:58:38 -04:00
frankiebee	28fbdca830	remove .only	2017-08-07 16:41:54 -04:00
frankiebee	f3b42f1e33	Merge branch 'master' into transactionControllerRefractor	2017-08-07 16:24:58 -04:00
frankiebee	e7f838e626	fix test	2017-08-07 14:56:17 -04:00
frankiebee	59124eb6fd	remove logging of the message and log the error	2017-08-07 14:45:43 -04:00
frankiebee	a54c26382e	remove unnecessary if statment for error message	2017-08-07 14:40:07 -04:00
frankiebee	fb9866b4e1	fix spelling	2017-08-07 14:37:20 -04:00
kumavis	b8ab1170f8	Merge branch 'greenkeeper/initial' of github.com:MetaMask/metamask-extension into greenkeeper/initial	2017-08-07 10:52:24 -07:00
kumavis	78aa957e5a	Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial	2017-08-07 10:52:08 -07:00