Commit Graph

2148 Commits

Author SHA1 Message Date
Dan Finlay 0668976514
Merge branch 'master' into i3981-contract-rates 2018-04-16 16:32:56 -07:00
Dan Finlay 26d2f5cd0e
Merge pull request #3970 from MetaMask/i3651-removeGlobalLog
Remove reliance on window.log
2018-04-16 15:16:45 -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
Dan Finlay 34692acdf9 Fix action for setting locale 2018-04-13 16:14:23 -07:00
bitpshr 7129d7c0f3 Require loglevel singleton in each module that uses it 2018-04-13 17:56:28 -04:00
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
kumavis 24eef428ce
Merge pull request #3883 from danjm/i3685-define-event-privatekey-import
event object actually passed to this.createKeyringOnEnter in private-key.js
2018-04-05 15:07:44 -07:00
kumavis 17931698a8
Merge pull request #3892 from alextsg/gh-3891
Fix populating txParams with undefined data
2018-04-05 15:02:35 -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 418926ffdf Fix populating txParams with undefined data 2018-04-05 09:54:41 -07:00
Alexander Tseung fa8500e09a commit 2018-04-05 09:53:24 -07:00
Thomas Huang e774fbcece
Merge pull request #3865 from MetaMask/openlinkinnewwindow
Make token helpscout link open in new tab.
2018-04-05 09:34:47 -07:00
Kevin Serrano 36f85c4f84
Merge pull request #3882 from MetaMask/i#3791
Fixes download file buttons
2018-04-05 00:51:58 -07:00
Kevin Serrano 29bad56410
Merge branch 'master' of github.com:MetaMask/metamask-extension into openlinkinnewwindow 2018-04-05 00:45:17 -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
Dan 2199b3720c Allow from and to address to be the same in new-ui. 2018-04-04 21:52:12 -02:30
Dan 6ecf2c8092 event object actually passed to this.createKeyringOnEnter in private-key.js 2018-04-04 21:18:12 -02:30
Thomas 4ffa74cbe6 Change double-quotes to single-quotes 2018-04-04 16:42:54 -07:00
Thomas 18e0a7e4f9 Add target=_blank exportAsFile 2018-04-04 16:26:05 -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
Kevin Serrano 02fa5c9c32
Make token helpscout link open in new tab. 2018-04-04 00:09:11 -07:00
Alexander Tseung 7776af7cd0 Use new design for showing seed words 2018-04-03 18:20:51 -07:00
Alexander Tseung 007f91cc50 commit 2018-04-03 17:43:42 -07:00
Alexander Tseung 34e608e9dc Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254 2018-04-03 17:06:00 -07:00
kumavis ca780075a8
Merge pull request #3834 from MetaMask/3734
Address Add Token design feedback
2018-04-03 17:00:12 -07:00
Alexander Tseung bf38aa6f1d Fix transaction confirmations 2018-04-03 16:59:32 -07:00
kumavis 00657e14a8 build - correctly set METAMASK_ENV via envify 2018-04-03 09:51:33 -07:00
David Yoo 4ddf5d2516 Address feedback 2018-04-03 09:38:27 -07:00
Alexander Tseung 35875863d2 Fix merge conflicts. Modify send workflow 2018-04-03 01:03:31 -07:00
David Yoo 0ab227d8a2 Address Add Token design feedback 2018-04-02 17:04:27 -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
Thomas Huang 8cd2022169
Merge pull request #3825 from danjm/i3668-warnusertxsimulationfails
Add simulation failure errors while improve send error handling on confirm screen
2018-04-02 15:26:46 -07:00
kumavis 98e0fc1ab9 Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens 2018-04-02 14:13:45 -07:00
Alexander Tseung 92f8157dfe Add withRouter to I18nProvider component 2018-04-02 13:15:31 -07:00
Dan d166cb2b1b Ensure txParams are prefixed with 0x when sending. 2018-04-02 16:38:51 -02:30
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