65 Commits

Author	SHA1	Message	Date
Alexander Tseung	35875863d2	Fix merge conflicts. Modify send workflow	2018-04-03 01:03:31 -07:00
Dan	7ccf6163fd	Adds simulation failure error messages to confirm screen.	2018-04-02 16:29:35 -02:30
Dan	1dc3c51b54	UpdateSendErrors only called when balance defined, recalled if balance updates.	2018-04-02 16:26:19 -02:30
Alexander Tseung	ba23843f91	Fix merge conflicts	2018-03-30 16:18:48 -07:00
Dan	2be6f8bae0	Fix lint and tests	2018-03-30 02:19:04 -02:30
Dan	893f82491d	Merge branch 'master' into i3471-checkbalanceonconfirmscreen	2018-03-29 23:58:45 -02:30
Dan	a4594f6838	Show insufficient funds on confirm screen on first render.	2018-03-29 15:30:03 -02:30
Alexander Tseung	ef61ef2ce8	Fix i18n merge conflicts	2018-03-29 09:37:29 -07:00
Dan	0a711f0de0	Removes t from props via metamask-connect and instead places it on context via a provider.	2018-03-29 12:42:38 -02:30
kumavis	b324a9c295	Merge branch 'master' into i3471-checkbalanceonconfirmscreen	2018-03-27 19:42:42 -07:00
Dan	74ac3bb2a7	Confirm send token detects if balance is sufficient for gas.	2018-03-27 23:41:20 -02:30
Dan	be2254b880	Remove comments and console.logs	2018-03-27 10:37:45 -02:30
Alexander Tseung	6f367a5a6b	Fix merge conflicts	2018-03-27 00:20:35 -07:00
Dan	d613dfb434	Correct reprice title and subtitle key names.	2018-03-22 01:19:00 -02:30
Dan	a82631791e	Lint fixes	2018-03-21 23:48:10 -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	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
Alexander Tseung	72ffa2c3f5	Fix react-router related exceptions	2018-02-09 12:05:27 -08:00
Alexander Tseung	ecc39c5a7a	Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254	2018-01-29 18:22:52 -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
Alexander Tseung	e226b10a89	Add react-router to allow use of the browser back button	2017-12-14 12:50:20 -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