1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Commit Graph

5141 Commits

Author SHA1 Message Date
Alexander Tseung
099f078a3d Fix merge conflict 2018-01-03 11:16:46 -08:00
Alexander Tseung
a6f062a686 Merge branch 'NewUI-flat' into NewUI-flat-4.0.5c 2018-01-03 11:06:08 -08:00
kumavis
313b3c087a
Merge pull request #2783 from MetaMask/tx-param-vaalidation
transactions - throw error if txParams.value contains a decimal
2018-01-02 14:30:39 -08:00
kumavis
3f6cef0b3f
tx-gas-utils - tx-param-validation - use more intuitive check 2018-01-02 14:22:44 -08:00
kumavis
e572768cb1
Merge pull request #2840 from oosthuizenr/master
UI - Never show seed phrase if locked
2018-01-02 13:36:51 -08:00
oosthuizenr
1da385f78b
fix comment 2018-01-02 21:29:26 +02:00
Renier Oosthuizen
4a598fc7ac Fixes #2834 2018-01-02 21:07:48 +02:00
kumavis
849b8fab93
Merge pull request #2801 from MetaMask/greenkeeper/vinyl-source-stream-2.0.0
Update vinyl-source-stream to the latest version 🚀
2018-01-02 10:25:11 -08:00
Alexander Tseung
dfb2247108 Fix sign typed data 2017-12-29 13:17:26 -08:00
Alexander Tseung
3f17abd43b Fix mascara first time flow button colors 2017-12-29 13:17:01 -08:00
Frankie
b2e4f913ba
Merge pull request #2817 from MetaMask/i#2810
only check nonces of transactions who's from address match the txMeta
2017-12-28 16:34:24 -08:00
frankiebee
0c54efdfc7 tests - be more verbose in test messages 2017-12-28 15:48:22 -08:00
Dan Finlay
a22e98910d
Merge pull request #2818 from MetaMask/i2782-ethroundingerror
Fix rounding error in ether input on send screen
2017-12-28 14:55:42 -08:00
Kevin Serrano
c3d85c0a66
Bump Changelog 2017-12-27 18:23:05 -08:00
Kevin Serrano
e682fb05fc
Add frontend validation to ensure that ether inputs are valid. 2017-12-27 18:22:10 -08:00
frankiebee
8bd942d406 add tests for #_checkIfNonceIsTaken 2017-12-27 17:45:03 -08:00
Kevin Serrano
92eb16fc11
Add frontend validation to check if send ether input is a valid number. 2017-12-27 17:36:56 -08:00
Kevin Serrano
adf4b89804
Add additional test to ui utils to account for exact wei values. 2017-12-27 17:33:28 -08:00
Kevin Serrano
3e562f1a1e
Add backend fix for util in normalizeethstringtowei. 2017-12-27 17:31:38 -08:00
Kevin Serrano
414f89668e
Fix some silly linting issues. 2017-12-27 17:27:48 -08:00
Kevin Serrano
3d627e869b
Add test for edge case. 2017-12-27 17:26:38 -08:00
frankiebee
5efb0044d8 transactions:pending - only check nonces of transactions who's from adress match the txMeta 2017-12-27 16:50:15 -08:00
greenkeeper[bot]
37789f2dba chore(package): update vinyl-source-stream to version 2.0.0 2017-12-23 05:35:28 +00:00
Alexander Tseung
5a58add797
Merge pull request #2798 from alextsg/NewUI-flat-4.0.5
Merge master into NewUI-flat
2017-12-22 11:31:07 -08:00
Alexander Tseung
ca51cab35f Merge branch 'NewUI-flat' into merge-master 2017-12-22 11:15:39 -08:00
Alexander Tseung
06410381d4 Merge branch 'NewUI-flat' into merge-master 2017-12-22 11:00:46 -08:00
Alexander Tseung
8f6c322e01
Update manifest.json version from 4.0.4 to 4.0.5 (#2797) 2017-12-22 10:56:31 -08:00
Alexander Tseung
a218008adf
Track usage of old and new UI (#2794)
[NewUI] Track usage of old and new UI
2017-12-22 10:43:02 -08:00
Dan J Miller
4acd48966e [NewUI] Fixes tests and sends user to NewUI after registering. (#2788)
* Fixes tests and sends user to NewUI after registering.

* Karma config?

* Empty commit

* Remove unneeded json state mock file.
2017-12-21 19:03:01 -08:00
Kevin Serrano
06f496310c
Merge pull request #2793 from MetaMask/i2681-DoNotFailPending
Do not fail pending transactions after any amount of time
2017-12-21 14:29:04 -08:00
Dan Finlay
33dbee3db9 Remove retryTimePeriod from tx controller 2017-12-21 14:15:17 -08:00
Dan Finlay
24e10e874e Bump changelog 2017-12-21 13:41:44 -08:00
Dan Finlay
75b8baafb6 Stop failing pending transactions after any period of time 2017-12-21 13:41:08 -08:00
Frankie
9940ea71df
Merge branch 'master' into tx-param-vaalidation 2017-12-21 11:37:37 -08:00
Dan Finlay
cc7e85c078
Spelling 2017-12-21 11:36:09 -08:00
frankiebee
9f08ada1a6 add to CHANGELOG.md 2017-12-20 18:49:52 -08:00
Chi Kei Chan
4ef71f0365
Merge pull request #2785 from danjm/merge-master-to-newUI-flat-dec20
[NewUI] Merge master to NewUI-flat
2017-12-20 17:39:41 -08:00
Chi Kei Chan
021ac526be
Merge branch 'NewUI-flat' into merge-master-to-newUI-flat-dec20 2017-12-20 17:39:11 -08:00
Chi Kei Chan
9959aea598
Merge branch 'NewUI-flat' into merge-master-to-newUI-flat-dec20 2017-12-20 17:38:28 -08:00
Dan
e7e1b7a951 Clone transaction while editing instead of mutating object from state. 2017-12-20 17:37:18 -08:00
Dan
9ced63584b Add constanst for token transfer function signature. 2017-12-20 17:37:18 -08:00
Dan
5fe3c5aae6 Lint fixes. 2017-12-20 17:37:18 -08:00
Dan
bf4043c59b Adds updateTransaction to background and used it to update after editing in send-v2. 2017-12-20 17:37:18 -08:00
Dan
1f1fc2c49e Canceled, edited transactions show edited amount. 2017-12-20 17:37:18 -08:00
Dan
7915e62d65 Merge branch 'master' into NewUI-flat 2017-12-20 19:16:12 -03:30
frankiebee
f47e81e493 transactions - throw error if dapp provides txParams whos value has a decimal 2017-12-20 14:09:59 -08:00
Dan J Miller
bccbf14b39 [NewUI] Hide UI toggle in mascara (#2772)
* Hides old-UI on mascara.

* Improve code clarity in select-app.js
2017-12-20 10:22:50 -08:00
Dan
109e4e5d96 Hide fiat values on account details screen when eth/token value is 0. 2017-12-20 10:21:36 -08:00
Dan
0feb5b210b Hides the sidebar after the an account menu actions changes the screen behind the sidebar. 2017-12-20 10:17:29 -08:00
Thomas Huang
d3f5ad874e
Merge pull request #2763 from MetaMask/AddRecentBlocksController
Add Recent Blocks controller
2017-12-20 13:07:34 -05:00