1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-20 00:13:22 +01:00
Commit Graph

7207 Commits

Author SHA1 Message Date
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
Dan
33c16d1bf6 Fixes to get tests passing. 2018-04-27 08:11:18 -02:30
Dan
91c201aa72 Lint fixes and alphabetization for i3725-refactor-send-component 2018-04-27 00:16:11 -02:30
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
Dan
8ff7806f1b Core of the refactor complete 2018-04-26 14:08:38 -02:30
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
Thomas
6bf6589c44 Bump package-lock 2018-04-24 13:38:10 -07:00
Thomas
629457ea54 setupUntrustedCommunication and setupTrustedCommunication 2018-04-24 13:33:31 -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
02a6d2089e Merge branch 'master' into i3725-refactor-send-component 2018-04-24 13:31:39 -02:30
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
Dan Finlay
c9d3b158b6
Merge pull request #4062 from MetaMask/i4056-LatestPriceApi
Use the metamask balanc3 dev price api
2018-04-23 16:56:04 -07:00
Dan Finlay
9ae2558d20
Merge pull request #3934 from MetaMask/node-engines
package.json - update engines field to require node v8.x.x
2018-04-23 16:42:39 -07:00
Dan Finlay
425525fbc1
Merge pull request #3935 from MetaMask/ci-tests-first-then-dessert
ci - complete all tests before running extras
2018-04-23 16:41:59 -07:00
Dan Finlay
0996daa65d
Merge pull request #4057 from MetaMask/sentry-bump
deps - bump sentry for more detailed fetch failure
2018-04-23 16:40:21 -07:00
Dan Finlay
a833f02f33 Use the metamask balanc3 dev price api
Fixes #4056
2018-04-23 16:39:33 -07:00
Dan Finlay
9dd8158b1d
Merge pull request #4029 from MetaMask/DocumentMetaMaskController
Added docs to MM-controller
2018-04-23 15:49:47 -07:00
Dan Finlay
4289f813e9
Merge pull request #3968 from MetaMask/gh-3653
Clean up network config
2018-04-23 15:49:17 -07:00
Dan Finlay
f1c0d8ad6e
Merge pull request #4028 from MetaMask/i4016-customrpc
Fix custom RPC not redirecting to Settings page
2018-04-23 15:14:23 -07:00
Dan Finlay
9679cdae02
Merge pull request #4041 from MetaMask/DocumentBackground
Document Background Script
2018-04-23 14:49:01 -07:00