7625 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
brunobar79	de21a49265	use latest keyring packages	2018-07-16 15:31:05 -04:00
brunobar79	03e3ebb305	restore circleci config	2018-07-16 12:57:19 -04:00
brunobar79	d05814a5ad	Merge branch 'develop' into initial-trezor-support	2018-07-16 12:55:13 -04:00
Whymarrh Whitby	db4469794e	Merge pull request #4621 from MetaMask/one-send-directory ... Remove 'send_/' directory; revert to just having send	2018-07-16 13:35:05 -02:30
Whymarrh Whitby	117d43be1f	Merge pull request #4636 from MetaMask/bmd/tos-link ... fix tos link	2018-07-16 13:24:23 -02:30
Whymarrh Whitby	5c3efe8bc4	Fix send import paths in confirm tx components	2018-07-16 13:18:21 -02:30
Whymarrh Whitby	d38405fb0e	Fix send import path in customize gas modal	2018-07-16 13:07:42 -02:30
Whymarrh Whitby	040b8c59c4	Fix send import path in ToAutoComplete	2018-07-16 13:07:42 -02:30
Dan	2e0cbf210e	Fix lint warnings in the send/ directory.	2018-07-16 12:58:32 -02:30
Dan	b3d78ed8a1	Remove send_ directory, revert to just having send ... Revert accidentally changed constants. Require defaults in ens-input, gas-fee-display and confirm screens.	2018-07-16 12:58:32 -02:30
03-26	9dd637569d	Update	2018-07-15 15:09:18 +09:00
Dan J Miller	f31e87dcd5	Merge pull request #4715 from BitGuildPlatform/to-autocomplete ... fixes #4664	2018-07-14 09:46:28 -02:30
Dan J Miller	4d105d9cca	Merge pull request #4702 from BitGuildPlatform/contextTypes ... convert contextType to static prop for refactored components	2018-07-14 09:23:48 -02:30
brunobar79	7f29b46d32	clear circleci cache	2018-07-13 21:01:13 -04:00
brunobar79	d21d408d64	Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial-trezor-support	2018-07-13 20:53:22 -04:00
brunobar79	3025832858	added TREZOR simulator instructions	2018-07-13 20:31:40 -04:00
brunobar79	1b041a92f4	restore circleci config	2018-07-13 20:16:04 -04:00
brunobar79	d4b41f691e	remove trezor script	2018-07-13 20:15:48 -04:00
brunobar79	03254680c9	add changelog	2018-07-13 20:15:37 -04:00
brunobar79	c9ffa38ab1	cache circleci	2018-07-13 20:07:56 -04:00
brunobar79	3ae5b4e772	update label	2018-07-13 19:47:45 -04:00
brunobar79	55382e9842	fix account selection	2018-07-13 15:19:21 -04:00
brunobar79	5399546388	added affiliate link to trezor	2018-07-13 13:49:20 -04:00
brunobar79	82a93bb287	detect ability to open popup instead of browser	2018-07-13 02:03:54 -04:00
brunobar79	d23227dc4f	test ci	2018-07-13 01:02:55 -04:00
brunobar79	359f9ab4d2	avoid fallback cache	2018-07-13 00:54:45 -04:00
brunobar79	359a888a60	update package-lock.json	2018-07-13 00:44:19 -04:00
brunobar79	289795fb12	fix account balance bug	2018-07-13 00:09:42 -04:00
Esteban MIno	2fffe09873	detect tokens through infura	2018-07-12 20:43:43 -04:00
Thomas Huang	2f4698c130	Merge pull request #4787 from MetaMask/stop-inject-harbourair ... Add harbourair.com to injection block list	2018-07-12 15:28:33 -07:00
brunobar79	5710e648bd	remove account modal updated	2018-07-12 18:19:33 -04:00
Dan Finlay	c4ae399577	Add harbourair.com to injection block list ... This site was getting unexpected results when MetaMask was installed. https://consensys.zendesk.com/agent/tickets/2312	2018-07-12 14:21:32 -07:00
Bobby Dresser	eb2b36b3cb	fix tos link;	2018-07-12 16:24:13 -04:00
Thomas Huang	5a45df72c6	Merge pull request #4669 from MetaMask/removeNonceTrackerFunction ... Remove unsued nonce tracker function	2018-07-12 11:48:05 -07:00
Whymarrh Whitby	47d596c090	Merge pull request #4766 from whymarrh/null-translations ... Rework i18n-helper getMessage function	2018-07-12 15:46:09 -02:30
Whymarrh Whitby	55232d80d8	Merge pull request #4779 from whymarrh/tx-view-tooltips ... Add Tooltips to Balance View in Extension	2018-07-12 15:43:53 -02:30