47 Commits

Author	SHA1	Message	Date
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	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
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
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	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	e94a14ef8a	Make token confirmations compatible.	2018-03-13 23:44:05 -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	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	67bdfe87e3	Token balance in send state; validating sufficient tokens, validation updates on 'from' switching.	2017-11-06 15:57:57 -03:30
Dan	56e9f98bd0	More lint fixes	2017-11-02 09:45:59 -02:30
Dan	5a94775b3f	Lint fixes for NewUI-flat.	2017-11-02 00:00:33 -02:30
Dan	220da24f9a	Change min gas price to 0.1 GWEI	2017-10-26 12:25:33 -07:00
Chi Kei Chan	7c10cda8a4	Fix alignment on right arrow of confirm tx screens	2017-10-25 00:24:26 -07:00
Dan	b3dad510b7	Improve precision in send and confirm.	2017-10-23 15:53:28 -02:30
Chi Kei Chan	5eb3cf43bf	Add resiliency to confirm-send-token	2017-10-20 16:18:25 -07:00
Dan	80025e278b	Fixes regression in confirm-send-token	2017-10-20 18:17:13 -02:30
Chi Kei Chan	f1c097ab5c	Merge branch 'NewUI-flat' into MM-128-get-currentCurrency-from-state	2017-10-19 12:35:39 -07:00
Dan	7362fb8dfc	Identicon in send token show who you are sending to, not the token's identicon.	2017-10-19 12:34:14 -07:00
Dan	89af385a35	Fix handling of arithmetic on token gas in confirm-send-token.	2017-10-19 12:34:14 -07:00
Dan	332c7441b6	Get currency from state in account details, send and confirm screens.	2017-10-19 16:30:54 -02:30
Chi Kei Chan	d4343fe7e5	Fix recipient on send token	2017-10-10 14:36:13 -07:00
Chi Kei Chan	c221f5ce79	Confirm Token and Confirm Contract v2	2017-10-10 14:30:20 -07:00
Chi Kei Chan	e1077836ce	Add Confirm Send token screen	2017-09-22 14:38:17 -07:00