307 Commits

Author	SHA1	Message	Date
Kevin Serrano	86b7cc6637	Resolve merge conflict.	2016-07-07 16:33:06 -07:00
Kevin Serrano	9a9c1f2cd4	Pass the linters.	2016-07-07 16:30:52 -07:00
Kevin Serrano	1c1d6241ed	Remove reducer console log.	2016-07-07 16:29:31 -07:00
Kevin Serrano	5343404d0d	Add new component for tx-history to avoid messing with other styles. Add fixed width specifically to this style.	2016-07-07 16:27:37 -07:00
Kevin Serrano	570d560932	Modified test views again. Added fixed length to center tx information.	2016-07-07 15:39:19 -07:00
Dan Finlay	33150cc721	Fixed eth_balance style, completing partial merge	2016-07-07 15:22:10 -07:00
kumavis	ac808e681f	Merge branch 'master' of github.com:MetaMask/metamask-plugin into ConfirmationStyle	2016-07-07 15:04:53 -07:00
Kevin Serrano	432221625c	Remove logging for states.	2016-07-07 13:50:57 -07:00
Kevin Serrano	ecb0f9767b	Add new test state with tx history. Fix alignment issue with transaction history text.	2016-07-07 13:48:52 -07:00
kumavis	f71956b2ab	lint fix	2016-07-07 13:45:06 -07:00
kumavis	0bb8b8cacc	Merge branch 'master' of github.com:MetaMask/metamask-plugin into ConfirmationStyle	2016-07-07 13:41:32 -07:00
Dan Finlay	3cd502a163	Restore button naming consistency	2016-07-07 13:22:38 -07:00
Dan Finlay	e8efe84320	Add nickname rendering for recipient address	2016-07-07 13:21:45 -07:00
Dan Finlay	306035f575	Linted	2016-07-07 12:41:07 -07:00
Dan Finlay	468c1ffa42	Refined tx confirmation button styles	2016-07-07 12:39:40 -07:00
Frankie	cd8ae4b5ff	Change function name to generateBalanceObject	2016-07-07 12:39:07 -07:00
Dan Finlay	2a204624f5	Implement tx confirmation style refinements	2016-07-07 12:27:34 -07:00
Dan Finlay	97b60caac0	Add configurable params to eth-balance	2016-07-07 12:27:18 -07:00
Frankie	0a6560bd5d	Add method to deal with small decimals and create the object for eth-balance component	2016-07-07 12:13:38 -07:00
Dan Finlay	1e92e7e9d4	Make mini account panel labels fully configurable	2016-07-07 11:50:01 -07:00
Dan Finlay	21f17214be	Remove formatBalance.formatted references	2016-07-07 11:39:24 -07:00
Dan Finlay	a02f43fb7f	Merge branch 'master' into ConfirmationStyle	2016-07-07 11:38:11 -07:00
Frankie	2cc44df584	Revert back to original formatBalance	2016-07-07 11:20:02 -07:00
Dan Finlay	c2655bef5a	Correct data length calculation	2016-07-06 23:38:07 -07:00
Dan Finlay	5faa64817c	Update gas cost	2016-07-06 23:16:04 -07:00
Dan Finlay	3bcf44509e	Fix sender balance rendering in pending tx details	2016-07-06 23:11:47 -07:00
Dan Finlay	a1fdf28a7b	Merge branch 'master' into ConfirmationStyle	2016-07-06 22:56:07 -07:00
Dan Finlay	9e0d9b88cc	Linted	2016-07-06 22:51:28 -07:00
Dan Finlay	ce463f3aff	Fixed up pending-tx-details	2016-07-06 22:48:02 -07:00
Dan Finlay	7481f7c3df	Fleshed out pending tx view	2016-07-06 21:32:36 -07:00
Kevin Serrano	acdd40e3be	Fix dropdown z-index issue.	2016-07-06 20:11:49 -07:00
Frankie	8834548b01	Handle to small of balances with "<0.00001"	2016-07-06 19:17:32 -07:00
Dan Finlay	689bd58d81	Merged latest balance formatting code	2016-07-06 18:06:28 -07:00
Dan Finlay	15afbe5b1f	Merge branch 'master' into ConfirmationStyle	2016-07-06 17:59:00 -07:00
Dan Finlay	7058dc4ee3	Began reworking tx conf view	2016-07-06 17:58:46 -07:00
Frankie	53eefc1efc	Add a postion option for tool tip	2016-07-06 17:12:33 -07:00
Frankie	9d577ea023	Add decimal hendeling to ETH balance	2016-07-06 17:04:09 -07:00
Dan Finlay	fb5dbd23a9	Merge pull request #387 from MetaMask/ui-formatting ... Ui formatting for account details	2016-07-06 11:00:32 -07:00
Frankie	8d67a820a9	Add light and ultraLight fonts	2016-07-05 15:39:51 -07:00
Dan Finlay	2c89cd722e	Simplify empty account balance rendering	2016-07-05 15:16:40 -07:00
Kevin Serrano	3ca20bd8a3	Move account balance down a row. Adjusted positioning of buttons.	2016-07-05 12:04:15 -07:00
Dan Finlay	71df05c5ff	Put network status checkmarks at end of row	2016-07-01 15:04:38 -07:00
Dan Finlay	287222df25	Linted	2016-07-01 10:32:54 -07:00
Dan Finlay	51a5e66cbb	Move main drop-down state to component state	2016-07-01 10:25:19 -07:00
Dan Finlay	6ec387b675	Formatted dev mode better	2016-06-30 23:50:20 -07:00
Dan Finlay	7f9200b1bf	Added some basic styles	2016-06-30 23:15:45 -07:00
kumavis	5a917431d8	disclaimer - render via react-markdown	2016-06-30 21:46:19 -07:00
Dan Finlay	cd21a4b699	Remove scroll fixing from ui preview	2016-06-30 21:32:50 -07:00
Dan Finlay	a0a676c3e2	Remove old disclaimer	2016-06-30 21:24:14 -07:00
Dan Finlay	d33d4f0654	Merge branch 'master' into FrankieDisclaimer	2016-06-30 21:22:39 -07:00