7505 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jenny Pollack	ae811628d9	Merge pull request #4833 from MetaMask/brave-flag-sentry ... sentry - add detection for Brave Browser	2018-07-19 11:58:59 -04:00
Jenny Pollack	16fc7efef1	remove local tests	2018-07-19 09:59:58 -04:00
bitpshr	d85fc246c5	Revert package-lock changes	2018-07-19 08:11:09 -04:00
bitpshr	a319c8ce42	Version Circle cache keys for easy flushing	2018-07-19 08:04:17 -04:00
bitpshr	d24b5b76fd	Update variable name	2018-07-19 08:04:17 -04:00
bitpshr	7ed0df4f05	Pin @material-ui/core@1.2.0 to maintain React 15 compat	2018-07-19 08:04:17 -04:00
bitpshr	d02c160db5	Updates for linting	2018-07-19 08:04:17 -04:00
bitpshr	94f99b6ed0	Updates	2018-07-19 08:04:17 -04:00
bitpshr	8df433ca84	Add support for .test Ropsten ENS domains	2018-07-19 08:04:17 -04:00
brunobar79	df19163bf9	last css fixes	2018-07-19 02:31:13 -04:00
brunobar79	76981c2ad9	added new global alert	2018-07-19 02:31:02 -04:00
Jenny Pollack	1a9748667d	sentry - add detection for Brave Browser	2018-07-19 02:22:56 -04:00
brunobar79	514148ffa1	fix support link	2018-07-19 00:16:10 -04:00
brunobar79	a6e0eef8f4	fix unsupported browser view	2018-07-19 00:14:13 -04:00
brunobar79	086ab6e1e1	lint	2018-07-18 23:57:09 -04:00
brunobar79	2bfddc288e	scroll smooth	2018-07-18 23:12:49 -04:00
brunobar79	49d1bdea8a	design done	2018-07-18 22:57:47 -04:00
Dan Finlay	6d04c80302	Merge pull request #4813 from MetaMask/no-inject-blueskybooking ... Do not inject on blueskybooking.com	2018-07-18 17:27:25 -07:00
Whymarrh Whitby	13804d61b4	Merge pull request #4822 from whymarrh/show-more-address ... Show first four characters of account after 0x	2018-07-18 15:44:00 -02:30
Whymarrh Whitby	76ac6bbb30	Merge pull request #4814 from whymarrh/send-data ... Add hex data input to send screen	2018-07-18 15:43:21 -02:30
Whymarrh Whitby	71d64e74a5	Show first four characters of account after 0x in wallet	2018-07-18 10:30:31 -02:30
Whymarrh Whitby	45faf3d558	Show first four characters of account after 0x in tx list	2018-07-18 10:30:21 -02:30
Whymarrh Whitby	da1f6e061d	Don't set txData to an empty string	2018-07-18 10:13:50 -02:30
Whymarrh Whitby	346505cab0	Inline single-use vars in send-footer.utils	2018-07-18 09:58:12 -02:30
Whymarrh Whitby	fb672e00df	Send data along with other tx params	2018-07-18 09:58:12 -02:30
Whymarrh Whitby	9ea7411c06	Hook up send component w/ UPDATE_SEND_HEX_DATA action	2018-07-18 09:52:36 -02:30
Whymarrh Whitby	25417fad26	Add updateSendHexData action	2018-07-18 09:52:13 -02:30
Whymarrh Whitby	3f9c3d76b6	Add hex data row to send screen	2018-07-18 09:52:13 -02:30
brunobar79	cbb14f1d5e	fix browser not supported screen	2018-07-17 21:57:19 -04:00
brunobar79	aa5a987765	added some e2e tests	2018-07-17 21:54:04 -04:00
Alexander Tseung	f6ca06f775	Merge pull request #4800 from MetaMask/i4785-confirm-screen-fixes ... Add fallback when no function found, fix network colors, add fiat values for tokens with contract exchange rates	2018-07-17 18:17:54 -07:00
brunobar79	cb53d5122c	Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial-trezor-support	2018-07-17 20:43:32 -04:00
brunobar79	cb97517b26	updated account list based on new designs	2018-07-17 18:53:37 -04:00
Alexander Tseung	301ae305b8	Use Number constructor for number conversion. Use existing noConversionRateAvailable message	2018-07-17 14:06:30 -07:00
Alexander Tseung	279bdfc2e7	Merge develop	2018-07-17 13:38:15 -07:00
Alexander Tseung	e16f5ab54d	Fix tests	2018-07-17 13:38:15 -07:00
Alexander Tseung	d19c42fcae	Add fallback when no function found, fix network colors, add fiat values for tokens with contract exchange rates	2018-07-17 13:38:14 -07:00
Alexander Tseung	e9a8c24cc4	Remove unused confirm transaction files	2018-07-17 13:38:14 -07:00
Alexander Tseung	89911dda17	Merge pull request #4815 from MetaMask/i4783-retry ... Increase clickable area and padding of Retry Transaction bar	2018-07-17 10:41:32 -07:00
Whymarrh Whitby	9a098a28e0	Merge pull request #4777 from MetaMask/i4661-currencyConversionBug ... Fixes conversion status for tokens without conversion rates (#4661)	2018-07-17 14:16:13 -02:30
brunobar79	e89350b19f	added tests for removeAccount	2018-07-17 01:44:28 -04:00
brunobar79	de4265c629	added more unit tests	2018-07-17 01:17:18 -04:00
Alexander Tseung	4737ea49c7	Increase clickable area and padding of Retry Transaction bar	2018-07-16 21:45:24 -07:00
Sara Reynolds	dcf8e0ed12	lint fix	2018-07-16 16:50:08 -07:00
brunobar79	e5512c306d	added unit tests for metamaskcontroller	2018-07-16 19:36:08 -04:00
Dan Finlay	6be6b9ef29	Do not inject on blueskybooking.com ... Per zendesk 2312.	2018-07-16 15:39:35 -07:00
brunobar79	41879a9835	added test for preferences controller	2018-07-16 16:08:19 -04:00
Sara Reynolds	684fc710ee	Fix edge cases and add translation compatibility	2018-07-16 13:03:24 -07:00
Sara Reynolds	4014b279d7	Update onlyRenderConversions function to method and account for edge cases	2018-07-16 13:03:23 -07:00
Sara Reynolds	8d8de0508a	Fixes conversion status for tokens without conversion rates	2018-07-16 13:03:23 -07:00