413 Commits

Author	SHA1	Message	Date
Frankie	483a7fee0a	Add a back button on lock screen to go back to init menu	2016-08-25 14:13:32 -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
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
Frankie	98dab0ffd2	Make ballance teal for shapeshift tx and add to change log	2016-08-18 16:30:13 -07:00
Kevin Serrano	683651e75d	Lint and changelog.	2016-08-18 16:01:40 -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	3814bf8f5d	Change account list balance rendering.	2016-08-16 14:13:03 -07:00
Kevin Serrano	6cee99f0ba	Remove console logs.	2016-08-16 14:08:14 -07:00
Kevin Serrano	3b27fe1356	Add recent conversion date.	2016-08-16 14:07:42 -07:00
Kevin Serrano	6041ba1ed2	Add fallback to API failure.	2016-08-16 14:07:06 -07:00
Kevin Serrano	da2527ddb4	Remove react-select as dependency.	2016-08-16 13:23:28 -07:00
Kevin Serrano	58e3042a3b	Remove logging. Clean up duplicate entries in currency list.	2016-08-16 13:21:16 -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
kumavis	8943e86470	Merge branch 'master' into CustomRpcLoadingBug	2016-08-11 20:53:15 -07:00
Dan Finlay	20cfd1c9f3	Add network indicator class to loading image	2016-08-11 19:44:41 -07:00
Kevin Serrano	041538e89e	UI logging supressed for production.	2016-08-11 19:04:50 -07:00
Kevin Serrano	2b0c6953e2	Create global variable that changes ui logging.	2016-08-11 18:58:23 -07:00
Kevin Serrano	b8856d765d	Setting defaults to production.	2016-08-11 15:42:21 -07:00
Kevin Serrano	b3def32f7a	Cosmetic difference.	2016-08-11 14:22:48 -07:00
Kevin Serrano	ec2641a8c9	Remove stray console.log	2016-08-11 14:21:44 -07:00
Kevin Serrano	0056844335	Take out unused dependency.	2016-08-11 14:20:26 -07:00
Kevin Serrano	bf384da6f3	Remove comments.	2016-08-11 14:12:55 -07:00
Kevin Serrano	ad468c1880	Merge branch 'master' into logging-fix	2016-08-11 14:07:49 -07:00
Kevin Serrano	804e8df87f	Lint	2016-08-11 14:03:51 -07:00
Kevin Serrano	9904b4ef5a	Add ability to hide logging messages in production.	2016-08-11 13:59:14 -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	4ace425a9c	Fix merge mess	2016-08-10 14:41:40 -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	abfc5632ef	Fix ether warning checkbox.	2016-08-10 10:54:55 -07:00
Kevin Serrano	cb0c1f25ba	Did not previously call functions before!	2016-08-09 16:49:15 -07:00
Kevin Serrano	637d3978b7	Fix default value. Add loading indication for async.	2016-08-09 16:33:58 -07:00