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

5313 Commits

Author SHA1 Message Date
Thomas
b62ec394f5 Revert integration to oldUi 2018-01-22 16:10:07 -08:00
Thomas
ce0de5feed String interpolate version in settings 2018-01-22 16:09:23 -08:00
Thomas
baba179ccb Remove duplicate eth-contract-metadata 2018-01-22 16:08:00 -08:00
Thomas
d59136eb49 Add ExtensionPlatform = 'development' to mockUi 2018-01-22 16:06:35 -08:00
Chi Kei Chan
338ebe5f40
Merge pull request #3049 from chikeichan/newmaster
Merge master to uat
2018-01-19 15:58:26 -08:00
Dan
c554e52e82 Get version from manifest instead of hard coding in New UI info page. 2018-01-19 15:31:11 -08:00
Chi Kei Chan
c415b56ce7 update yarn.lock 2018-01-19 15:30:28 -08:00
Chi Kei Chan
77c545336b Merge branch 'uat' into newmaster 2018-01-19 15:29:36 -08:00
kumavis
4e63924e60 4.0.10 2018-01-18 16:02:35 -08:00
Alexander Tseung
b05d21b1ba Fix transaction list font sizes, padding 2018-01-18 13:34:57 -08:00
Dan Finlay
98b5a62fa7
Merge pull request #3023 from MetaMask/build-lock-gulp
build - lock pre-release gulp dep to commit
2018-01-18 13:12:41 -08:00
Dan Finlay
59d0fa2637
Merge pull request #3016 from MetaMask/sentry
Stability - Add Sentry Remote Error Reporting
2018-01-18 13:11:15 -08:00
Dan Finlay
098f0ca22c
Merge pull request #3035 from MetaMask/infura-rest-fix
BugFix - infura rest api uri length limit fix
2018-01-18 13:02:40 -08:00
Kevin Serrano
5fff2e19d8
Merge pull request #3024 from alextsg/cb-529
[NewUI] Update popout to fullscreen icon
2018-01-18 12:39:09 -08:00
kumavis
9f3183ccf3 deps - bump infura provider for uri length limit fix 2018-01-18 11:51:39 -08:00
Thomas Huang
e561740133
Merge branch 'master' into build-lock-gulp 2018-01-18 10:13:31 -08:00
Thomas Huang
d8d11ec764
Merge pull request #3029 from MetaMask/test-provider-stub
Tests - Improved provider stubbing with test-block-middleware
2018-01-18 10:07:41 -08:00
kumavis
ab3423d00d deps - re-add eth-block-tracker 2018-01-17 22:07:08 -08:00
kumavis
899e839e7c test - createTestProviderTools includes block tracker layer 2018-01-17 21:43:34 -08:00
Dan J Miller
4fae461a67 [NewUI] Send screen gas loading fixes (#3027)
* Allow entering amount, but disable validation of amount, opening of gas customizer or clicking of next, when gas loading in send.

* Fix variable name.
2018-01-17 20:47:01 -08:00
kumavis
d7c8ec22a4 test - tx controller - fix txGasUtil reference 2018-01-17 20:09:13 -08:00
kumavis
b70d3a9b6e deps - bump json-rpc-engine for better errors 2018-01-17 20:02:43 -08:00
kumavis
d1d745eef4 test - typo - fix spelling of word stubbed 2018-01-17 19:47:35 -08:00
kumavis
3cbf2b7e3e test - remove createEthJsQueryStub 2018-01-17 19:44:11 -08:00
kumavis
2b9781ab4c test - stub provider needs to handle errors 2018-01-17 19:19:20 -08:00
Alexander Tseung
853e7f8420 Fix lint errors 2018-01-17 18:50:18 -08:00
kumavis
b259c29374
Merge pull request #3021 from MetaMask/i#3020
transactions - transition approved transactions to failed transactions…
2018-01-17 18:03:52 -08:00
kumavis
96fc916024
Update transactions.js 2018-01-17 17:56:31 -08:00
Alexander Tseung
f8bf8cb527 Update popout to fullscreen icon 2018-01-17 17:56:18 -08:00
kumavis
29a6da0d01 build - lock pre-release gulp dep to commit 2018-01-17 17:50:55 -08:00
frankiebee
234c2417ca transactions - transtion approved transactions to failed transactions on boot 2018-01-17 16:49:38 -08:00
Frankie
7c380547b7
Merge pull request #3019 from MetaMask/i#3015
transactions - wrap addTxDefaults in a try catch and re try addTxDefa…
2018-01-17 16:36:18 -08:00
frankiebee
be8d924432 transactions - fail txs on boot who fail addTxDefaults 2018-01-17 15:48:37 -08:00
kumavis
bb853c6b1c lint - ignore vendor js 2018-01-17 15:45:36 -08:00
frankiebee
9f19fea8e0 transactions - wrap addTxDefaults in a try catch and re try addTxDefaults on boot if they did not complete 2018-01-17 15:42:01 -08:00
kumavis
1f5325804b sentry - dedupe raven vendor 2018-01-17 15:38:25 -08:00
kumavis
0e52684acd lint - ignore vendor js 2018-01-17 15:35:47 -08:00
kumavis
daa62b507a sentry - breakout raven setup and add release config 2018-01-17 14:59:15 -08:00
kumavis
52a1c954f1 sentry - update raven and add to ui 2018-01-17 14:28:37 -08:00
kumavis
7d1554b1c1 sentry - add raven + sentry reporting config 2018-01-17 14:04:37 -08:00
Dan
fdaf6eacb2 Show now tokens by default and improve search on add token screen. 2018-01-17 13:52:59 -08:00
Alexander Tseung
40e58d3132 Fix tx-list, confirmation screen styling 2018-01-17 13:50:16 -08:00
Chi Kei Chan
ba0762c582
Merge pull request #3005 from alextsg/cb-385
[NewUI] Fix rendering QR code in full screen old UI, hide unnecessary back button
2018-01-17 13:49:48 -08:00
Chi Kei Chan
b80ed2c451
Merge pull request #3007 from alextsg/uat-master-011618
[NewUI] Merge master into uat branch
2018-01-17 13:48:16 -08:00
Frankie
5e4dd7118f
Merge pull request #3012 from MetaMask/AddNetworkIndicatorClasstoLoading
Add network-indicator classname to network loading spinner
2018-01-17 11:37:46 -08:00
Thomas
8c792ba3ee Add network-indicator classname to network loading spinner 2018-01-17 10:51:23 -08:00
Alexander Tseung
aa08d1a09d Fix merge conflicts 2018-01-16 18:34:24 -08:00
Alexander Tseung
81f86cfab6 Merge branch 'uat' into uat-master-011618 2018-01-16 18:17:28 -08:00
Alexander Tseung
65e9d9efc5 Fix rendering QR code in old UI, hide unnecessary back button 2018-01-16 17:41:42 -08:00
Alexander Tseung
ccb80594be Readjust gas fees when switching networks on the send screen 2018-01-16 17:26:34 -08:00