2824 Commits

Author	SHA1	Message	Date
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
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
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
Dan Finlay	239f5110e9	Merge pull request #4848 from MetaMask/fix-alert-flash ... Fix Banner flash on load	2018-07-23 11:32:56 -07:00
Alexander Tseung	cdda52d799	Add ButtonGroup component	2018-07-23 09:23:43 -07:00
板橋 清信	3554292c02	fix type	2018-07-23 17:23:34 +09:00
板橋 清信	79976b7026	fix token amount	2018-07-23 16:28:45 +09:00
brunobar79	bcbe7fef2e	show alert ONLY when device is connected	2018-07-23 01:18:39 -04:00
brunobar79	e2fa3ba415	refactor Alert component to work properly	2018-07-21 16:02:23 -04:00
Alexander Tseung	469a79f97f	Add fallback options for displaying recipient name in the Confirm screen	2018-07-20 14:23:53 -07:00
Bruno Barbieri	9be2248d7a	Merge pull request #4625 from MetaMask/initial-trezor-support ... Initial trezor support	2018-07-19 15:00:59 -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
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
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	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	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
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
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	d05814a5ad	Merge branch 'develop' into initial-trezor-support	2018-07-16 12:55:13 -04:00
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
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	d21d408d64	Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial-trezor-support	2018-07-13 20:53:22 -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	289795fb12	fix account balance bug	2018-07-13 00:09:42 -04:00
brunobar79	5710e648bd	remove account modal updated	2018-07-12 18:19:33 -04: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
brunobar79	4b528405ea	catching up with develop	2018-07-12 13:19:51 -04:00
brunobar79	07d8bfaec5	Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial-trezor-support	2018-07-12 12:54:08 -04:00
Whymarrh Whitby	d9f98a704e	Add tooltip to new tab icon in tx-view	2018-07-12 12:32:45 -02:30
Whymarrh Whitby	7581a4906f	Add tooltip to menu icon in tx-view	2018-07-12 12:32:45 -02:30
brunobar79	2a0a785324	added tooltip	2018-07-12 00:23:08 -04:00
Alexander Tseung	0d4dbbec2a	Merge pull request #4691 from MetaMask/i4404-confirm-refactor ... Refactor and redesign confirm transaction views	2018-07-11 15:31:50 -10:00
brunobar79	80e875308b	forget device and autiload account features added	2018-07-11 21:21:36 -04:00
Alexander Tseung	67017711df	Fix font sizes, colors. Include data tab for send-eth transaction confirmations that have data	2018-07-11 17:34:51 -07:00
Whymarrh Whitby	9bfcb9c505	Remove unneeded MetaMaskConnect connect wrapper	2018-07-11 17:17:48 -02:30
Whymarrh Whitby	94489b544a	Fallback to English and then the key for I18nProvider#t	2018-07-11 16:50:37 -02:30
Whymarrh Whitby	2526f8a1d8	Inline locale variable in fetchLocale fn	2018-07-11 16:50:37 -02:30
brunobar79	5a2a34591f	clean up	2018-07-11 01:35:37 -04:00
brunobar79	523cf9ad33	account removal is working	2018-07-11 00:20:40 -04:00
Alexander Tseung	2175d03cca	Prevent users from submitting password multiple times on the unlock screen	2018-07-10 20:00:06 -07:00
brunobar79	b9c2994d24	finish warning modal UI	2018-07-10 19:19:29 -04:00
Alexander Tseung	76e80f631e	Fix multiple signature requests showing an infinite spinner	2018-07-10 12:21:09 -07:00
Alexander Tseung	f6e90bb3db	Add unit tests for confirmTransaction duck and util	2018-07-10 00:18:37 -07:00
brunobar79	9b81180ab1	added ui to remove accounts	2018-07-10 00:20:00 -04:00
brunobar79	2de3039b6b	fix account duplication	2018-07-09 17:55:37 -04:00
brunobar79	7cca7ace2e	fix all the account related bugs	2018-07-09 17:24:52 -04:00
Alexander Tseung	7d691c7398	Fix existing unit tests	2018-07-07 18:53:00 -07:00
brunobar79	5127601545	copy updated	2018-07-06 20:37:08 -04:00
brunobar79	dddbb4250b	update connect harwdware screen	2018-07-06 20:04:20 -04:00
Alexander Tseung	a2d9c43fba	Various fixes from PR comments	2018-07-06 16:27:08 -07:00
Alexander Tseung	9cde5ab11b	Use eth-method-registry to get method data	2018-07-06 16:27:08 -07:00
Alexander Tseung	7732cd4100	Display newest transaction	2018-07-06 16:27:08 -07:00
Alexander Tseung	e89549846f	Refactor data flow, signature request routing	2018-07-06 16:27:08 -07:00
Alexander Tseung	ea9d51e427	Refactor and redesign confirm transaction views	2018-07-06 16:27:08 -07:00
brunobar79	7c9d942ba1	Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial-trezor-support	2018-07-06 19:21:18 -04:00
brunobar79	6b2511f94f	UI refactor	2018-07-05 20:59:31 -04:00
brunobar79	6c2730f243	Refactor UI	2018-07-05 17:45:28 -04:00
brunobar79	ba5cde0995	move strings to localization file	2018-07-05 17:04:36 -04:00
brunobar79	313090efcc	added message for non-chrome browsers	2018-07-05 16:11:41 -04:00
Dan J Miller	6595f84d07	Merge pull request #4648 from MetaMask/update-import-from-seed-screen ... Update import from seed screen on new ui.	2018-07-05 16:26:21 -02:30
Dan J Miller	d3920007fa	Merge pull request #4694 from MetaMask/i4660-improve-send-token-error-ui ... Improve send token error ux.	2018-07-05 16:25:59 -02:30
Dan	f006cbf2ce	Delete old restore vault file.	2018-07-05 14:44:08 -02:30
Whymarrh Whitby	60857f94ad	Merge pull request #4733 from whymarrh/fix-setstate-warnings ... Fix setState warnings in components using TokenTracker	2018-07-05 13:59:46 -02:30
Whymarrh Whitby	e59e92e028	Merge pull request #4734 from whymarrh/txlistitem-setstate-warning ... Prevent calling setState in TxListItem after unmount	2018-07-05 13:59:25 -02:30
Dan J Miller	3c75be04a0	Merge pull request #4617 from TrejGun/fix-new-line ... fix white spaces in signature	2018-07-05 13:55:18 -02:30
Whymarrh Whitby	2298daa53e	Prevent calling setState in TxListItem after unmount	2018-07-05 13:17:53 -02:30
Dan J Miller	d4bc943b01	Merge pull request #4686 from MetaMask/tweak-token-list-amount-style ... Ensures token list amount is in its own row.	2018-07-05 12:39:26 -02:30
Whymarrh Whitby	783559f94e	Don't update token balances after tracker is stopped	2018-07-05 10:54:51 -02:30
Whymarrh Whitby	0116ea9b95	Remove TokenTracker listeners when unmounting component	2018-07-05 10:54:51 -02:30
Dan	5d721665d3	Ensures token list amount is in its own row.	2018-07-05 08:07:41 -02:30
Dan J Miller	46cda26f3b	Merge pull request #4685 from MetaMask/estimate-gasprice-background-newui ... Use background gas price estimation method in new ui.	2018-07-05 08:01:03 -02:30
TrejGun	94d1d846fb	Merge branch 'develop' into contextTypes ... # Conflicts: # ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js	2018-07-05 11:34:13 +08:00