1166 Commits

Author	SHA1	Message	Date
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	1e6f062bb6	Fix integration tests	2018-04-06 11:25:05 -07:00
Alexander Tseung	4c15c0d3ba	Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254	2018-04-05 23:17:22 -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	9d7e49fc3b	Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254	2018-04-05 10:07:14 -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
Dan	40bbca5d0d	Don't prevent user from setting an eth address in to field if there is no ens support.	2018-04-04 15:45:29 -02:30
Alexander Tseung	34e608e9dc	Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254	2018-04-03 17:06:00 -07:00
Alexander Tseung	bf38aa6f1d	Fix transaction confirmations	2018-04-03 16:59:32 -07:00
Alexander Tseung	35875863d2	Fix merge conflicts. Modify send workflow	2018-04-03 01:03:31 -07:00
Alexander Tseung	516c1869b0	Fix lint errors	2018-04-02 16:24:37 -07:00
kumavis	15ba31897c	Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens	2018-04-02 15:51:15 -07:00
kumavis	98e0fc1ab9	Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens	2018-04-02 14:13:45 -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	6277a4c46a	Refactor onboarding flow	2018-04-02 02:59:49 -07:00
kumavis	9f7b63bb6a	identicon - set blockies height and width to identicon diameter	2018-03-30 21:45:49 -07:00
kumavis	ee1acf0a7e	Merge pull request #3774 from danjm/i3686-txparamundefined-sigrequestsintxlist ... Fix display of unapprovedMgs in txList; fix txParams undefined errors	2018-03-30 18:36:39 -07:00
kumavis	2e57c36f36	Merge pull request #3762 from danjm/i3471-checkbalanceonconfirmscreen ... Checking for sufficient balance in tx confirmation screen	2018-03-30 18:36:08 -07:00
Alexander Tseung	2fa554a641	Fix conf-tx render	2018-03-30 17:37:24 -07:00
Alexander Tseung	ba23843f91	Fix merge conflicts	2018-03-30 16:18:48 -07:00
Alexander Tseung	bdc4a6964a	Fix merge conflicts. Refactor renderPrimary into Home component	2018-03-30 15:07:00 -07:00
kumavis	7dde948c45	Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens	2018-03-30 13:57:50 -07:00
kumavis	5f1f345a5d	network - use providerType for localhost	2018-03-30 10:59:39 -07:00
Dan	2be6f8bae0	Fix lint and tests	2018-03-30 02:19:04 -02:30
Dan	717623e2e3	Merge branch 'master' into i3686-txparamundefined-sigrequestsintxlist	2018-03-30 00:00:31 -02:30
Dan	893f82491d	Merge branch 'master' into i3471-checkbalanceonconfirmscreen	2018-03-29 23:58:45 -02:30
kumavis	b49ad750dd	Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-artifacts	2018-03-29 16:54:00 -07:00
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
Dan	01e3293b65	Ensure correct address used when rendering transfer transactions.	2018-03-29 10:32:30 -02:30
kumavis	f9b680b09f	ui - identicon - use relative link for ether logo	2018-03-28 22:39:45 -07:00
kumavis	10609493c5	ui - use relative location for images	2018-03-28 22:30:35 -07:00
kumavis	cf82e766d4	ui - fix relative url for deposit-ether-modal	2018-03-28 22:21:49 -07:00
Alexander Tseung	58f52b2b8d	Fix merge conflicts. Refactor onboarding flow.	2018-03-28 13:23:50 -07:00
Dan	d6ebf5d94e	Confirm send token detects if balance is sufficient for gas.	2018-03-28 12:30:03 -02:30
Dan	21b6a3442d	Fix display of unapprovedMessages in txList (old and new ui); includes fix of undefined txParams.	2018-03-28 10:51:16 -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	4f0881e41b	Merge branch 'master' into i18n-translator-redux	2018-03-26 16:13:49 -02:30
Dan Finlay	fe6f22ee69	Merge pull request #3721 from alextsg/cb-944 ... Update button styles	2018-03-26 11:29:04 -07:00
Dan	a109a774a5	Use ens-input component in send-v2 to allow sending to ens names.	2018-03-26 11:40:11 -02:30