117 Commits

Author	SHA1	Message	Date
Dan	049071a743	Access correct property from state in confirm screen components gatherTxMeta()	2018-06-08 12:52:38 -02:30
Dan	5091b03e4b	Merge branch 'develop' into i3725-refactor-send-component-	2018-05-31 15:28:03 -02:30
Alexander Tseung	389346913b	Prevent loading screen from overlaying the app bar (#4417)	2018-05-30 10:38:53 -07:00
Alexander Tseung	41e38fe553	Add notification for dropped retry transactions (#4363)	2018-05-29 10:23:06 -07:00
Dan	5bb399e55a	Display correct titles and subtitles on send token and editing send transaction screens.	2018-05-24 17:27:33 -02:30
Dan	440905125d	Merge branch 'develop' into i3725-refactor-send-component-	2018-05-23 16:03:15 -02:30
Alexander Tseung	5561937773	Fix account and network dropdowns in confirm screen	2018-05-14 15:03:04 -07:00
Dan	6bc8cc819a	Merge branch 'develop' into i3725-refactor-send-component-	2018-05-14 11:44:50 -02:30
Dan	0076b732bd	Rename ducks/send.js to ducks/send.duck.js	2018-05-14 09:49:09 -02:30
Dan	7c49009854	Unit tests for containers, utils and selectors in send_/	2018-05-05 11:58:14 -04:00
kumavis	096851d091	Merge pull request #4156 from MetaMask/i4010-spinner ... Fix styling of the app spinner	2018-05-02 17:00:57 -07:00
Alexander Tseung	ffda954add	Fix styling of the app spinner	2018-04-30 18:58:37 -07:00
Dan	26f965bcce	Further refactors; includes refactor of send-v2.js and associated container	2018-04-30 13:05:48 -02:30
Dan	b71dbf52d1	Convert decimals to string in getSymbolAndDecimals; return null for symbol or decimals.	2018-04-27 21:33:56 -02:30
Dan	6de450488b	Wraps calls to symbol() and decimals() in try catch	2018-04-27 20:45:36 -02:30
Dan	33c16d1bf6	Fixes to get tests passing.	2018-04-27 08:11:18 -02:30
Alexander Tseung	053044fb65	Fix spinner layout	2018-04-18 01:03:07 -07:00
Alexander Tseung	de7fc781a5	Fix BigNumber exception in confirm-send-ether	2018-04-18 00:58:40 -07:00
Dan Finlay	6ee57dcad7	Merge branch 'master' into i3580-InternationalizeCurrency	2018-04-17 13:36:21 -07:00
bitpshr	a350e80fee	Fetch token prices based on contract address	2018-04-15 23:46:40 -04:00
Dan	2c4426e4de	Merge branch 'master' into i3580-InternationalizeCurrency	2018-04-09 16:52:26 -02:30
Dan	9dbb9d12ad	Internationalize converted value in confirm screens	2018-04-09 16:45:23 -02:30
Alexander Tseung	1e6f062bb6	Fix integration tests	2018-04-06 11:25:05 -07:00
Alexander Tseung	2db55cd0de	Fix editing transaction	2018-04-05 10:29:16 -07:00
Alexander Tseung	82af778e62	Revert "commit" ... This reverts commit fa8500e09a.	2018-04-05 10:11:09 -07:00
Alexander Tseung	fa8500e09a	commit	2018-04-05 09:53:24 -07:00
Alexander Tseung	5b2ace3b80	Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254	2018-04-04 18:21:35 -07:00
frankiebee	3de1873126	hot-fix new-ui - default to an object if identities is undefined	2018-04-04 13:56:39 -07:00
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	8e6ab7df05	Checking for sufficient balance in confirm ether screen; includes error messages for user.	2018-03-27 22:38:04 -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	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