Chi Kei Chan
a67d3ecd46
Merge branch 'master' into NewUI-flat
2017-09-18 18:13:15 -07:00
Frankie
7094d96529
Merge pull request #2121 from MetaMask/i2115-DoNotFailOnRetries
...
Do not mark a retry tx failed that has been broadcast successfully
2017-09-18 14:42:55 -07:00
Dan Finlay
92e738d17c
Bump changelog
2017-09-18 14:37:28 -07:00
Dan Finlay
2b7b1db851
Do not mark a retry tx failed that has been broadcast successfully
...
Fixes #2115
If a tx has been braodcast, the only failures we should accept are:
- Never mined
- On chain failure
We had a section of code that would mark a tx failed during any unknown error during a retry.
Now no retry > 1 will ever mark a tx failed, since it has been broadcast, and may be mined.
2017-09-18 14:34:25 -07:00
Frankie
6204afb156
Merge pull request #2119 from MetaMask/mascara-tests2
...
tests - integration - re-add mascara to normal run
2017-09-18 14:33:40 -07:00
kumavis
eaa85f283d
tests - integration - re-add mascara to normal run
2017-09-18 13:17:08 -07:00
kumavis
30874e074e
Merge pull request #2118 from MetaMask/mascara-tests
...
test - integration - bump timeout
2017-09-18 13:14:52 -07:00
kumavis
9f665d8eda
test - integration - bump timeout
2017-09-18 13:06:35 -07:00
Frankie
bbae8d975e
Merge pull request #2098 from MetaMask/mascara-tests
...
Integration test suite improvements
2017-09-18 12:54:39 -07:00
kumavis
784510f89f
tests - integration - remove failing mascara integration tests from normal run until fixed
2017-09-18 12:31:44 -07:00
kumavis
c9ac8f0919
Merge pull request #2117 from MetaMask/Version-3.10.1
...
Version 3.10.1
2017-09-18 12:05:08 -07:00
Dan Finlay
c90c904f95
Version 3.10.1
2017-09-18 11:47:59 -07:00
Dan Finlay
fa50bf9587
Merge pull request #2075 from MetaMask/mixed-case
...
Specific error for send screen: address checksum fails
2017-09-18 11:46:50 -07:00
Dan Finlay
c463647ad7
Merge pull request #2080 from MetaMask/fix-tooltip
...
Fix position of tooltip to avoid overflow cutoff
2017-09-18 11:44:58 -07:00
Chi Kei Chan
190330db92
Merge branch 'master' into NewUI-flat
2017-09-18 11:41:46 -07:00
Chi Kei Chan
a190bb6043
Merge pull request #2116 from chikeichan/nm
...
[NewUI] Fix merge conflict with latest master
2017-09-18 11:38:39 -07:00
Chi Kei Chan
162a3827c7
Fix Merge Problems; update yarn lock
2017-09-18 11:34:07 -07:00
Chi Kei Chan
6c5865d564
Merge branch 'master' into nm
2017-09-18 11:28:10 -07:00
Dan Finlay
545cbbebb9
Merge branch 'master' into fix-tooltip
2017-09-18 11:20:00 -07:00
Dan Finlay
67accea693
Merge branch 'master' into mixed-case
2017-09-18 11:17:00 -07:00
Dan Finlay
99856189ed
Merge pull request #2093 from MetaMask/max-validation
...
High GasLimit Validation Warning
2017-09-18 11:14:26 -07:00
Dan
54bbf8d859
Handle transaction totals in WEI in tx-list, send and pending.
2017-09-15 16:23:23 -07:00
Dan
b0f1fba2e5
Ensures that new accounts are only created from the modal, and not when clicking 'Create New Account'
2017-09-15 16:19:48 -07:00
Dan
feb90f2fc4
Clear token selection when changing account.
2017-09-15 16:18:48 -07:00
Dan
095d327140
Adds USD to token list.
2017-09-15 16:16:41 -07:00
Dan
ab77142c90
Show dollar sign before USD on account details page.
2017-09-15 16:10:34 -07:00
kumavis
5d01ca10e4
tests - mascara - increase timeout before test starts
2017-09-15 13:19:31 -07:00
kumavis
a9900be085
test - mascara - move skip reload test flag
2017-09-15 13:13:53 -07:00
kumavis
0ab37b52c0
mascara - proxy - small cleanup
2017-09-15 13:13:13 -07:00
kumavis
d2d6f6a858
tests - integration - add mascara to integration test run
2017-09-15 12:20:43 -07:00
kumavis
779e973b45
tests - integration - mascara - small cleanup and timeout adjustments
2017-09-15 12:19:52 -07:00
frankiebee
c5a2527c17
set time if platform is mascara
2017-09-15 11:57:25 -07:00
frankiebee
7bcca782cb
remove testem files
2017-09-15 11:33:55 -07:00
frankiebee
7fb8623568
dont reload on initial download and wait before passing sw to ui
2017-09-15 11:09:19 -07:00
Dan Finlay
693655e2da
Merge pull request #2070 from MetaMask/filter-leak-fix3
...
Memory leak fixes - stream and filter life cycles
2017-09-14 19:40:00 -07:00
Dan
5c86194c0a
Show loading on conf-tx until the pending tx is available.
2017-09-14 15:45:18 -07:00
Chi Kei Chan
7d76e404f2
Make send token responsive; fix desktop send modal height
2017-09-14 11:45:59 -07:00
Chi Kei Chan
35d8671843
Add responsive UI to send ether modal
2017-09-14 09:56:40 -07:00
Chi Kei Chan
4bcc62500f
Style send ether screen
2017-09-14 01:32:24 -07:00
Chi Kei Chan
93a1089e08
Show token tx properly
2017-09-14 01:09:57 -07:00
kumavis
b53d04c409
tests - integration - get flat and mascara tests closer to compatible
2017-09-13 20:25:27 -07:00
Chi Kei Chan
d722c1045f
Update yarn.lock; Fix tx-list-item overflow; Fix gas exchange rate
2017-09-13 19:57:33 -07:00
kumavis
610f09262d
tests - refactor and rename npm scripts
2017-09-13 17:17:09 -07:00
kumavis
cbff5fd450
tests - mascara - move temp build files into dist/mascara
2017-09-13 16:52:38 -07:00
kumavis
56db3999ad
tests - start migrating mascara tests to karma
2017-09-13 16:45:31 -07:00
Dan
6bd71d6937
Fix send and pending.
2017-09-13 16:30:39 -07:00
kumavis
dd90e8e364
tests - break out coveralls npm script
2017-09-13 16:04:48 -07:00
kumavis
0687c822ba
Merge branch 'filter-leak-fix3' of github.com:MetaMask/metamask-extension into filter-leak-fix3
2017-09-13 15:32:59 -07:00
kumavis
d7097db022
createOriginMiddleware - fix var name
2017-09-13 15:29:44 -07:00
kumavis
c634ca3ba4
Merge branch 'master' into filter-leak-fix3
2017-09-13 15:27:08 -07:00
