332 Commits

Author	SHA1	Message	Date
brunobar79	1494cc5e6c	fix merge conflicts	2018-07-01 11:41:34 -10:00
Dan	957d729c17	Only show the customize gas modal if the estimateGas call is not currently in flight.	2018-06-19 13:23:33 -02:30
Bruno	8c4d58aa45	initial trezor support	2018-06-10 03:52:32 -04:00
Dan	ae55e8a3c1	Merge branch 'develop' into i3725-refactor-send-component-	2018-06-06 16:40:43 -02:30
Dan	8f0a3b8311	Merge branch 'develop' into handle-import-account-failure-in-ui	2018-06-03 06:46:45 -02:30
Dan	1b879f45bc	Fix calculation of data property for gas estimation on token transfers.	2018-06-02 01:53:01 -02:30
Dan	701611e317	Merge branch 'i3725-refactor-send-component-' into i3914-fix-newui-send-gas-estimation	2018-05-31 15:39:24 -02:30
Dan	5091b03e4b	Merge branch 'develop' into i3725-refactor-send-component-	2018-05-31 15:28:03 -02:30
Alexander Tseung	cc73d869fe	Add new alert modals	2018-05-31 10:37:52 -07:00
Dan	0f20fce9b7	Auto update gas estimate when to changes.	2018-05-30 20:54:31 -02:30
Dan	4f0b4eef50	Estimate gas using same algorithm as backend.	2018-05-30 20:54:31 -02:30
Dan	166fda5877	Simplify gas estimate actions and add local estimateGasPriceFromRecentBlocks method.	2018-05-30 20:54:31 -02:30
Dan	17909465f2	getParamsForGasEstimate extracts symbol from token instead of just accepting symbol.	2018-05-30 20:54:31 -02:30
Dan	6f633a97e1	Rename gas change actions.	2018-05-30 20:54:31 -02:30
Dan	8b6d08a15d	Split out getGasEstimate logic from updateGasTotal	2018-05-30 20:54:31 -02:30
Dan	1c3d2aa18b	Importing account by json and private key shows error and does not change account if no selectedAddress comes after import.	2018-05-30 17:00:50 -02:30
Alexander Tseung	41e38fe553	Add notification for dropped retry transactions (#4363)	2018-05-29 10:23:06 -07:00
Dan	c4e48d9263	Send refactor: fix amount max button for tokens.	2018-05-23 16:56:13 -02:30
Dan	440905125d	Merge branch 'develop' into i3725-refactor-send-component-	2018-05-23 16:03:15 -02:30
kumavis	b5bbfd3264	Merge pull request #4308 from MetaMask/i4232-addtoken ... Update designs for Add Token screen	2018-05-22 12:53:59 -07:00
Alexander Tseung	4f6b53c1aa	Update designs for Add Token screen	2018-05-19 23:04:19 -07:00
Whymarrh Whitby	924cc1fcf7	Move setAccountLabel into PreferencesController	2018-05-17 12:57:39 -02:30
kumavis	c27d9162d7	Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-controller-remove-setNetworkEndpoints	2018-05-16 11:57:07 -07:00
Dan	6bc8cc819a	Merge branch 'develop' into i3725-refactor-send-component-	2018-05-14 11:44:50 -02:30
Alexander Tseung	2381c0e0f4	Add new unlock screen design	2018-05-11 12:49:17 -07:00
kumavis	0e48ddfceb	ui - actions - importNewAccount - rethrow err on failure	2018-05-01 11:16:35 -07:00
kumavis	6f316ca450	network - remove setNetworkEndpoints	2018-04-30 16:36:17 -07:00
kumavis	bce7adac85	ui - actions - importNewAccount - use async and pify for cleaner syntax	2018-04-30 14:46:53 -07:00
Dan	26f965bcce	Further refactors; includes refactor of send-v2.js and associated container	2018-04-30 13:05:48 -02:30
Dan	02a6d2089e	Merge branch 'master' into i3725-refactor-send-component	2018-04-24 13:31:39 -02:30
Alexander Tseung	3082d2e4ef	Use new design for reveal seed screen. Persist seed words only in first time flow	2018-04-22 09:24:21 -07:00
Alexander Tseung	477b74124d	Revert "Fix UI getting stuck in Reveal Seed screen" ... This reverts commit 2c8156ebe9.	2018-04-21 22:23:45 -07:00
Alexander Tseung	1d80a4c452	Fix exception thrown when revealing seed words	2018-04-18 16:10:42 -07:00
Alexander Tseung	2c8156ebe9	Fix UI getting stuck in Reveal Seed screen	2018-04-18 10:18:24 -07:00
Dan Finlay	0668976514	Merge branch 'master' into i3981-contract-rates	2018-04-16 16:32:56 -07:00
bitpshr	d0447f9058	Maintain token prices using a background service	2018-04-16 11:47:06 -04:00
bitpshr	a350e80fee	Fetch token prices based on contract address	2018-04-15 23:46:40 -04:00
bitpshr	7129d7c0f3	Require loglevel singleton in each module that uses it	2018-04-13 17:56:28 -04:00
Dan	f4d8da9277	Merge branch 'master' into i3725-refactor-send-component	2018-04-10 07:19:01 -02:30
Dan	284dd85a99	first commit	2018-04-06 19:59:51 -02:30
Alexander Tseung	35875863d2	Fix merge conflicts. Modify send workflow	2018-04-03 01:03:31 -07:00
Alexander Tseung	6277a4c46a	Refactor onboarding flow	2018-04-02 02:59:49 -07:00
kumavis	5f1f345a5d	network - use providerType for localhost	2018-03-30 10:59:39 -07:00
Alexander Tseung	ef61ef2ce8	Fix i18n merge conflicts	2018-03-29 09:37:29 -07:00
kumavis	ff26042b0c	ui - actions - fix log for background call	2018-03-27 18:21:46 -07:00
Alexander Tseung	6f367a5a6b	Fix merge conflicts	2018-03-27 00:20:35 -07:00
Dan	4f0881e41b	Merge branch 'master' into i18n-translator-redux	2018-03-26 16:13:49 -02:30
Dan	a109a774a5	Use ens-input component in send-v2 to allow sending to ens names.	2018-03-26 11:40:11 -02:30
kumavis	29cc2f8ab9	Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-translator-redux	2018-03-20 13:01:08 -07:00
Dan	2ddc2cc1fb	Lint fixes.	2018-03-19 16:53:06 -02:30