Commit Graph

372 Commits

Author SHA1 Message Date
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
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
kumavis d4e400e5e5 Merge pull request #378 from MetaMask/UiDev
Ui dev
2016-06-30 21:20:40 -07:00
Dan Finlay aa21c83470 Add new user agreement 2016-06-30 20:54:51 -07:00
Dan Finlay 2843459fcf Make info page not chrome dependent 2016-06-30 18:23:05 -07:00
Dan Finlay e55938ed15 First simple version of ui mocker 2016-06-30 18:22:16 -07:00
Frankie 1b1bb92fd3 Merge branch 'master' into compactLayout 2016-06-30 14:56:10 -07:00
Frankie 42cd0b69e7 Implemt new account layout 2016-06-30 14:53:24 -07:00
Dan Finlay 179d176dc1 Fix broken action reference 2016-06-30 11:30:31 -07:00
Frankie 5252504e3f WIP: Working on new layout 2016-06-30 11:15:32 -07:00
kumavis 41598a32a6 Merge branch 'master' of github.com:MetaMask/metamask-plugin into networkIndication 2016-06-29 17:12:08 -07:00
Frankie 94768175bf Merge branch 'master' into networkIndication 2016-06-29 16:33:43 -07:00
Frankie 0b3737edb4 Add to change log 2016-06-29 16:31:27 -07:00
Dan Finlay 2880f8631c Unify tooltip styles
Made a local tooltip component for replicating our tooltip styles wherever we use tooltips.

Applied that tooltip to other items that had tooltips.
2016-06-29 16:21:38 -07:00
Frankie e0daea35a9 Add network name to indicator and some css fixes
-also fix custom net work bug in drop down where it
thinks local:8545 is custom.
2016-06-29 16:12:19 -07:00
Dan Finlay 2b5c42d27f Merge branch 'master' into CopyTxHash 2016-06-29 15:58:31 -07:00
Dan Finlay 78e6ed22be Add tooltip to copy button 2016-06-29 15:57:59 -07:00
Kevin Serrano 3ae479f5ac Unify wording for transaction options (#369)
* Unify wording for transaction options.

* Modify changelog.

* Fix wording and spacing.
2016-06-29 15:44:37 -07:00
Frankie 2c36c17238 Add ✓ charchter to indicate active network 2016-06-29 15:04:16 -07:00
Dan Finlay 7f92a8da06 Use clipboard icon for copy button 2016-06-29 14:39:25 -07:00
Dan Finlay fb92b8a5fe Add copy button to transaction list 2016-06-29 14:12:58 -07:00
Dan Finlay 5c57169219 Replace manual copy buttons with new CopyButton component 2016-06-29 14:11:31 -07:00
Dan Finlay 441a7eec28 Add CopyButton component 2016-06-29 14:11:12 -07:00
Frankie ce03356f5f Remove missused action 2016-06-28 19:10:27 -07:00
Frankie dbae676858 Make it so that when you click the custom rpc url it closes the dropdown menu 2016-06-28 18:47:17 -07:00
Frankie f3119d40f5 fix lint 2016-06-28 18:06:10 -07:00
Frankie af999e2bee Merge branch 'master' into networkDropdownFix 2016-06-28 17:59:22 -07:00
Frankie 56cbd7d9ea Add custom to drop down menu 2016-06-28 17:57:53 -07:00
Kevin Serrano e4956c3123 Modify network icons to reflect current design. (#355)
* Modify network icons to reflect current design.

* Switch icons around.
2016-06-28 16:15:26 -07:00
Kevin Serrano c6187b080a Fix out-of-place positioning of pending tx badges. (#354) 2016-06-28 14:25:22 -07:00
kumavis 19f9d6566b Merge branch 'master' into pr/351
# Conflicts:
#	CHANGELOG.md
#	app/scripts/lib/notifications.js
2016-06-28 13:14:38 -07:00
kumavis 57aca116ed Merge branch 'master' into FixSomeFormatting
# Conflicts:
#	CHANGELOG.md
#	app/scripts/lib/notifications.js
2016-06-28 13:11:50 -07:00
Kevin Serrano 1cd17af2ad Second layer of 20 character check modified. 2016-06-28 13:10:57 -07:00
Kevin Serrano 661d9bffb3 Changelog update and reduce allowed characters from 30 to 20. 2016-06-28 13:10:29 -07:00
Kevin Serrano 4be704097f Merge branch 'master' into title-truncate 2016-06-28 13:08:43 -07:00
Kevin Serrano f9540cf48c Wallet name now is properly truncated. 2016-06-28 13:07:46 -07:00
kumavis 2fd03a60fb Merge pull request #344 from Zanibas/character-limit
Character limit implemented for wallet names
2016-06-28 13:02:34 -07:00