Commit Graph

6698 Commits

Author SHA1 Message Date
kumavis f7ea5bf793
Merge pull request #4121 from MetaMask/i3688-shapeshift-500s
Fix ShapeShift purchases
2018-04-30 11:37:09 -06:00
Thomas Huang 2601aa594e
Merge pull request #4116 from MetaMask/test-unit-ganache
Test - Move unit tests to ganache-core
2018-04-30 10:35:17 -07:00
kumavis 755d4945f7
Merge pull request #4132 from MetaMask/master
Master
2018-04-30 09:38:12 -06:00
Paul Bouchon daaaab3ab0
Verify identities state after restoring new accounts (#4091) 2018-04-29 23:18:34 -04:00
kumavis aa3dc83bf0
Merge pull request #4128 from MetaMask/raven-transport-fix
guard adainst raven erroring
2018-04-29 15:15:57 -06:00
frankiebee 873f85d996 guard adainst raven erroring 2018-04-29 13:46:07 -07:00
bitpshr b4b33b57bc Fix ShapeShift purchases on new UI 2018-04-28 14:41:46 -04:00
bitpshr 805c161704 Update old UI ShapeshiftForm to gracefully handle errors 2018-04-28 14:41:19 -04:00
kumavis 141884ee6a
Merge pull request #4113 from MetaMask/i4107-send-tokens-without-symbols-decimal-methods
Wraps calls to symbol() and decimals() in try catch (Fixes #4107)
2018-04-27 19:21:12 -06:00
kumavis 1a60f42933 deps - package-lock 2018-04-27 18:17:31 -07:00
kumavis f4fe3e81c1 development - add sourcemap debug tool 2018-04-27 18:17:21 -07:00
kumavis 5c9cb0b787 build - minify via gulp-uglify-es instead of uglifyify 2018-04-27 18:15:50 -07:00
kumavis e01b81ed9b deps - package-lock 2018-04-27 17:19:46 -07:00
kumavis b8a18feb51 test - unit - send from test accounts to avoid not-enough-balance error from ganache 2018-04-27 17:12:52 -07:00
kumavis b487dab2e7 test - unit - use ganache instead of deprecated block-tracker test util 2018-04-27 17:11:44 -07:00
Dan 9f9e8789cc Simplify return of existing token in getSymbolAndDecimals 2018-04-27 21:38:57 -02:30
Dan b71dbf52d1 Convert decimals to string in getSymbolAndDecimals; return null for symbol or decimals. 2018-04-27 21:33:56 -02:30
Dan 6de450488b Wraps calls to symbol() and decimals() in try catch 2018-04-27 20:45:36 -02:30
kumavis 2b9925a9e4
Merge pull request #4110 from MetaMask/master
Develop - Add commits to develop that are already in Master
2018-04-27 16:17:46 -06:00
Kevin Serrano 387ec5b553
Merge pull request #4097 from MetaMask/i4096-token-rates-error
Return 0 for token rate fetch failures
2018-04-27 10:11:20 -07:00
Paul Bouchon 1bad3fa257
Allow transactions with 0-gwei gas price (#4073)
* Allow transactions with 0-gwei gas price
* Add tests to verify tx with 0 gas fee
* Conditionally use CurrencyInput in CurrencyDisplay
2018-04-27 10:42:02 -04:00
Alexander Tseung 61b8c3efff Redirect to correct seed phrase screen 2018-04-26 19:27:33 -07:00
bitpshr 8c5994abc9 Return 0 for token rate fetch failures 2018-04-26 18:31:54 -04:00
Thomas Huang 4e7b0ff15c
Merge pull request #4095 from MetaMask/v4.6.0
Version 4.6.0
2018-04-26 14:16:35 -07:00
kumavis b97457e9e2 v4.6.0 2018-04-26 13:43:44 -07:00
kumavis dcd04091cc
Merge pull request #4042 from MetaMask/tx-controller-rewrite-v3
docs and file organization for txController
2018-04-25 16:52:46 -06:00
Dan Finlay 21349dd612
Merge pull request #4065 from MetaMask/i18n-helper-bugfix
i18n-helper - abort on i18n failure
2018-04-25 15:47:07 -07:00
Dan Finlay bd04fe592e
Merge pull request #4083 from MetaMask/pe-bump
rpc - bump provider-engine + eth-json-rpc-filters
2018-04-25 15:34:11 -07:00
kumavis ee8b91262d
i18n-helper - wrap fallback in brackets to help indicate something is wrong 2018-04-25 15:27:30 -07:00
kumavis bdd35b12b6
Merge pull request #4068 from MetaMask/privacy-notice-patch
Clarify privacy notice
2018-04-25 16:25:44 -06:00
Kevin Serrano 03517f7965
Updated notices json file. 2018-04-25 14:17:20 -07:00
kumavis 1c63b11e3f rpc - bump provider-engine + eth-json-rpc-filters 2018-04-25 14:02:41 -07:00
Dan Finlay 806a3c7eff
Merge pull request #4080 from MetaMask/AddDevelopGuideToContributing
Add develop guide to contributing.md
2018-04-25 12:11:06 -07:00
Dan Finlay b9e5ef97b2
Merge pull request #4070 from MetaMask/i3999-DeterministicBuilds
Make minified builds determinstic
2018-04-25 11:57:36 -07:00
frankiebee 8ffce8b59d transactions - more docs and clean ups 2018-04-25 11:13:51 -07:00
Dan Finlay 1eb80cc46d Add develop guide to contributing.md
Explain our new master-develop git branch strategy, so developers know
which branch to PR against.
2018-04-25 11:05:47 -07:00
Dan Finlay b2fbc6399a Return key instead of empty string on i18n fail 2018-04-25 10:57:44 -07:00
Dan Finlay 91161739a5 Move uglifyify to MetaMask org 2018-04-25 10:46:01 -07:00
Dan Finlay f6653b9f94
Merge pull request #4069 from MetaMask/i4056-LatestPriceApi
Use latest balanc3 api for prices
2018-04-25 10:42:03 -07:00
Dan Finlay 0c5add59f7 Make minified builds more determinstic
May fix #3999, but will need to see if Mozilla can reproduce the build
with this updated repo.

Switches our `uglifyify` dependency from the production one
(under-maintained) to one that I've merged a critical patch into.

I'm open to discussion of how else we might approach this problem here.
Maybe we should use a different minification module entirely, remove
minification, or maybe refactor our build system!
2018-04-24 15:01:02 -07:00
Dan Finlay 7ec775d614 Use latest balanc3 api for prices 2018-04-24 14:12:57 -07:00
Dan Finlay 5c7f00cae0
Clarify privacy notice
We got an alarmed user in support because the word "account" does not clarify what is revealed, and could imply private key.
2018-04-24 14:11:20 -07:00
kumavis 3500689ed0
i18n-helper - abort on i18n failure 2018-04-24 09:53:16 -07:00
Dan Finlay ac334d7b1a
Merge pull request #4040 from MetaMask/dm-docs-2
Even more documentation for various controllers and libs.
2018-04-24 09:51:18 -07:00
Dan 0fbd389a50 lint fix 2018-04-24 13:18:34 -02:30
Dan ed264d3479 Merge branch 'master' into dm-docs-2 2018-04-24 12:36:30 -02:30
Dan 020824f3c7 Remove accidentally added code in message-manager. 2018-04-24 12:36:26 -02:30
Dan 016d492414 Remove unnecessary doc comment. 2018-04-24 12:20:38 -02:30
Dan Finlay 66ae4a948a
Merge pull request #3940 from nyatla/master
Small layout and cursor problem fix.
2018-04-23 17:07:40 -07:00
Dan Finlay f5f5100da7
Merge pull request #4023 from MetaMask/greenkeeper/ethjs-contract-0.2.0
Update ethjs-contract to the latest version 🚀
2018-04-23 17:06:46 -07:00