Dan
d6e4d2e80d
Use new submittedTime field to correctly show retry button in old and new ui.
2018-03-13 21:15:35 -02:30
frankiebee
9d7640996a
transactions - return the txMeta in retryTransaction
2018-03-13 14:42:26 -07:00
frankiebee
c6dff98ee1
tests - add tests for transactions#retryTransaction and transactions#_markNonceDuplicatesDropped
2018-03-13 14:30:59 -07:00
frankiebee
9fd349d740
transactions:state - add a submittedTime stamp so the ui has a better grasp of the time of submission
2018-03-13 09:51:37 -07:00
Dan
179066fe6b
Set txMeta.time to reflect time of tx approval.
2018-03-13 03:26:37 -02:30
Dan
e6d1ce56e7
Improve phrasing of copy.
2018-03-13 03:11:45 -02:30
Dan
f805a2eb73
Fix gas calculation and nonce / forceGasMin state setting errors; retry button shows on correct tx.
2018-03-13 03:09:38 -02:30
Dan
c1ff927fa0
Lint fixes.
2018-03-09 10:00:37 -03:30
Dan
81e72147ef
Merge branch 'master' into retry-tx-refractor
2018-03-09 02:07:27 -03:30
Dan
2d6b378bf8
Adds inline opening of gas customization to confirm-send-ether screen.
2018-03-09 02:03:36 -03:30
Dan
5433d2fe3a
Retry transaction logic added to tx-list-item, confirm-send-ether, customize-gas-modal, and dependents.
2018-03-09 00:19:26 -03:30
Dan Finlay
f28bbe5b03
Merge pull request #3485 from MetaMask/package-lock
...
meta - add package-lock to git
2018-03-08 17:25:20 -08:00
kumavis
4af2066298
meta - add package-lock to git
2018-03-08 16:20:23 -08:00
Dan
6cee76b3e7
Add html and css for responsive retry button.
2018-03-08 16:12:25 -03:30
frankiebee
5572345b78
fix marking of confirmed transaction as dropped
2018-03-08 10:37:47 -08:00
Alexander Tseung
cbb65cc493
Fix flashing to Log in screen after logging in or restoring from seed phrase ( #3466 )
2018-03-08 16:29:29 +01:00
frankiebee
4a3288fec9
transactions - make _markNonceDuplicatesDropped
2018-03-07 22:01:14 -08:00
frankiebee
8adb03074c
Merge branch 'master' into retry-tx-refractor
2018-03-07 17:16:35 -08:00
frankiebee
62febac876
refactor retrytx with higher gas price:
...
- create a new tx instead of overwriting the tx hash
- add a new state 'dropped' to the txStateManager
- mark duplicate txs as dropped when one gets confirmed in a block
2018-03-07 17:16:16 -08:00
Dan Finlay
f4e5dd37b1
Merge pull request #3409 from scsaba/seed-phrase-verification
...
Add seed phrase verification script into background process
2018-03-07 16:47:13 -08:00
Dan J Miller
ca047b1ea0
Update network colours for better accessibility. ( #3469 )
2018-03-07 15:22:10 -03:30
Thomas Huang
a74439a1a7
Merge pull request #2791 from MetaMask/greenkeeper/karma-2.0.0
...
Update karma to the latest version 🚀
2018-03-07 13:50:41 -05:00
Thomas Huang
bd67deae13
Merge pull request #3460 from trigun0x2/master
...
fix typo in transaction.js
2018-03-07 13:48:14 -05:00
Jeffrey Tong
cad5f5f000
fix typo in tests and tx-state-manager
2018-03-07 10:24:36 -08:00
Jeffrey Tong
57dc5a6e9b
fix typo in transaction.js
2018-03-06 20:37:26 -08:00
Thomas Huang
5ebdb215ae
Merge pull request #3458 from MetaMask/version-4.2.0
...
Version 4.2.0
2018-03-06 20:51:53 -05:00
kumavis
e91a521b1b
Version 4.2.0
2018-03-06 17:30:12 -08:00
kumavis
d901268475
Merge pull request #3335 from MetaMask/ImportAccountMessageV2
...
Import account disclaimer and change loose label to imported.
2018-03-06 17:25:49 -08:00
kumavis
8a444ec96f
Merge pull request #3259 from MetaMask/controllerStubs
...
Offline testing
2018-03-06 17:21:36 -08:00
kumavis
6a9ca29244
Merge branch 'master' into ImportAccountMessageV2
2018-03-06 17:13:57 -08:00
kumavis
8e0131cbb5
Merge pull request #3455 from MetaMask/i2475-UnifyLogInWording
...
Replace Lock wording with Log Out / Log In
2018-03-06 17:12:32 -08:00
kumavis
36c5bf203e
Merge pull request #3411 from MetaMask/AutoVersionBump
...
Clean up run version bump script
2018-03-06 17:11:49 -08:00
Dan Finlay
9762a73041
Merge pull request #3433 from danjm/i3087-shapeshift-split-undefined
...
Shapeshift form handles 'market info unavailable' errors.
2018-03-06 15:07:51 -08:00
Dan Finlay
52b4876cf9
Merge pull request #3446 from danjm/NewUI-handle-token-balance-on-edit
...
Gracefully handle null token balance in new ui send.
2018-03-06 15:05:43 -08:00
Dan Finlay
31e7d9263f
Merge pull request #3444 from danjm/i3348-minus-not-a-number
...
Prevent user from selecting max amount until gas is estimated.
2018-03-06 15:05:25 -08:00
Dan Finlay
cb4ad60800
Merge branch 'master' into i2475-UnifyLogInWording
2018-03-06 14:57:01 -08:00
Dan Finlay
b87687110d
Replace Lock wording with Log Out / Log In
...
Fixes #2475
2018-03-06 14:51:26 -08:00
Dan J Miller
303801d276
Ensure this reference is defined in old-ui info.js ( #3450 )
2018-03-06 10:45:40 -08:00
Dan J Miller
5ac330a89e
Default add-token decimal value to string ( #3451 )
2018-03-06 15:15:26 -03:30
Dan Finlay
a4bd7992cd
Merge branch 'master' into ImportAccountMessageV2
2018-03-06 10:32:47 -08:00
Dan Finlay
dd9cac69ae
Merge pull request #3309 from scsaba/edge-support
...
Add Edge Support
2018-03-06 09:39:57 -08:00
Dan
376ffb758f
Shapeshift form handles market info unavailable errors.
2018-03-06 13:49:41 -03:30
Alexander Tseung
5f8a632fec
Fix seed phrase validation clearing form ( #3417 )
...
* Fix seed phrase validation clearing form
* Make new ui import seed error feedback live, and allow newlines with and without carriage returns.
2018-03-06 09:14:57 -08:00
Csaba Solya
59007a6c36
modify verifySeedPhrase to async and call it from addNewAccount also
2018-03-06 15:56:27 +01:00
Dan J Miller
9734969e5d
Add missed changelog updates. ( #3407 )
2018-03-06 10:51:21 -03:30
Csaba Solya
d8038c0de0
add browserify-unibabel to package.json
2018-03-06 09:23:43 +01:00
Dan
462d57cb6a
Gracefully handle null token balance in new ui send.
2018-03-06 00:23:29 -03:30
Dan
68604b53dd
Prevent user from selecting max amount until there is an estimated gas total.
2018-03-05 23:12:06 -03:30
Dan J Miller
1bd18cebd7
Fixes shapeshift coin selection dropdown. ( #3416 )
2018-03-05 13:33:46 -03:30
Csaba Solya
8fde208f0b
move more test code to beforeEach
2018-03-04 08:57:55 +01:00
