2101 Commits

Author	SHA1	Message	Date
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	18f8583529	Fix references to undefined 'this.props'	2018-03-21 23:10:28 -02:30
Dan	3c144302d6	Remove console.logs	2018-03-21 22:57:09 -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	e005e9ac51	Merge pull request #3624 from alextsg/cb-941 ... Update confirm transaction screen	2018-03-20 17:15:59 -07:00
Dan J Miller	a69480d78d	Gas inputs can be changed by up and down arrows (#3598) ... * Up and down arrows can control gas inputs. * input-number.js just uses number type.	2018-03-20 15:50:30 -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
kumavis	fd3e240dd9	Merge pull request #3635 from MetaMask/i3571-CompleteI18nTemplates ... I3571 complete i18n templates	2018-03-20 12:40:16 -07:00
kumavis	1ab165b6d7	Merge pull request #3632 from MetaMask/retry-tx-refractor ... Retry tx refractor	2018-03-20 12:11:50 -07:00
Thomas	dd19a93447	Add i18n to tx status	2018-03-20 12:06:59 -07:00
Alexander Tseung	3c1248c816	Update confirm transaction screen	2018-03-20 11:56:12 -07:00
Thomas	d4eb883958	Merge branch 'master' into i3571-CompleteI18nTemplates	2018-03-20 11:35:59 -07:00
Dan	3830f49ac5	Take user home if an unapproved tx is dropped while they are viewing.	2018-03-20 15:52:45 -02:30
Thomas	4fc68ca208	Add i18n in settings/info	2018-03-20 10:56:35 -07:00
kumavis	5d316d9a4e	Merge pull request #3623 from MetaMask/i#3554 ... new-ui - dont exclude `txParams.data` when editing and updating txParams	2018-03-20 10:44:48 -07:00
Thomas	7a8e080245	Started on Tx list i18n	2018-03-20 10:29:22 -07:00
Thomas	cffaf44714	i18n Import flow	2018-03-20 09:49:12 -07:00
Dan	49e3ada382	Fix styling regression from master merge.	2018-03-20 13:28:59 -02:30
Dan	36b371283c	Improve responsiveness of gas price row on confirm screen.	2018-03-20 12:41:03 -02:30
Dan	d9160ac6da	Merge branch 'master' into retry-tx-refractor	2018-03-20 09:27:27 -02:30
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
Alexander Tseung	4af1003b0e	Fix Account Names being cropped (#3626)	2018-03-20 09:02:20 -02:30
Thomas	85a612b34d	I18n add-token.js	2018-03-20 02:34:12 -07:00
Dan J Miller	5cdaf270f7	Don't block user from setting gas if estimating gas returns errors. (#3627)	2018-03-20 06:47:45 -02:30
frankiebee	faa4ffe163	new-ui - dont exclude txParams.data when editing and updating txParams	2018-03-19 14:32:58 -07:00
Dan Finlay	f5b0d56b9d	Add send screen template	2018-03-19 12:38:14 -07:00
Dan	2ddc2cc1fb	Lint fixes.	2018-03-19 16:53:06 -02:30
Dan	4d1793b0ec	Merge branch 'master' into i18n-translator-redux	2018-03-19 16:40:48 -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 Finlay	293ca6c9a6	Add template for settings and info	2018-03-19 12:03:35 -07:00
Dan Finlay	2e7d4db2de	Add recover and backup tempaltes	2018-03-19 11:43:22 -07:00
Dan Finlay	17371bb7ec	Add login templates	2018-03-19 11:30:45 -07:00
Dan Finlay	e504bc6215	Add connecting indication templates	2018-03-19 11:28:02 -07:00
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
Thomas Huang	424e98f6a8	Merge pull request #3594 from danjm/i3344-improve-currency-input ... Currency input defaults to empty string	2018-03-19 09:20:04 -07:00
Dan	98f934fb53	Delete commented out code from i18n implementation that used globals.	2018-03-19 13:38:22 -02:30
Dan	3191f2aa5e	Delete old i18n helper files.	2018-03-19 13:37:07 -02:30
Dan	a51e8f6a16	Fetch localeMessages in front end only.	2018-03-19 13:36:16 -02:30
anticlimactic	a1db40047c	Remove unused files from ui folder. (#3577) ... * Removed unused UI files. Fixes #3434. * Reverted the deletion of "feature-toggle-utils.js". Reverted the deletion of the test files and modified the paths so they referred to the old-ui.	2018-03-19 12:41:24 -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	a348b60735	Currency input defaults to empty string	2018-03-16 15:38:29 -02:30
Alexander Tseung	7fb27cf0c7	Update margins for consistency in first time flow (#3588)	2018-03-16 08:50:21 -07:00
Dan	5fe0be722b	Handle i18n with redux.	2018-03-15 21:59:45 -02:30