296 Commits

Author	SHA1	Message	Date
Kevin Serrano	4bceda37a8	Merge branch 'master' into fox-sub	2016-08-23 14:51:09 -07:00
Kevin Serrano	6363a80b49	Linting.	2016-08-23 14:32:12 -07:00
Kevin Serrano	5168232481	Created option to pass in static file for fallback for logo.	2016-08-23 14:11:25 -07:00
Dan Finlay	5d24621b56	More linting	2016-08-22 17:37:16 -07:00
Dan Finlay	17f3f90d80	Linted	2016-08-22 17:21:54 -07:00
Dan Finlay	f57cbe59fc	Removed view more button, added account info button. ... Also: - Also fixed bug that caused React warning when rendering the tx history. - Renamed 'Transactions' to 'History', since it now has more than that.	2016-08-22 14:36:21 -07:00
Dan Finlay	3d451ddf3e	Merge branch 'master' into i390-TransactionLimit	2016-08-22 11:59:08 -07:00
Kevin Serrano	cec88cc9ac	Merge branch 'master' into fox-sub	2016-08-22 11:58:59 -07:00
Frankie	edfb0eb968	Fix issue where if given a balance that does not need to be parsed will not be parsed	2016-08-19 17:18:11 -07:00
Kevin Serrano	7a466697d3	Modify logic for component update.	2016-08-19 16:59:04 -07:00
Kevin Serrano	43e28788d7	Create replacement logo for non-webgl	2016-08-19 14:47:49 -07:00
Dan Finlay	8592ffd855	Merge branch 'master' into i390-TransactionLimit	2016-08-19 07:57:35 -07:00
Dan Finlay	9cd85aea2f	Merge branch 'master' into shapeshiftTx	2016-08-19 07:50:57 -07:00
Frankie	e3e5538ddc	Remove "+" from shapeshift tx and change wording in CHANGELOG	2016-08-18 20:24:17 -07:00
Dan Finlay	fe5fff3248	Change 'View More' to 'Show More'	2016-08-18 17:47:42 -07:00
Frankie	98dab0ffd2	Make ballance teal for shapeshift tx and add to change log	2016-08-18 16:30:13 -07:00
Dan Finlay	4f857e297b	Linted	2016-08-18 16:27:25 -07:00
Dan Finlay	bd9d89826c	Added view more button to transaction list ... Visible at the end of the transaction list, or if no transactions are listed, displayed right after the `No Transactions` message.	2016-08-18 16:23:12 -07:00
Kevin Serrano	4cebf12bb5	Fix rounding issues.	2016-08-18 15:59:37 -07:00
Frankie	3525dc0801	Create a ShapeShift tx in tx History	2016-08-18 15:20:26 -07:00
Frankie	23aeb1c5c1	Add api Public key	2016-08-18 12:20:24 -07:00
Frankie	efa61f2cf8	Merge branch 'master' into shapeshiftTx	2016-08-18 11:06:32 -07:00
Frankie	752d16f6c0	WIP: ShapeShift tx	2016-08-18 11:04:28 -07:00
Kevin Serrano	666f3cd66c	Added compliance for tests and properly accounts for N/A conversions.	2016-08-16 15:11:40 -07:00
Kevin Serrano	121af0c4b9	Lint.	2016-08-16 14:51:55 -07:00
Kevin Serrano	5afaebe602	Remove logs.	2016-08-16 14:49:53 -07:00
Kevin Serrano	0b052e94cc	Hide conversions when API fails.	2016-08-16 14:49:21 -07:00
Kevin Serrano	6041ba1ed2	Add fallback to API failure.	2016-08-16 14:07:06 -07:00
Kevin Serrano	7d1b2db87e	linting and ignoring.	2016-08-16 10:48:31 -07:00
Kevin Serrano	009784c79b	Divided eth components for tx and account detail.	2016-08-16 10:34:29 -07:00
Kevin Serrano	6895d330ff	Merge master.	2016-08-15 10:50:53 -07:00
Frankie	2ef4cbaa89	Add margin to "go to test faucet" button and show more of the address on qr code page	2016-08-14 21:41:08 -07:00
Dan Finlay	e826eb932c	Remove ethereum classic provider ... Fixes #542	2016-08-14 18:41:05 -07:00
Frankie	99a788a6f0	Add multi message capability to Qr view for market info	2016-08-12 17:43:24 -07:00
Frankie	b72c00a6c1	Add a to test faucet button	2016-08-12 16:12:40 -07:00
Frankie	632465b213	Merge branch 'master' into buyForm	2016-08-12 15:47:03 -07:00
Frankie	b4c9a52259	Change buy forms so that they are their own view and add Qr-code	2016-08-12 15:41:59 -07:00
Dan Finlay	20cfd1c9f3	Add network indicator class to loading image	2016-08-11 19:44:41 -07:00
Frankie	2fc26fb264	Even out some of the margins	2016-08-10 18:53:11 -07:00
Frankie	c8b2826441	Fix typo for copyButton	2016-08-10 15:07:10 -07:00
Frankie	ba1edc429b	Merge branch 'master' into buyForm	2016-08-10 13:48:34 -07:00
Frankie	9c6dd9ef49	Create "buy form" add shape shift	2016-08-10 13:43:01 -07:00
Kevin Serrano	637d3978b7	Fix default value. Add loading indication for async.	2016-08-09 16:33:58 -07:00
Kevin Serrano	260de6532c	Get fiat numbers rendering on tooltip. Need to find way to create line breaks.	2016-08-05 12:18:44 -07:00
Dan Finlay	c7691b7e64	Fix reference in drop menu item	2016-07-29 12:22:39 -07:00
Dan Finlay	8a4d8eca64	Fix network name reference ... When adding the classic network to the menu, I left a reference to a property that is not always existent, so we needed a fallback for it.	2016-07-29 12:19:15 -07:00
Dan Finlay	9b43ec2278	Add eth classic to provider menu	2016-07-28 10:53:51 -07:00
Dan Finlay	6658bea8d4	Implement some cross-browser practices (#473) ... * Add mozilla plugin key to manifest * Move all chrome references into platform-checking module Addresses #453 * Add chrome global back to linter blacklist * Add tests	2016-07-21 10:45:32 -07:00
Dan Finlay	c4812b3452	Triage a strange undefined balance error	2016-07-15 17:47:58 -07:00
kumavis	97e38b4983	new tx - calculate estimatedGas and show thing in tx-details (#441) ... * new tx - calculate estimatedGas and show thing in tx-details * Bump changelog	2016-07-13 23:39:44 -07:00
Frankie	dbc9008295	Fix eth balance tooltip to show 6 decimals (#440) ... * Fix tooltip to show to the 6 decimal place on balances ovr 0... * Change font size for balance component in tx-list so it fits the notation * Add to change log * Linting * change log	2016-07-13 15:46:36 -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
Dan Finlay	66e079f1c7	Fix imageification of recipient	2016-07-11 15:49:13 -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	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	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	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
Dan Finlay	689bd58d81	Merged latest balance formatting code	2016-07-06 18:06:28 -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	71df05c5ff	Put network status checkmarks at end of row	2016-07-01 15:04:38 -07:00
Frankie	42cd0b69e7	Implemt new account layout	2016-06-30 14:53:24 -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	441a7eec28	Add CopyButton component	2016-06-29 14:11:12 -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	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
Kevin Serrano	abcf762184	Code style fix.	2016-06-28 12:49:17 -07:00
Kevin Serrano	39a758d7c3	Merge changelog.	2016-06-28 11:37:11 -07:00
Kevin Serrano	a69882df72	Additional length check just in case.	2016-06-28 11:34:30 -07:00
Kevin Serrano	86a1eaadf1	Enforce 30 character limit on wallet name.	2016-06-28 11:30:55 -07:00
Kevin Serrano	204cb7f1ed	Change color of failure to yellow. Change pending to ellipsis. (#338) ... * Change color of failure to yellow. Change pending to ellipsis. * Modify changelog.	2016-06-28 09:33:11 -07:00
kumavis	770528d538	clean - appease the linting machine	2016-06-24 17:27:42 -07:00
kumavis	d7d440b2c2	svg notif now work for msg signatures	2016-06-24 17:22:27 -07:00
kumavis	86fdcca2ec	Merge branch 'master' of github.com:MetaMask/metamask-plugin into conf-tx-refactor	2016-06-24 12:49:02 -07:00
kumavis	eb1b9d027f	breakout pending-tx-details	2016-06-24 12:48:52 -07:00
kumavis	c8b6da2593	identicon - default to imageify	2016-06-24 12:07:08 -07:00
kumavis	be25f4da06	pending-tx pass the identicon pref on	2016-06-23 16:43:10 -07:00
kumavis	d293ef0494	account-panel combine panel into account-panel	2016-06-23 16:28:57 -07:00
kumavis	7eb89613cc	icon-factory - overhaul to provide svg or imagified el	2016-06-23 16:09:25 -07:00
kumavis	cc7dbace38	tx-conf add non-interactive mode for notification	2016-06-23 15:25:33 -07:00
kumavis	2495c6ea54	svg notifications - remove unneeded deps and clean code	2016-06-23 15:13:24 -07:00
kumavis	2a3660fe60	Merge branch 'master' of github.com:MetaMask/metamask-plugin into svg-notif	2016-06-23 14:01:16 -07:00
kumavis	122576a790	initial svg notifications	2016-06-22 19:28:11 -07:00
Frankie	f0e6411277	Swap out Transat font for Montserrat	2016-06-22 15:35:52 -07:00
Dan Finlay	8fde8a8921	Manually linted	2016-06-21 13:56:04 -07:00
Dan Finlay	a08c3bc01b	Auto linted	2016-06-21 13:18:32 -07:00
Dan Finlay	281ed1c2bb	Fix tx approval address formatting	2016-06-16 18:37:39 -07:00
Dan Finlay	92f8d1b2ca	Merge pull request #286 from MetaMask/FixSpinner ... Made network spinner clickable	2016-06-14 15:26:33 -07:00
Dan Finlay	9417b92e44	Let account address take more space in account list	2016-06-14 15:24:47 -07:00
Dan Finlay	c8706b5d6f	Made network spinner clickable ... Opens network menu, for when network is unreachable. Fixes #279	2016-06-14 15:00:25 -07:00
Frankie	e9208be096	Size export confirmation input	2016-06-12 13:36:34 -04:00
Frankie	7d8bf31e82	Fix edit text ... and edit label alighment	2016-06-12 12:38:51 -04:00
Dan Finlay	d5c378b09a	Cache identicons ... Fixes #197 Also as a side effect, by creating this `iconFactory.cache` object, we have a convenient place for specifying stock icons for known contracts! We can just hard-code image addresses in the `ui/lib/icon-factory.js` cache instantiation, and those values will be injected into the identicon image tag `src` attributes.	2016-06-06 14:05:13 -07:00
Frankie	2c2fcd60bf	Merge branch 'master' into uiFixes	2016-06-06 10:20:05 -04:00
Frankie	f59ca7a6bf	Add css to resize and alighn input for editable lable	2016-06-06 10:09:21 -04:00
Dan Finlay	b9007ee843	Add provider menu on clicking network status indicator. ... Also simplifies network status icons.	2016-06-03 17:49:54 -07:00
Dan Finlay	5560ebba26	Clicking network status indicator reveals provider menu	2016-06-03 17:09:18 -07:00
Dan Finlay	d49ef1a2e5	Blockchain status now updates on availability change	2016-06-03 15:18:20 -07:00
Dan Finlay	2422c78ce2	Add network loading indication	2016-06-03 13:58:09 -07:00
Dan Finlay	d86d7b9ac7	Differentiate icon name from hover text	2016-06-03 13:08:49 -07:00
Dan Finlay	3170e094c5	Some minor linting	2016-06-03 12:59:59 -07:00