220 Commits

Author	SHA1	Message	Date
Frankie	19c1b1fd8e	Merge branch 'master' into qrCode	2016-09-13 12:18:19 -07:00
kumavis	f7794d9949	PendingTxDetails - partially remove imagify support	2016-09-13 10:18:57 -07:00
Frankie	218f380d87	Add qrcode-npm to package.json and swap out Qr Code generator api for node-module	2016-09-12 17:27:14 -07:00
Frankie	c37c050c8a	Revert "Add new eth-lightwallet salting to vault."	2016-09-12 10:34:06 -07:00
Dan Finlay	6d6130e2a6	Camelcase dataset key for react	2016-09-10 11:23:11 -07:00
Dan Finlay	a4e4c85453	Fix fox logo password following ... The new lightweight svg logo was not following text quite right. The new `lookAt` method was not using the same logic the module was using internally on mouse movement. I simply used that logic and exposed it via the old (expected) API, and got it behaving the way I like.	2016-09-08 20:31:42 -07:00
Dan Finlay	6c05c221cd	Fix new logo related errors ... Fixed logo deallocation related bugs, had to patch the logo repo itself to add a stopAnimating method. Also tuned up the logo to more closely resemble the old behavior. - Overlaps the title text - Points nose at cursor, not just front of eyes - Cursor is more "distant" from fox, to avoid extreme angles on edges.	2016-09-08 15:41:21 -07:00
Dan Finlay	762bf2f48a	Merge branch 'master' into AddNewLogo	2016-09-08 12:49:57 -07:00
Dan Finlay	20ae4c2689	Fix logo usage for metamask-logo v2.0.0 ... - No longer need to check for webGL compliance (svg rendered!) - logo.canvas has been replaced with logo.container, since svg doesn't render to canvas but to an element. Otherwise, worked with very little effort!! Fixes #624	2016-09-08 11:22:04 -07:00
Dan Finlay	ab3b409438	Restore broken variable reference	2016-09-08 11:03:47 -07:00
Dan Finlay	c3dbcb5b02	Fix double tooltip	2016-09-08 10:57:10 -07:00
Dan Finlay	2ca58f5bf7	Merge branch 'master' into ModularFiatBalance	2016-09-06 19:36:40 -07:00
Dan Finlay	0186e05a0d	Linted	2016-09-06 17:30:38 -07:00
Dan Finlay	1537e3f5da	Add fiat balances to tx conf view	2016-09-06 17:28:25 -07:00
Dan Finlay	c46de79c10	Got basic fiat display modularized	2016-09-06 17:08:56 -07:00
Dan Finlay	90638f95c0	Fix fiat-value	2016-09-06 16:55:52 -07:00
Dan Finlay	09dd854a96	Nearly finished factoring fiat value into eth-balance	2016-09-06 16:45:06 -07:00
Kevin Serrano	f4e131da0a	Fix capitalization.	2016-09-06 11:04:54 -07:00
Kevin Serrano	f213ca695c	Fix typos and refine wording.	2016-09-06 10:03:10 -07:00
Dan Finlay	b2ebb6032d	Continuing fiat balance modularization	2016-09-03 14:20:27 -07:00
Dan Finlay	62179a37f7	Fix spelling error	2016-08-26 15:08:02 -07:00
Dan Finlay	a8e40ffe7a	Persist shapeshift form input values	2016-08-25 14:19:09 -07:00
Dan Finlay	8c06463e80	Linted	2016-08-24 15:46:31 -07:00
Dan Finlay	44ff75c7e1	Improve msg signing padding	2016-08-24 15:43:00 -07:00
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