2923 Commits

Author	SHA1	Message	Date
Whymarrh Whitby	3987f9860f	Move main-container wrapper div into its own class	2018-09-19 16:43:58 -02:30
Whymarrh Whitby	fbf14cd130	Prevent loading screen from overlaying the app bar ... Refs #4417 This change is functional copy of 3893469 that solves the problem in a way that doesn't depend on the height of the app bar since the app bar isn't a fixed height in the smaller views.	2018-09-19 16:03:16 -02:30
Whymarrh Whitby	4c37669557	Make the LoadingScreen component 100% as tall as its container	2018-09-19 15:33:53 -02:30
Whymarrh Whitby	b1b5968e5e	Remove unused loading-overlay--full-screen CSS styles ... Refs #4417	2018-09-19 15:32:20 -02:30
Alexander Tseung	91ee373dbe	Fix exception thrown on getTokenData	2018-09-18 17:20:28 -07:00
Paul Bouchon	daca7f9b41	Merge branch 'develop' into eip-712	2018-09-17 12:11:10 -04:00
Chad Grimaldi	2f14f978e3	compute and display checksummed hash in selected-account component (#5255)	2018-09-15 13:31:21 -07:00
Sean	cd28dbb1d5	Improvement: Increase click area for arrows (#5264)	2018-09-15 12:22:10 -07:00
Alexander Tseung	b062fe2e99	Fix speed up functionality	2018-09-14 20:29:15 -07:00
Whymarrh Whitby	d34edaada1	Merge pull request #5261 from lastblocklabs/style-fix-5242 ... lower input z-index to prevent overlap - follow up style fix to #5242	2018-09-14 09:17:43 -07:00
Sean Rabaut	c5b9409701	Bug Fix: #5183 history not defined	2018-09-13 20:18:58 -04:00
chadmg	055ddd5f1e	follow up style fix to #5242	2018-09-13 19:23:04 -04:00
bitpshr	42fdcf6239	Update new method namespace from v2 to v3	2018-09-13 15:42:27 -04:00
bitpshr	36dd0354e7	Implement latest EIP-712 protocol	2018-09-13 15:40:57 -04:00
Alexander Tseung	16d6cd5eb9	Merge pull request #5182 from MetaMask/tx-activity ... Add Transaction Details to the Transaction List view	2018-09-12 20:07:59 -07:00
Chad Grimaldi	014240b066	increase z-index of send-to input to allow for right-click (#5242)	2018-09-12 19:57:35 -07:00
Alexander Tseung	f1a309e0cc	Fix identicon address. Fix styling of New Contract recipient. Fix Activity Log initial ETH value. Add timestamps to Activity Log events	2018-09-12 19:48:52 -07:00
Alexander Tseung	c18c0e1c30	Fix tests. Add className to Identicon ethLogos.	2018-09-12 19:48:52 -07:00
Alexander Tseung	c04d9095dd	Add WEI to getEthConversionFromWeiHex	2018-09-12 19:48:52 -07:00
Alexander Tseung	01e9f03701	Add transaction details to TransactionListItem component	2018-09-12 19:48:52 -07:00
Alexander Tseung	5beb34aa52	Add TransactionListItemDetails component	2018-09-12 19:48:52 -07:00
Alexander Tseung	fd51ab1229	Add TransactionBreakdown component	2018-09-12 19:48:52 -07:00
Alexander Tseung	084158f1a2	Add tests for TransactionActivityLog. Make changes to rendering events	2018-09-12 19:48:52 -07:00
Alexander Tseung	8143f7725a	Edit styling of cards variant of SenderToRecipient component	2018-09-12 19:48:51 -07:00
Alexander Tseung	63ba6d1df4	Add HexToDecimal component	2018-09-12 19:48:51 -07:00
Alexander Tseung	18c94c4ac9	Add tests for Card component	2018-09-12 19:48:51 -07:00
Alexander Tseung	702b756882	Allow denominations in CurrencyDisplay component	2018-09-12 19:48:51 -07:00
Alexander Tseung	e5ca2aac6f	Allow more than 2 variable substitutions in the translation function	2018-09-12 19:48:51 -07:00
Alexander Tseung	31089778ba	Add raised type buttons to Button component. Refactor all buttons within app to Button components	2018-09-12 19:48:51 -07:00
Alexander Tseung	930dac110a	Add ActivityLog component	2018-09-12 19:48:51 -07:00
Frankie	1552fe1c3e	Merge pull request #5216 from MetaMask/tx-cancel ... Add createCancelTransaction method	2018-09-10 13:29:29 -10:00
Frankie	a43e71693f	Merge pull request #5223 from whymarrh/tx-error-tooltips ... Show transaction error message tooltips for statuses	2018-09-10 13:25:59 -10:00
Whymarrh Whitby	8541442b8d	Clear old seed words when importing new seed words	2018-09-10 14:04:58 -07:00
Alexander Tseung	43de189d06	Add createCancelTransaction method	2018-09-10 12:48:01 -07:00
brunobar79	26333ee830	fix merge conflicts	2018-09-10 13:16:37 -04:00
Whymarrh Whitby	e39050f4fe	Show failed tx txMeta.err in tooltips	2018-09-08 20:56:02 -02:30
Whymarrh Whitby	9662f9b8b5	Show failed tx RPC error messages in tooltips ... This changeset displays the error messages attached to txMeta for a failed tx in a tooltip on hover in the tx list view. This will only display for txs with the `txMeta.err.rpc.value` property, not all failed txs.	2018-09-08 20:50:31 -02:30
Whymarrh Whitby	47b32682f3	Don't render tooltips without titles	2018-09-08 20:50:31 -02:30
Whymarrh Whitby	db241e6b91	Rewrite Tooltip component as ES6	2018-09-08 20:50:31 -02:30
Eugene Marinelli	d27332955c	Use correct loading message when connecting to Kovan (#5189) ... * Use correct loading message when connecting to Kovan * Update CHANGELOG.md * Update CHANGELOG.md * Update CHANGELOG.md	2018-09-06 12:20:55 -02:30
brunobar79	8ee01f4e99	Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5	2018-09-05 16:26:09 -04:00
Whymarrh Whitby	05c72070bb	Fix assertion of missing child component	2018-09-05 16:35:37 -02:30
Dan J Miller	bd49098039	Merge pull request #5188 from taobun/develop ... edit decimal check in old-ui/	2018-09-04 21:39:01 -02:30
Dan Finlay	5043451356	Merge pull request #5167 from MetaMask/fix-watcAsset-images ... Fix images for watched tokens	2018-09-04 12:56:56 -07:00
Dan J Miller	86bb96aaaf	Merge pull request #5129 from MetaMask/add-sidebar-component ... Add sidebar component	2018-09-04 16:19:09 -02:30
bunoi	f412b19244	fix check valid decimals code in new ui	2018-09-04 23:40:02 +07:00
Dan J Miller	b9e4feac48	Merge pull request #5091 from MetaMask/i4945-feature-flag-hex-data ... Adds feature flag toggle for the hex data row on the send screen.	2018-09-04 11:57:40 -02:30
Esteban MIno	165a966a2a	balance components using selectors	2018-08-30 17:19:10 -03:00
Esteban MIno	63397047cf	fix integration test for asset images selectors	2018-08-30 15:09:59 -03:00
Esteban MIno	c8e5068537	fix watched tokens images showing in tx list	2018-08-30 13:51:57 -03:00
Esteban MIno	208312b239	fix watched asset image rendering on confirm transaction header	2018-08-30 12:59:44 -03:00
Esteban MIno	07cb6adc31	fix images for watched tokens	2018-08-29 23:13:25 -03:00
Dan Miller	40e0d92f57	Adds sidebar component and refactors slide in wallet view sidebar to use it.	2018-08-28 22:08:15 -02:30
Alexander Tseung	9ab0354e36	Merge pull request #5155 from MetaMask/i5154-confirm-spinner ... Fix infinite spinner on failed transactions	2018-08-28 17:37:13 -07:00
Alexander Tseung	f78dc96a2c	Fix infinite spinner on failed transactions	2018-08-28 12:18:57 -07:00
Esteban MIno	e743f44150	fix conflicts	2018-08-28 15:20:30 -03:00
Alexander Tseung	0259eb0214	Merge pull request #5121 from MetaMask/i5099-approve ... Prevent token symbol from showing as null in the confirm screen	2018-08-27 15:28:29 -07:00
Dan Miller	65873e33e4	Adds feature flag toggle for the hex data row on the send screen.	2018-08-27 11:44:16 -02:30
Alexander Tseung	c0e97d1739	Fix tests	2018-08-23 19:19:48 -07:00
Alexander Tseung	342522c6cf	Fix naming, add eth.getCode check for actions, fix translations for statuses	2018-08-23 16:45:28 -07:00
Alexander Tseung	eb17151ff4	Change "Outgoing" to "Sent Ether" or "Sent Token"	2018-08-23 16:45:28 -07:00
Alexander Tseung	da0df79047	Add CurrencyDisplay and TokenCurrencyDisplay components	2018-08-23 16:45:27 -07:00
Alexander Tseung	b48a293af0	Update retry transaction logic to use network nonce	2018-08-23 16:45:27 -07:00
Alexander Tseung	5dcd8ceb7b	Fix e2e tests	2018-08-23 16:45:27 -07:00
Alexander Tseung	9adf0c4b60	Fix integration tests	2018-08-23 16:45:27 -07:00
Alexander Tseung	c9ec5ed38d	Fix e2e tests	2018-08-23 16:45:27 -07:00
Alexander Tseung	e104744d3b	Fix shapeshift transactions. Delete unused files	2018-08-23 16:45:27 -07:00
Alexander Tseung	33a94332e4	Show token amounts in TransactionListItem for token transfers	2018-08-23 16:45:27 -07:00
Alexander Tseung	5ddd9b55be	Add retry button to TransactionListItem	2018-08-23 16:44:44 -07:00
Alexander Tseung	fa8313f903	Code cleanup	2018-08-23 16:44:44 -07:00
Alexander Tseung	5de48c67a0	Use css grid for TransactionListItem for responsive layout	2018-08-23 16:44:44 -07:00
Alexander Tseung	01f00a9ca6	Add tOrKey function to I18nProvider	2018-08-23 16:44:44 -07:00
Alexander Tseung	5ee40675b9	Refactor transactions list views. Add redesign components	2018-08-23 16:44:44 -07:00
Alexander Tseung	d733bd34fb	Delete unused files	2018-08-23 16:44:44 -07:00
Alexander Tseung	4e0693eaff	Add withMethodData HOC, add higher-order-component folder	2018-08-23 16:44:43 -07:00
Alexander Tseung	40d4ac9ae1	Add TransactionStatus component	2018-08-23 16:44:43 -07:00
Alexander Tseung	8a7547b9cd	Add MenuBar component	2018-08-23 16:44:43 -07:00
Alexander Tseung	d1de5ae94f	Add react-media package to prevent rendering wallet-view twice in the popup view	2018-08-23 16:44:43 -07:00
Alexander Tseung	3b408715c7	Refactor home screen and remove unused files	2018-08-23 16:44:43 -07:00
Esteban MIno	b59a1e91b8	typo watchAsset imageUrl to image	2018-08-23 15:54:40 -03:00
Alexander Tseung	7924dbc0c9	Use eth-contract-metadata data if the token symbol or decimals fail on retrieval	2018-08-22 16:54:18 -07:00
Evgeniy Filatov	9a80d6e859	updated docs, small improvement of recent RPC rendering	2018-08-23 01:26:30 +03:00
Evgeniy Filatov	c0b5e8a088	backported RPC improvements to oldui	2018-08-23 01:18:13 +03:00
Evgeniy Filatov	b23cca1469	implemented improvements to RPC history	2018-08-23 01:18:13 +03:00
Alexander Tseung	25eac2334b	Merge pull request #5089 from MetaMask/i5085-ethcode ... Use eth_getCode to sort transaction action type	2018-08-22 14:48:37 -07:00
Alexander Tseung	865a0d8173	Use eth_getCode to sort transaction action type	2018-08-22 14:19:07 -07:00
Alexander Tseung	d7d141cea5	Fix code readability, use PureComponent over Component	2018-08-22 14:12:01 -07:00
Alexander Tseung	01c0c98501	Add tabs support for PageContainer	2018-08-22 14:12:01 -07:00
Whymarrh Whitby	f495c0e9e0	Merge pull request #5102 from whymarrh/fix-account-export-pw-bug ... Fix export privkey modal password bugs	2018-08-22 16:28:33 -02:30
Whymarrh Whitby	171f6711d9	Merge pull request #5066 from whymarrh/fix-key-export ... Don't re-render the export modal when the selected identity changes	2018-08-22 16:28:17 -02:30
Whymarrh Whitby	1e8e8bdfc8	Don't re-render the export modal when the selected identity changes	2018-08-22 15:38:34 -02:30
Whymarrh Whitby	a90c152485	Update AccountModalContainer to accept a selectedIdentity prop	2018-08-22 15:38:34 -02:30
Whymarrh Whitby	743c6e7ca4	Clear warnings when exportAccount succeeds	2018-08-22 15:38:09 -02:30
Whymarrh Whitby	456f2faf4f	Handle case where keyring is missing in AccountDetailsModal	2018-08-22 15:38:09 -02:30
Alexander Tseung	7294aede4f	Add new variant for SenderToRecipient component	2018-08-22 10:53:20 -07:00
Esteban MIno	153731e462	fix integration tests on balance component with new watchAsset	2018-08-22 12:06:11 -03:00
Esteban MIno	6ccf2811e7	unit tests for watchAsset	2018-08-21 19:17:57 -03:00
Esteban MIno	6fa889abcb	refactor watchToken related functions	2018-08-21 12:59:42 -03:00
brunobar79	0e1605b082	fix comment	2018-08-20 22:17:22 -04:00
brunobar79	ab7eb73ecc	fix merge conflicts	2018-08-20 21:51:35 -04:00
Esteban MIno	81cd29df43	Merge branch 'develop' into WatchTokenFeature	2018-08-20 19:35:38 -03:00
Alexander Tseung	cec87a5b2c	Update logo wordmark	2018-08-18 20:46:56 -07:00
brunobar79	51e4a6d335	fix ledger affiliate link	2018-08-16 21:15:50 -04:00
brunobar79	285814646f	ui ready	2018-08-16 20:41:23 -04:00
Esteban MIno	dbab9a007f	delete according image when token added with watchToken deleted	2018-08-16 21:17:02 -03:00
brunobar79	2ea05e303d	connect screen ready	2018-08-16 19:39:52 -04:00
Esteban MIno	bb868f5834	correct behavior when notification is closed when popup	2018-08-16 20:19:19 -03:00
Esteban MIno	2ace30bcd1	WIP	2018-08-16 18:28:07 -03:00
Esteban MIno	a36ea0e232	show watch asset image from hide token modal	2018-08-16 12:04:43 -03:00
Esteban MIno	b766104c8d	add suggested tokens objects in metamask state	2018-08-15 18:34:57 -03:00
Bruno Barbieri	80fe3ce888	Merge branch 'develop' into ledger-support	2018-08-14 22:55:47 -04:00
brunobar79	82a5ed1e03	remove console logs	2018-08-14 22:40:29 -04:00
brunobar79	53dcad5a3b	more ui	2018-08-14 19:38:23 -04:00
brunobar79	19d1988715	fix	2018-08-14 19:24:15 -04:00
brunobar79	c72ced79ae	ui fixes	2018-08-14 19:22:00 -04:00
Esteban MIno	a4c3f6b65c	add support for images base64 and urls on new ui	2018-08-14 20:08:12 -03:00
Dan Finlay	d7aa1bf5c0	Merge pull request #5060 from MetaMask/bignumber-string ... Cast arguments for new Bignumbers() to string.	2018-08-14 14:36:27 -07:00
Dan Miller	ebb23721ed	Cast arguments for new Bignumbers() to string.	2018-08-14 15:46:58 -02:30
brunobar79	b77cc3d969	fix tx tests	2018-08-14 03:42:23 -04:00
brunobar79	61a279204a	legacy and new hd path working	2018-08-14 01:26:18 -04:00
brunobar79	4e1d8ba19d	good progress adding paths	2018-08-13 19:29:43 -04:00
Whymarrh Whitby	b83a746e4f	Add exportAsFile optional type argument	2018-08-13 18:38:13 -02:30
brunobar79	e6d64cecf8	message signing works	2018-08-11 20:26:34 -04:00
brunobar79	aa6a42e3de	rename keyring	2018-08-11 05:11:21 -04:00
brunobar79	8e842a8947	able to add accounts	2018-08-11 05:02:02 -04:00
brunobar79	78a1cd3314	iframe communication working	2018-08-11 02:35:20 -04:00
brunobar79	5ef80495cf	refactor to support multiple hw wallets	2018-08-10 21:54:34 -04:00
Bruno Barbieri	e2be22a4b7	Merge pull request #4897 from MetaMask/qr-code-scan ... QR Code Scanner	2018-08-10 13:40:06 -04:00
brunobar79	eb2f491458	add error messages	2018-08-10 12:09:54 -04:00
brunobar79	e905c9f055	hide export private key for trezor accounts	2018-08-10 11:56:56 -04:00
Dan J Miller	d4af5b7bec	Merge pull request #5000 from MetaMask/contract-method-conf-sim-failure ... Show error while allowing confirmation of tx where simulation fails	2018-08-08 22:13:41 -02:30
Dan Miller	973325a6c4	Show error while allowing confirmation of transaction where simulation fails	2018-08-08 21:26:25 -02:30
Whymarrh Whitby	51644962e9	Fix lint error in tx-list	2018-08-08 19:32:45 -02:30
brunobar79	d0ccc59e45	add comment	2018-08-08 15:42:25 -04:00
brunobar79	656afeefad	fix merge conflicts	2018-08-08 15:40:04 -04:00
Dan Miller	e98c3b4c01	Get nonce for showing retry button using ethQuery transaction count.	2018-08-08 17:04:42 -02:30
brunobar79	f269021dc3	add submit button type	2018-08-08 12:22:48 -04:00
Dan Miller	c4f1dfb82e	Use token decimals when calculating confirm screen amount for token approvals.	2018-08-08 12:36:59 -02:30
brunobar79	cbbd0d3c75	lint	2018-08-08 03:21:37 -04:00
brunobar79	c6b7e460b5	code review changes	2018-08-08 03:00:39 -04:00
brunobar79	2e0916d8ff	fix merge conflicts	2018-08-08 02:32:35 -04:00
Justin Kat	aab6e366c5	Fixing translations in first-time init menu (#4969)	2018-08-07 23:27:52 -02:30
Esteban MIno	33357e3538	refactor unused code	2018-08-07 19:12:16 -04:00
Esteban Miño	3f57d5f66b	Merge branch 'develop' into WatchTokenFeature	2018-08-07 17:50:58 -04:00
Esteban MIno	00d1f6fec5	watch token on old ui	2018-08-07 17:40:45 -04:00
Esteban MIno	c0cdda8321	Merge branch 'develop' into TokensPerAccountBasis	2018-08-07 14:17:40 -04:00
Esteban MIno	a57f56fdca	clean confirm add token component	2018-08-06 20:06:13 -04:00
Esteban MIno	af35b415ab	new confirm add suggested token component	2018-08-06 20:03:49 -04:00
Esteban MIno	88933f3a66	fix duplicated action	2018-08-06 18:48:18 -04:00
brunobar79	ef9435e3d0	restore qr	2018-08-03 20:26:50 -04:00
Alexander Tseung	f2194e8482	Merge pull request #4948 from MetaMask/i4638-update-font ... Update Font in Account Selector	2018-08-03 17:24:42 -07:00
brunobar79	b1ddaafba2	lint	2018-08-03 20:12:30 -04:00
brunobar79	e9a0feb9e9	fixed issue with input	2018-08-03 20:11:46 -04:00
Alexander Tseung	8e3f0b4202	Update Font in Account Selector	2018-08-03 16:47:50 -07:00
brunobar79	af97ba103c	clear qr code data before scanning	2018-08-03 19:36:01 -04:00
Esteban MIno	9ac9f53a73	eth_watchToken working	2018-08-03 19:24:12 -04:00
brunobar79	71ef4d85da	design complete	2018-08-03 18:57:23 -04:00
Esteban MIno	12dd7a7232	popup initializing with suggested tokens	2018-08-03 18:01:40 -04:00
Alexander Tseung	6d76d4e228	Disable Confirm button on subsequent clicks to prevent confirming multiple times	2018-08-03 14:44:57 -07:00
Esteban MIno	081884bd80	rpc-engine not crashing when eth_watchToken	2018-08-03 16:42:13 -04:00
Esteban MIno	21a61f2987	merge develop	2018-08-03 14:56:02 -04:00
brunobar79	94a89790dc	fix	2018-07-31 18:58:54 -04:00
brunobar79	7a40072f1a	lint	2018-07-31 18:34:18 -04:00
brunobar79	caa9e202cf	lint	2018-07-31 18:32:14 -04:00
brunobar79	710b4e294f	added crossbrowser support and error handling	2018-07-31 18:30:56 -04:00
Dan Miller	0ff0a9c197	Show the retry button on latest tx of earliest nonce.	2018-07-31 16:37:14 -02:30
brunobar79	edb154749d	send to fullscreen if no permission from popup	2018-07-30 22:57:05 -04:00
brunobar79	b673a7a7fc	kill camera stream when unmouting	2018-07-30 18:40:00 -04:00
brunobar79	34617a21c3	copy	2018-07-30 18:36:37 -04:00
brunobar79	d2368d6fe0	clean up css	2018-07-30 18:34:00 -04:00
brunobar79	4339f04e80	use existing modals	2018-07-30 17:50:05 -04:00
brunobar79	b6592ba95f	Merge branch 'develop' of github.com:MetaMask/metamask-extension into qr-code-scan	2018-07-30 15:57:10 -04:00
Esteban Miño	228f48c6e5	Merge branch 'develop' into TokensPerAccountBasis	2018-07-27 16:07:08 -04:00
Alexander Tseung	d0c901d081	Round large exponential numbers	2018-07-27 12:22:10 -07:00
brunobar79	acfcdf52b4	fix unit tests	2018-07-26 21:52:01 -04:00
brunobar79	4de8f5b0d4	fix dependencies	2018-07-26 21:37:43 -04:00
brunobar79	6886429f0b	fix linting errors	2018-07-26 21:22:39 -04:00
brunobar79	bea1cf3f3c	clean up	2018-07-26 21:15:16 -04:00
brunobar79	69f4c8c336	fix merge conflicts	2018-07-26 21:04:03 -04:00
brunobar79	d4a15f22c2	added webrtc-adapter for browser compat	2018-07-26 21:00:48 -04:00
brunobar79	ea028e7506	fully working without tweaking ext. permission	2018-07-26 20:56:58 -04:00
brunobar79	6cd4bc9f4e	working without permission issues	2018-07-26 20:24:39 -04:00
Esteban MIno	2827e13caa	add & delete tokens per network	2018-07-26 19:28:12 -04:00
Alexander Tseung	cd2b67cdd9	Fix overflow for long total strings in confirm string	2018-07-25 22:12:13 -07:00
Dan J Miller	53b440a287	Merge pull request #4885 from MetaMask/RetryOnEarliestPendingTx ... Only show retry button on the earliest pending tx	2018-07-25 23:42:49 -02:30
Esteban MIno	b580f60d74	earliest tx by submittedTime	2018-07-25 20:58:20 -04:00
Esteban MIno	c8d45cb4a8	only show retry button on earliest pending tx	2018-07-25 20:02:12 -04:00
Sara Reynolds	9934690bd9	lint fix	2018-07-25 16:31:33 -07:00
Sara Reynolds	6eadf5b22b	Update prop names	2018-07-25 16:26:30 -07:00
Sara Reynolds	9ca4b66c82	Add tests for Confirm Detail Row	2018-07-25 11:58:51 -07:00
brunobar79	4759915856	fix spinner and qr icon	2018-07-24 22:34:15 -04:00
brunobar79	eeb902dbf0	decent UI	2018-07-24 21:13:17 -04:00
brunobar79	74fd6d1d12	working without injection	2018-07-24 20:32:20 -04:00
Dan J Miller	1f9c52fbf0	Merge pull request #4845 from MetaMask/button-group ... Add ButtonGroup component	2018-07-24 21:47:44 -02:30
Alexander Tseung	152246f3b0	Add close window support to signature requests. Move logic to actions	2018-07-23 20:25:04 -07:00
brunobar79	d5929e5c42	added qr code scanner icon in send transaction	2018-07-23 22:10:57 -04:00
brunobar79	f7ad978474	camera working back and forth	2018-07-23 21:27:51 -04:00
Dan Miller	2359062b62	UI confirm screen closes confirmation window on submit or cancel of a tx	2018-07-23 22:20:06 -02:30
Dan Miller	a146e5ebbc	Adds tests for button group component.	2018-07-23 16:49:28 -02:30
Dan Finlay	b208d33b3b	Merge pull request #4851 from MetaMask/fix-trezor-alert ... Fix trezor "Hardware wallet connected" alert	2018-07-23 11:58:29 -07:00