1683 Commits

Author	SHA1	Message	Date
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
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
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
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
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	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
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	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
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	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
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
Alexander Tseung	cdda52d799	Add ButtonGroup component	2018-07-23 09:23:43 -07: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	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
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
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	2298daa53e	Prevent calling setState in TxListItem after unmount	2018-07-05 13:17:53 -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
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
trejgun	c94f639de5	convert contextType to static prop for refactored components	2018-07-05 11:33:34 +08:00
TrejGun	b427743ab8	fix classname	2018-07-05 11:21:27 +08:00
Анна	90934bca46	Merge branch 'develop' into to-autocomplete	2018-07-05 11:15:28 +08:00
Dan	f262f0ea64	Update import from seed screen on new ui.	2018-07-04 21:21:12 -02:30
Dan	0796fc58e4	Improve send token error ux.	2018-07-04 16:09:29 -02:30
Sara Reynolds	6bc7647c05	fixes 4666	2018-07-03 16:05:20 -07:00
brunobar79	9d3f2435e5	lint fix	2018-07-03 15:46:15 -04:00
brunobar79	3837c2ddd7	fix merge conflicts	2018-07-03 15:41:18 -04:00
Dan J Miller	a049627752	Merge pull request #4716 from MetaMask/i4663-clearErrorMessages ... fixes #4663 - Clear Error Messages when Importing Accounts are Successful	2018-07-03 16:03:55 -02:30
Alexander Tseung	3fd5af636f	Merge pull request #4633 from MetaMask/i4580-import-account-errors ... Show all errors on account creation screen.	2018-07-03 07:43:40 -10:00
Dan J Miller	4bdd59b055	Merge pull request #4699 from TrejGun/removeLeadingZeroes ... move removeLeadingZeroes to utils, add test	2018-07-03 15:01:48 -02:30
brunobar79	3290421e2f	fix merge conflicts	2018-07-03 13:31:30 -04:00
Sara Reynolds	d126887bc3	fixes 4663	2018-07-03 09:50:59 -07:00
trejgun	1f6bf0a80d	fixes #4664	2018-07-03 10:34:39 +08:00
brunobar79	a8f745f9fe	eslint --fix .	2018-07-02 18:49:33 -04:00
brunobar79	f19ffaf08d	move hardcoded strings to localization file	2018-07-02 15:16:05 -04:00
brunobar79	86a8c98148	always open connect hardware in full screen mode	2018-07-02 15:14:57 -04:00
trejgun	491f2d03cf	move removeLeadingZeroes to utils, add test	2018-07-02 09:36:57 +08:00
brunobar79	1494cc5e6c	fix merge conflicts	2018-07-01 11:41:34 -10:00
Dan J Miller	b2e64f24ec	Merge pull request #4687 from snreynolds/i4623-getConvertedCurrency ... fixes #4623	2018-06-29 17:03:09 -02:30
Dan J Miller	22debbfec8	Merge pull request #4640 from weijiekoh/develop ... Fix for #4639: display values of EIP712 typed boolean fields in the signing prompt	2018-06-29 17:00:51 -02:30
Sara Reynolds	ad6c454fd5	fixes #4623	2018-06-29 11:54:49 -07:00
Dan J Miller	f6238b2d39	Merge pull request #4647 from MetaMask/fix-overflow-currency-display ... Fix issues with scrollbar in currency display.	2018-06-29 16:06:29 -02:30
Dan J Miller	464b97890d	Improve attribute syntax in send-amount-row.component.js	2018-06-29 15:44:30 -02:30
Dan Finlay	a1fb1b8d3e	Merge pull request #4690 from MetaMask/i4662-token-gas-estimate-ux ... Set base estimate for token sends to be updated once recipient address specified	2018-06-28 17:48:05 -10:00
Dan	03f17d910a	Check that error is defined in import-account error catch.	2018-06-28 21:45:46 -02:30
Dan	75581ceebe	Show all errors on account creation screen.	2018-06-28 21:45:46 -02:30
Dan	d2845afd89	Remove input arrows for send screen amount row on firefox.	2018-06-28 21:45:04 -02:30
Dan	d5133fb429	Fix issues with scrollbar in currency display.	2018-06-28 21:45:04 -02:30
Thomas Huang	218f2e84db	Merge pull request #4634 from MetaMask/i4503-touch-up-shpshft-button-style ... Fix style of shapeshift screen in deposit modal.	2018-06-28 16:57:32 -07:00
Dan	696d626133	Set based estimate for token sends to be updated once recipient address specified.	2018-06-28 21:03:09 -02:30
Dan J Miller	9f5ee94b69	Merge pull request #4678 from MetaMask/e2e-beta-tests-upgrade ... E2e beta tests upgrade	2018-06-28 20:17:44 -02:30
Thomas Huang	db548adca7	Merge pull request #4674 from MetaMask/removeOnlyTests ... Remove .only on test	2018-06-28 13:26:29 -07:00
Dan J Miller	08b69a0cb0	Merge pull request #4677 from MetaMask/customize-gas-loading-wait ... Only show the customize gas modal if the estimateGas call is not currently in flight.	2018-06-27 17:27:51 -02:30
Dan J Miller	1839ab5346	Merge pull request #4574 from MetaMask/i4409-i4410-ens-input-enhancements ... [new-ui] Improve ENS input errors and update ens validation on network change	2018-06-27 17:09:44 -02:30
Dan	f5d43404dc	Fix send token tests in beta ui e2e tests.	2018-06-27 11:01:26 -02:30
Dan	a242668872	Only show the customize gas modal if the estimateGas call is not currently in flight.	2018-06-27 11:01:26 -02:30
tmashuang	fb02e71e22	Remove .only on test	2018-06-26 18:14:21 -07:00
Dan J Miller	60feeb393b	Merge pull request #4627 from TrejGun/gas-fee-display ... refactor gas-fee-display component	2018-06-26 16:25:26 -02:30
trejgun	e05eeb56da	fix default import	2018-06-23 07:41:11 +08:00
Koh Wei Jie	cd90e8a869	removed stray console.log	2018-06-22 16:46:00 +08:00
Koh Wei Jie	1ff29c5b4a	fixed blank boolean field for typed signing for new UI	2018-06-22 16:38:54 +08:00
Dan	e8fa18779d	Fix style of shapeshift screen in deposit modal.	2018-06-21 15:50:51 -02:30
Dan	97a7bc4894	Remove commented out code in ens-input.	2018-06-21 15:01:13 -02:30
trejgun	778aec8c75	lint	2018-06-21 15:03:19 +08:00
trejgun	c27dfb01bb	refactor gas-fee-display component ... #4622	2018-06-21 14:43:48 +08:00
Whymarrh Whitby	3123073659	Scroll large amounts in the send component	2018-06-20 16:15:22 -02:30