Commit Graph

313 Commits

Author SHA1 Message Date
kumavis 4cf83b582e Merge branch 'master' of github.com:MetaMask/metamask-plugin into FixMenuBug 2016-07-12 00:12:44 -07:00
Dan Finlay 57da5a8198 Merge branch 'master' into FixSvgIcons 2016-07-11 20:55:58 -07:00
Dan Finlay e21a48da83 Linted 2016-07-11 20:53:26 -07:00
Kevin Serrano d7e6b752a3 Integrate changes back into eth-balance 2016-07-11 17:44:00 -07:00
Kevin Serrano 6a61591dad Move shorten balance to util. Add as property of generateBalance object output. 2016-07-11 16:31:12 -07:00
Kevin Serrano 37f21cf18f Remove unused functions. Readd if necessary. 2016-07-11 16:01:52 -07:00
Dan Finlay 66e079f1c7 Fix imageification of recipient 2016-07-11 15:49:13 -07:00
Dan Finlay 7b3f0ad43d Fix main dropdown animation 2016-07-11 11:33:12 -07:00
Kevin Serrano 40d2b7fe71 lint 2016-07-08 17:39:15 -07:00
Kevin Serrano 20bfb60fd2 Implement alternate shortening scheme. 2016-07-08 17:27:13 -07:00
kumavis 58ee3e1227 Merge branch 'master' of github.com:MetaMask/metamask-plugin into ui-fixth-width-tx-history 2016-07-07 17:39:48 -07:00
kumavis d2eab80e09 eth-balance fix 2016-07-07 17:34:30 -07:00
kumavis 501ffba6f2 lint - dingle dangle comma tangle 2016-07-07 17:00:24 -07:00
kumavis 03430e8473 Merge branch 'master' of github.com:MetaMask/metamask-plugin into ConfirmationStyle 2016-07-07 16:56:20 -07:00
kumavis 7dc67a9257 notif - add support for forward carrat 2016-07-07 16:54:35 -07:00
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
kumavis 11fd281a33 ui - remove doubled eth-balance 2016-07-07 15:29:46 -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