1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-12 12:47:14 +01:00
Commit Graph

8017 Commits

Author SHA1 Message Date
brunobar79
a299641a95 update package-lock.json 2018-09-10 13:03:41 -04:00
brunobar79
8ee01f4e99 Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 2018-09-05 16:26:09 -04:00
Whymarrh Whitby
dc2431fe62
Merge pull request #5206 from whymarrh/fix-send-content-tests
Fix assertion of missing child component
2018-09-05 17:10:00 -02:30
Whymarrh Whitby
05c72070bb Fix assertion of missing child component 2018-09-05 16:35:37 -02:30
Dan J Miller
bd49098039
Merge pull request #5188 from taobun/develop
edit decimal check in old-ui/
2018-09-04 21:39:01 -02:30
Dan Finlay
5043451356
Merge pull request #5167 from MetaMask/fix-watcAsset-images
Fix images for watched tokens
2018-09-04 12:56:56 -07:00
Dan J Miller
86bb96aaaf
Merge pull request #5129 from MetaMask/add-sidebar-component
Add sidebar component
2018-09-04 16:19:09 -02:30
bunoi
f412b19244 fix check valid decimals code in new ui 2018-09-04 23:40:02 +07:00
Dan J Miller
b9e4feac48
Merge pull request #5091 from MetaMask/i4945-feature-flag-hex-data
Adds feature flag toggle for the hex data row on the send screen.
2018-09-04 11:57:40 -02:30
Dan J Miller
03d789a490
Merge pull request #5115 from jdetychey/patch-1
Typo in "send" translation
2018-09-04 11:41:35 -02:30
Dan J Miller
8a1a733355
Merge pull request #5191 from eugeneiiim/patch-2
Fix CHANGELOG.md formatting
2018-09-04 11:27:51 -02:30
Dan J Miller
5b2864d070
Merge pull request #5138 from MetaMask/greenkeeper/monorepo.enzyme-1.6.0
Update enzyme to the latest version 🚀
2018-09-04 11:25:40 -02:30
Eugene Marinelli
810fbc4da0
Fix CHANGELOG.md formatting 2018-09-03 12:25:08 -04:00
bunoi
c824418955 edit decimal check in old-ui/ 2018-09-03 18:32:38 +07:00
Dan Finlay
87125d632a
Merge pull request #5176 from MetaMask/BumpTokenAbi
Bump human-standard-token-abi version for DAI support
2018-08-30 13:48:29 -07:00
Esteban MIno
879e10d44a add assetImages to development states 2018-08-30 17:25:13 -03:00
Esteban MIno
165a966a2a balance components using selectors 2018-08-30 17:19:10 -03:00
Dan Finlay
45cbe6b5b3 Bump human-standard-token-abi version for DAI support 2018-08-30 12:31:24 -07:00
Esteban MIno
63397047cf fix integration test for asset images selectors 2018-08-30 15:09:59 -03:00
Esteban MIno
c8e5068537 fix watched tokens images showing in tx list 2018-08-30 13:51:57 -03:00
Esteban MIno
208312b239 fix watched asset image rendering on confirm transaction header 2018-08-30 12:59:44 -03:00
Esteban MIno
07cb6adc31 fix images for watched tokens 2018-08-29 23:13:25 -03:00
Dan Miller
40e0d92f57 Adds sidebar component and refactors slide in wallet view sidebar to use it. 2018-08-28 22:08:15 -02:30
Alexander Tseung
9ab0354e36
Merge pull request #5155 from MetaMask/i5154-confirm-spinner
Fix infinite spinner on failed transactions
2018-08-28 17:37:13 -07:00
Bruno Barbieri
4560df6e73
Merge pull request #4606 from MetaMask/WatchTokenFeature
Add metamask_watchAsset
2018-08-28 15:33:42 -04:00
Alexander Tseung
f78dc96a2c Fix infinite spinner on failed transactions 2018-08-28 12:18:57 -07:00
Esteban MIno
e743f44150 fix conflicts 2018-08-28 15:20:30 -03:00
Esteban MIno
3106374cc3 watchAsset small changes 2018-08-27 22:10:14 -03:00
Alexander Tseung
0259eb0214
Merge pull request #5121 from MetaMask/i5099-approve
Prevent token symbol from showing as null in the confirm screen
2018-08-27 15:28:29 -07:00
Dan Finlay
4b17ec67ec
Merge pull request #4919 from MetaMask/refactor-tx-list
Refactor and Redesign Transaction List
2018-08-27 15:02:07 -07:00
Dan Miller
952edf695c Revert changes to tx-list-items.json, and to mock getTransactionCount method in tx-list-items integration test. 2018-08-27 17:07:01 -02:30
Dan Miller
65873e33e4 Adds feature flag toggle for the hex data row on the send screen. 2018-08-27 11:44:16 -02:30
greenkeeper[bot]
012fb0e3e6 chore(package): update enzyme-adapter-react-15 to version 1.0.6 2018-08-25 00:55:45 +00:00
greenkeeper[bot]
41a13bb341 chore(package): update enzyme to version 3.4.4 2018-08-25 00:51:40 +00:00
Dan Finlay
30e49b8545
Merge pull request #5136 from MetaMask/remove-test-ens
Disable .test ENS resolution
2018-08-24 13:20:49 -07:00
bitpshr
803a79f836 Do not resolve .test domains using ENS 2018-08-24 12:40:37 -04:00
Alexander Tseung
c0e97d1739 Fix tests 2018-08-23 19:19:48 -07:00
Alexander Tseung
342522c6cf Fix naming, add eth.getCode check for actions, fix translations for statuses 2018-08-23 16:45:28 -07:00
Alexander Tseung
2d76ee754b Reduce large timeouts 2018-08-23 16:45:28 -07:00
Alexander Tseung
bdfd54ec54 Increase e2e timeouts for firefox 2018-08-23 16:45:28 -07:00
Alexander Tseung
eb17151ff4 Change "Outgoing" to "Sent Ether" or "Sent Token" 2018-08-23 16:45:28 -07:00
Alexander Tseung
c06a0be486 Fix Firefox e2e tests 2018-08-23 16:45:28 -07:00
Alexander Tseung
62e2d5e01c Fix integration tests 2018-08-23 16:45:28 -07:00
Alexander Tseung
3fbf82c2cf Update package-lock.json 2018-08-23 16:45:28 -07:00
Alexander Tseung
da0df79047 Add CurrencyDisplay and TokenCurrencyDisplay components 2018-08-23 16:45:27 -07:00
Alexander Tseung
6670bc0e09 Fix e2e tests 2018-08-23 16:45:27 -07:00
Alexander Tseung
a430eed2d8 Fix integration tests 2018-08-23 16:45:27 -07:00
Alexander Tseung
b48a293af0 Update retry transaction logic to use network nonce 2018-08-23 16:45:27 -07:00
Alexander Tseung
5dcd8ceb7b Fix e2e tests 2018-08-23 16:45:27 -07:00
Alexander Tseung
9adf0c4b60 Fix integration tests 2018-08-23 16:45:27 -07:00