72 Commits

Author	SHA1	Message	Date
Dan	be2254b880	Remove comments and console.logs	2018-03-27 10:37:45 -02:30
Dan	d613dfb434	Correct reprice title and subtitle key names.	2018-03-22 01:19:00 -02:30
Dan	3d3bd0eaf0	Correct connect reference in confirm-send-ether, confirm-deploy-contract, network-display.	2018-03-22 00:08:01 -02:30
Dan	a82631791e	Lint fixes	2018-03-21 23:48:10 -02:30
Dan	6cbadc0aa3	Missed modifications of t() in merge resolution.	2018-03-21 22:54:52 -02:30
Dan	be845fd190	Merge branch 'master' into i18n-translator-redux	2018-03-21 22:28:58 -02:30
Dan	d24a0590d3	i18n redux solution doesn't require importing t() and passing state to each t() call; t is just available on props.	2018-03-21 22:11:47 -02:30
kumavis	3e79941658	ui - tx conf - only show special token tx conf screen for token send	2018-03-21 13:12:59 -07:00
kumavis	3595d71c2d	Merge branch 'i3554-fix-editing-dapp-token-txs' of https://github.com/danjm/metamask-extension into danjm-i3554-fix-editing-dapp-token-txs	2018-03-21 12:53:28 -07:00
kumavis	29cc2f8ab9	Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-translator-redux	2018-03-20 13:01:08 -07:00
Alexander Tseung	3c1248c816	Update confirm transaction screen	2018-03-20 11:56:12 -07:00
Dan	dc92b56f18	Identify token transactions by method names token data, and not just whether they've been add via metamask.	2018-03-20 09:07:23 -02:30
Dan	2ddc2cc1fb	Lint fixes.	2018-03-19 16:53:06 -02:30
Dan	09260f9c5e	Fixed t() calls where localeMessages is missing; and fix incorrect connect reference.	2018-03-19 16:39:37 -02:30
Dan	d8788af9b8	Merge branch 'master' into retry-tx-refractor	2018-03-19 15:30:47 -02:30
Dan	5733820024	Merge branch 'master' into i18n-translator-redux	2018-03-19 14:39:04 -02:30
Alexander Tseung	4512243290	Fix styling on confirm-send-ether and confirm-send-token (#3600)	2018-03-16 16:39:00 -07:00
Alexander Tseung	6f749e5576	Update Confirm Contract screen (#3597)	2018-03-16 13:09:49 -07:00
Dan	5fe0be722b	Handle i18n with redux.	2018-03-15 21:59:45 -02:30
Dan	b0122be3c9	Set retry gasPrice to forceGasMin on confirm screen in cases where gas is not edited.	2018-03-14 22:45:10 -02:30
Dan	66422cd083	Force gas min has correct precision and is set when editing gas if max.	2018-03-14 22:29:43 -02:30
kumavis	34aeef50a0	i18n - load locales manually	2018-03-14 16:32:35 -07:00
Dan	a4c6a5e92e	Ensure changes from customize gas modal opened from confirm screen are captured for non-tx transactions.	2018-03-14 17:10:59 -02:30
Dan	fb838da734	Revert 'Set txMeta.time to reflect time of tx approval.'	2018-03-14 17:07:09 -02:30
Dan	798988597b	Merge branch 'master' into retry-tx-refractor	2018-03-14 00:02:27 -02:30
Dan	cc267d6c81	Fix more lint errors.	2018-03-13 23:56:45 -02:30
Dan	c37684d7bd	Remove unnecessary addition of nonce to state.	2018-03-13 23:49:10 -02:30
Dan	e94a14ef8a	Make token confirmations compatible.	2018-03-13 23:44:05 -02:30
Dan	d6e4d2e80d	Use new submittedTime field to correctly show retry button in old and new ui.	2018-03-13 21:15:35 -02:30
Dan	179066fe6b	Set txMeta.time to reflect time of tx approval.	2018-03-13 03:26:37 -02:30
Dan	e6d1ce56e7	Improve phrasing of copy.	2018-03-13 03:11:45 -02:30
Dan	f805a2eb73	Fix gas calculation and nonce / forceGasMin state setting errors; retry button shows on correct tx.	2018-03-13 03:09:38 -02:30
Thomas Huang	b7c7083a11	Merge branch 'master' into i18n	2018-03-12 10:50:55 -04:00
Alexander Tseung	d84341f323	Add empty object default value for tokenData (#3493)	2018-03-09 16:31:17 +01:00
Dan	c1ff927fa0	Lint fixes.	2018-03-09 10:00:37 -03:30
Dan	2d6b378bf8	Adds inline opening of gas customization to confirm-send-ether screen.	2018-03-09 02:03:36 -03:30
Dan	5433d2fe3a	Retry transaction logic added to tx-list-item, confirm-send-ether, customize-gas-modal, and dependents.	2018-03-09 00:19:26 -03:30
Dan	9d215bab0f	Merge branch 'master' into i18n	2018-03-06 20:45:45 -03:30
Dan J Miller	35c762da47	Updates the styling of confirm send ether and token screens. (#3235)	2018-02-12 22:51:05 -08:00
Nick Doiron	abfa74f09a	complete i18n across new UI	2018-01-29 15:29:01 -05:00
Nick Doiron	7da52c5997	separate out cross-browser i18n for extensions	2018-01-24 10:10:28 -10:00
Nick Doiron	99898ac775	better organization of locale file; i18n in more view files	2018-01-23 22:14:47 -10:00
Alexander Tseung	376e136572	Update styling for buttons, font weights	2018-01-11 16:30:07 -08:00
Dan	5fe3c5aae6	Lint fixes.	2017-12-20 17:37:18 -08:00
Dan	bf4043c59b	Adds updateTransaction to background and used it to update after editing in send-v2.	2017-12-20 17:37:18 -08:00
Dan	1f1fc2c49e	Canceled, edited transactions show edited amount.	2017-12-20 17:37:18 -08:00
Dan J Miller	339eb7d1a6	Fix edit to field bug. (#2738)	2017-12-12 22:24:41 -08:00
Dan	9e3f921ba9	Create single action for updating all of send in redux state.	2017-11-14 16:18:00 -08:00
Dan	4671f28476	Allow editing of token transactions.	2017-11-14 16:18:00 -08:00
Dan	0a91671ff6	Fix lint errors.	2017-11-14 16:18:00 -08:00