m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-14 21:57:12 +01:00
Code
12,016 Commits 2 Branches 0 Tags 265 MiB
10f9912fd5
Commit Graph

3993 Commits

Author SHA1 Message Date
bitpshr
8c0bc7b3e2 bugfix: show extension window if locked regardless of approval 2019-05-16 10:53:37 -04:00
Frankie
a34103987a
drop transactions who's nonce is lower then the known network nonce but were not included in a block (#6388) 
* transactions/pending - check nonce against the network and mark as dropped if not included in a block

* transactions/pending - unifiy "dropped" txs

* transactions/pending - test - fix for new expected behavior

* fix comment

* transactions/pending - clean up dropped event

* fix spelling

Co-Authored-By: frankiebee <frankie.diamond@gmail.com>

* nit fix

* test/tx-pending - clarify test description
 2019-05-16 07:36:53 +02:00
Dan J Miller
c043132b00
Adds e2e test for removing imported accounts. (#6615) 2019-05-15 14:10:11 -02:30
Thomas Huang
7ff1857156 Version Bump 2019-05-15 02:16:05 -07:00
Bruno Barbieri
1d2cf52b64 Fixes bugs in 6.5.1 (#6613) 
* fix bg error

* fix ui exception
 2019-05-15 10:53:09 +02:00
Dan Finlay
985f51a764
Merge pull request #6605 from MetaMask/Version-6.5.1 
Version 6.5.1
 2019-05-14 12:39:44 -07:00
Paul Bouchon
e57ffbed59
feature: integrate gaba/ShapeShiftController (#6569) 2019-05-14 14:38:55 -04:00
Dan Finlay
3d715e5cf9 Version 6.5.1 RC1 2019-05-14 11:25:51 -07:00
Dan J Miller
b81c4e5c98 Set a default value for code in _determineTransactionCategory (#6604) 
* Set a default value for code in _determineTransactionCategory

* Adds e2e tests that fail when token txs without gas param are not properly handled.

* Adds unit tests for _determineTransactionCategory

* Base error throwing and simple gas setting in estimateTxGas on transactionCategory
 2019-05-14 14:14:07 -04:00
Thomas Huang
3b01ba8741
Merge pull request #6596 from MetaMask/Version-6.5.0 
Version 6.5.0
 2019-05-13 10:12:16 -07:00
Whymarrh Whitby
28c4001f52 Update auto-logout to recognize idle time in background (#6593) 
* Fix wording of autoLogoutTimeLimitDescription

* AppStateController and update auto-logout functionality
 2019-05-13 13:46:09 -02:30
Dan Finlay
25323c8e18 Version 6.5.0 RC1 2019-05-10 15:38:32 -07:00
Thomas Huang
08e8fb21dc
Merge pull request #6568 from MetaMask/feature/gaba-phishing-controller 
feature: integrate gaba/PhishingController
 2019-05-10 13:43:20 -07:00
Dan J Miller
13be683701
New settings custom rpc form (#6490) 
* Add networks tab to settings, with header.

* Adds network list to settings network tab.

* Adds form to settings networks tab and connects it to network list.

* Network tab: form adding and editing working

* Settings network form properly handles input errors

* Add translations for settings network form

* Clean up styles of settings network tab.

* Add popup-view styles and behaviour to settings network tab.

* Fix save button on settings network form

* Adds 'Add Network' button and addMode to settings networks tab

* Lint fix for settings networks tab addition

* Fix navigation in settings networks tab.

* Editing an rpcurl in networks tab does not create new network, just changes rpc of old

* Fix layout of settings tabs other than network

* Networks dropdown 'Custom Rpc' item links to networks tab in settings.

* Update settings sidebar networks subheader.

* Make networks tab buttons width consistent with input widths in extension view.

* Fix settings screen subheader height in popup view

* Fix height of add networks button in popup view

* Add optional label to chainId and symbol form labels in networks setting tab

* Style fixes for networks tab headers

* Add ability to customize block explorer used by custom rpc

* Stylistic improvements+fixes to custom rpc form.

* Hide cancel button.

* Highlight and show network form of provider by default.

* Standardize network subheader name to 'Networks'

* Update e2e tests for new settings network form

* Update unit tests for new rpcPrefs prop

* Extract blockexplorer url construction into method.

* Fix broken styles on non-network tabs in popup mode

* Fix block explorer url links for cases when provider in state has not been updated.

* Fix vertical spacing of network form

* Don't allow click of save button on network form if nothing has changed

* Ensure add network button is shown in popup view

* Lint fix for networks tab

* Fix block explorer url preference setting.

* Fix e2e tests for custom blockexplorer in account details modal changes.

* Update integration test states to include frequentRpcList property

* Fix some capitalizations in en/messages.json

* Remove some console.logs added during custom rpc form work

* Fix external account link text and url for modal and dropdown.

* Documentation, url validation, proptype required additions and lint fixes on network tab and form.
 2019-05-09 14:57:14 -02:30
bitpshr
77d3bc252d feature: integrate gaba/PhishingController 2019-05-08 17:56:52 -04:00
Whymarrh Whitby
094e4cf555 Check for unused function arguments (#6583) 
* eslint: Check for unused function arguments

* eslint: Ignore unused '_' in argument list

Also allow any number of '_' e.g., '__' or '___' which is to be used sparingly

* Remove and rename unused arguments
 2019-05-08 15:51:33 -04:00
Dan J Miller
ef8a07c2ce
Adds a transactionCategory to txMeta for use in UI (#6567) 
* Adds a transactionCategory to txMeta for use in UI

* Update transaction controller and tx-gas-util documentation on new code param in multiple functions.
 2019-05-08 16:48:33 -02:30
Chi Kei Chan
56ed189aeb
Auto logout after specific time (#6558) 
* Add i18n strings

* Finish Auto timeout

* Fix linter

* Fix copies

* Add unit test to Advanced Tab component

* Add back actions and container

* Add basic test to ensure container completeness

* No zero, fix linters

* restrict negative in input
 2019-05-08 11:57:21 -07:00
pldespaigne
2d58cfc7a0 refactor & change html pages 2019-05-04 18:57:19 +02:00
pldespaigne
987e58d103 add rinkeby & goerli 2019-05-04 18:56:45 +02:00
kumavis
2845398c3d Refactor ProviderApprovalController to use rpc and publicConfigStore (#6410) 
* Ensure home screen does not render if there are unapproved txs (#6501)

* Ensure that the confirm screen renders before the home screen if there are unapproved txs.

* Only render confirm screen before home screen on mount.

* inpage - revert _metamask api to isEnabled isApproved isUnlocked
 2019-05-03 13:32:05 -04:00
Thomas Huang
c7492f4f54 Include token checksum address in prices lookup for token rates (#6526) 2019-04-30 14:19:58 -02:30
Dan J Miller
4fea9d0cc2
Send metrics event from backend for on chain transaction failures (#6500) 
* Send metrics event from backend for on chain transaction failures

* Passes state object to backEndMetaMetricsEvent, and adds getMetaMetricState selector
 2019-04-29 03:48:40 -02:30
Dan Finlay
a56fc14122 Version 6.4.1 RC1 2019-04-26 10:28:39 -07:00
Sneh Koul
6a60562d66 Opens the original webpage from where installation of MetaMask was re… (#6272) 
* Opens the original webpage from where installation of MetaMask was requested

* Asking for dynamic permissions

* code for forwarder/without extra permissions

* Lint fix for onboardingComplete message sending code.
 2019-04-24 10:49:38 -07:00
Dan Finlay
49d77415db Version 6.4.0 RC1 2019-04-18 08:34:24 -06:00
Chi Kei Chan
931aaeb700 Add token selection to the send screen (#6445) 
* Move send to pages/

* Fix unit tests

* Finish UI

* Integrate asset dropdown to send actions

* Remove console.log

* Hide asset change during edit

* Enable switch from send token to seand eth

* Enable switching from token to eth when editing

* Fix linter

* Fixing test

* Fix unit tests

* Fix linter

* Fix react warning; remove console.log

* fix flat test

* Add metrics

* Address code review comments

* Consistent spacing between send screen form rows.

* Reduce height of gas buttons on send screen.

* Make send screen gas button height dependent on size of contents.
 2019-04-17 16:45:13 -02:30
Paul Bouchon
0db0a187c8 feature: add Goerli support (#6459) 2019-04-17 15:04:49 -02:30
Thomas Huang
00133d31b1
Merge pull request #6444 from MetaMask/localhost-network-dropdown 
Fixes #6321 & #6421 - Add Localhost 8545 for network dropdown names
 2019-04-16 14:39:00 -05:00
Thomas Huang
33836c0463 Set rpcTarget, nickname, and ticker when selecting one of the default networks 2019-04-16 11:15:53 -06:00
Paul Bouchon
a973a7420a
feature: switch token pricing to CoinGecko API (#6424) 2019-04-10 18:37:15 -04:00
Thomas Huang
d7a2ea9a2b Add Localhost 8545 for network dropdown names 2019-04-10 16:34:13 -05:00
Whymarrh Whitby
24761326de
Don't inject web3 on sharefile.com 2019-04-09 14:14:04 -02:30
Dan J Miller
79804ec79b Version 6.3.2 (#6418) 2019-04-08 11:22:23 -07:00
kumavis
d610dfa870
Merge pull request #6401 from MetaMask/provider-error-fix 
metamask-controller - use improved provider-as-middleware utility
 2019-04-05 11:13:51 +08:00
Jenny Pollack
98a2fb43fb
Merge pull request #6406 from MetaMask/remove-user-actions-controller 
remove user actions controller
 2019-04-04 17:30:39 -07:00
pldespaigne
dc4c40414e issue#5742 2019-04-04 17:15:57 +02:00
kumavis
89693a2315 metamask-controller - use improved provider-as-middleware utility 2019-04-04 22:11:28 +08:00
pldespaigne
b26a59dbbe renaming registrar into registry 2019-04-04 14:07:24 +02:00
Thomas Huang
a46ec83c9b Remove NoticeController (#6382) 2019-04-01 22:33:54 -02:30
Thomas Huang
87f393eb31
Merge pull request #6375 from MetaMask/Version-6.3.1 
Version 6.3.1
 2019-03-29 13:27:16 -05:00
Dan Miller
57bcf1449c Version 6.3.1 2019-03-29 15:23:55 -02:30
Chi Kei Chan
adcf03eacc About tab copy changes; Update route for Info & Help in account menu (#6356) 2019-03-29 13:54:03 -02:30
Whymarrh Whitby
125a95ba71
Merge pull request #6364 from MetaMask/prevent-infura-requests-e2e-tests 
Prevent infura requests in e2e tests
 2019-03-29 11:27:05 -02:30
kumavis
c3a605f27a
Merge pull request #6328 from MetaMask/clearNotices 
Clear notices
 2019-03-29 14:23:02 +08:00
kumavis
846038a69c notice-controller - make markAllNoticesRead sync 2019-03-29 12:39:29 +08:00
kumavis
e04f0c877b lib - nodeify - correctly wrap synchronous functions 2019-03-29 12:37:40 +08:00
kumavis
a64855ef49 notices - markAllNoticesRead - use async/await 2019-03-29 12:03:31 +08:00
kumavis
781a39c039 Merge branch 'develop' into clearNotices 2019-03-29 11:54:12 +08:00
kumavis
e4b5556c05 buy-eth-url - lint fix 2019-03-29 10:53:46 +08:00
kumavis
2c3fc18573 buy-eth-url - fix variable name 2019-03-29 10:37:16 +08:00
kumavis
38b85adbe0 Merge branch 'develop' of https://github.com/vimalsagar/metamask-extension into vimalsagar-develop 2019-03-29 10:20:19 +08:00
kumavis
0ae68d1a61
getBuyEthUrl - getDefaultServiceForNetwork then switch on service 2019-03-29 10:03:35 +08:00
Dan Miller
10097b6a11 Default to localhost network when running e2e tests 2019-03-28 16:20:11 -02:30
Dan J Miller
91c4c3bdce Version 6.3.0 (#6350) 2019-03-26 10:03:15 -07:00
Thomas Huang
2a0b98492a enable privacy mode for first time users (#6347) 2019-03-26 12:37:53 -02:30
Jenny Pollack
e09e54bebb remove user actions controller 2019-03-25 23:27:36 -10:00
Dan J Miller
2f13a97d00
Cancel error rebased (#6341) 
* Check balance before showing cancel

* Fix linter

* Use existing helper methods for calculating increased cancel price

* Add tooltip for disabled button

* Lint fix for cancelError branch.

* Disabling of cancel button should account for value of tx.
 2019-03-25 13:55:23 -02:30
Dan J Miller
961ad267df
New settings page rebased (#6333) 
* New setting tab

* Add InfoTab

* Add Advanced tab

* Add Security Tab

* Finish mobile view

* Make new setting page responsive

* Fix linter

* Fix y scrolling

* Update link in network dropdown

* Fix e2e tests

* Remove duplicate translation key

* Resolve merge conflict

* Only change settings header in popup view.

* Place mobile-sync button in advanced-tab of settings
 2019-03-25 13:43:23 -02:30
Dan J Miller
4ff9126ff2
Replaces the coinbase link in the deposit modal with one for wyre (#6302) 2019-03-22 12:32:07 -02:30
Dan J Miller
468bc96bdf
Hide gas price chart and prevent api call when not on ethereum networks. (#6300) 
Add missing translations in gas customization modal
 2019-03-22 12:20:12 -02:30
Chi Kei Chan
31175625b4 Folder restructure (#6304) 
* Remove ui/app/keychains/

* Remove ui/app/img/ (unused images)

* Move conversion-util to helpers/utils/

* Move token-util to helpers/utils/

* Move /helpers/*.js inside /helpers/utils/

* Move util tests inside /helpers/utils/

* Renameand move confirm-transaction/util.js to helpers/utils/

* Move higher-order-components to helpers/higher-order-components/

* Move infura-conversion.json to helpers/constants/

* Move all utility functions to helpers/utils/

* Move pages directory to top-level

* Move all constants to helpers/constants/

* Move metametrics inside helpers/

* Move app and root inside pages/

* Move routes inside helpers/

* Re-organize ducks/

* Move reducers to ducks/

* Move selectors inside selectors/

* Move test out of test folder

* Move action, reducer, store inside store/

* Move ui components inside ui/

* Move UI components inside ui/

* Move connected components inside components/app/

* Move i18n-helper inside helpers/

* Fix unit tests

* Fix unit test

* Move pages components

* Rename routes component

* Move reducers to ducks/index

* Fix bad path in unit test
 2019-03-21 20:33:30 -02:30
Josh Stevens
2aaec1d9fb Stop reloading dapps on network change allowing dapps to decide if it should refresh or not (#6330) 
* feat: `inpageProvider.autoRefreshOnNetworkChange` to allow dapps to control if it refreshes or not

* feat: check the `autoRefreshOnNetworkChange` before a refresh

* fix linting error

* fix: use `window.ethereum` now `web3.ethereum`
 2019-03-21 12:42:23 -07:00
Thomas Huang
c43374a553 Clear notices when setCompletedOnboarding is called 2019-03-20 20:26:48 -05:00
Thomas Huang
00c52d537c Fix typos in English messages (#6317) 2019-03-18 21:01:26 -02:30
William Monti Souza
98699fbbc0 Fixes popups not showing when screen size is odd (#6312) 2019-03-17 18:30:51 -02:30
Whymarrh Whitby
ea34d3b0ff Centre the notification in the current window (#6307) 2019-03-14 12:52:57 -05:00
Thomas Huang
5d565174b7 Patch/bump version (#6294) 2019-03-12 15:24:30 -07:00
kumavis
10691d7d33
Merge pull request #6271 from whymarrh/centre-notificatons 
Centre all notification popups
 2019-03-12 23:36:05 +08:00
bowbowbow
4812fdb7b9 Improve Korean translations (#6268) 2019-03-12 12:29:40 -02:30
Whymarrh Whitby
5bf8a36a87 Centre all notification popups 2019-03-12 11:37:14 -02:30
kumavis
48047f8194 mascara - remove from project (#6283) 2019-03-12 11:17:21 -02:30
Paul Bouchon
daae155ce2 GABA: Integrate AddressBookController (#5847) 
* gaba: integrate AddressBookController

* pin gaba version and update lockfile
 2019-03-11 18:40:41 -10:00
Thomas Huang
59dbb9babb
Merge pull request #6279 from MetaMask/notification-window 
Nonmultiple notifications for batch txs
 2019-03-11 16:54:00 -05:00
Thomas Huang
5abcce2be7 Version 6.2.1 (#6251) 2019-03-11 11:23:11 -07:00
Thomas Huang
43f5fd0716 Nonmultiple notifications for batch txs 2019-03-11 12:37:47 -05:00
Pedro Gutiérrez
858ab42fd6
Uppercase and context fixes on Spanish translation. 2019-03-07 10:54:53 +01:00
Dan J Miller
dc79456695 Version 6.2.0 (#6239) 
* Version 6.2.0 RC1

* Update changelog.md for 6.2.0
 2019-03-05 10:57:10 -08:00
Thomas Huang
7071acbf21 Fix typo 2019-03-05 12:00:39 -06:00
Dan J Miller
c757366355
Metametrics (#6171) 
* Add metametrics provider and util.

* Add backend api and state for participating in metametrics.

* Add frontend action for participating in metametrics.

* Add metametrics opt-in screen.

* Add metametrics events to first time flow.

* Add metametrics events for route changes

* Add metametrics events for send and confirm screens

* Add metametrics events to dropdowns, transactions, log in and out, settings, sig requests and main screen

* Ensures each log in is measured as a new visit by metametrics.

* Ensure metametrics is called with an empty string for dimensions params if specified

* Adds opt in metametrics modal after unlock for existing users

* Adds settings page toggle for opting in and out of MetaMetrics

* Switch metametrics dimensions to page level scope

* Lint, test and translation fixes for metametrics.

* Update design for metametrics opt-in screen

* Complete responsive styling of metametrics-opt-in modal

* Use new chart image on metrics opt in screens

* Incorporate the metametrics opt-in screen into the new onboarding flow

* Update e2e tests to accomodate metametrics changes

* Mock out metametrics network requests in integration tests

* Fix tx-list integration test to support metametrics provider.

* Send number of tokens and accounts data with every metametrics event.

* Update metametrics event descriptor schema and add new events.

* Fix import tos bug and send gas button bug due to metametrics changes.

* Various small fixes on the metametrics branch.

* Add origin custom variable type to metametrics.util

* Fix names of onboarding complete actions (metametrics).

* Fix names of Metrics Options actions (metametrics).

* Clean up code related to metametrics.

* Fix bad merge conflict resolution and improve promise handling in sendMetaMetrics event and confrim tx base

* Don't send a second metrics event if user has gone back during first time flow.

* Collect metametrics on going back from onboarding create/import.

* Add missing custom variable constants for metametrics

* Fix metametrics provider

* Make height of opt-in modal responsive.

* Adjust text content for opt-in modal.

* Update metametrics event names and clean up code in opt-in-modal

* Put phishing warning step next to last in onboarding flow

* Link terms of service on create and import screens of first time flow

* Add subtext to options on the onboarding select action screen.

* Fix styling of bullet points on end of onboarding screen.

* Combine phishing warning and congratulations screens.

* Fix placement of users if unlocking after an incomplete onboarding import flow.

* Fix capitalization in opt-in screen

* Fix last onboarding screen translations

* Add link to 'Learn More' on the last screen of onboarding

* Code clean up: metametrics branch

* Update e2e tests for phishing warning step removal

* e2e tests passing on metametrics branch

* Different tracking urls for metametrics on development and prod
 2019-03-05 12:15:01 -03:30
Thomas Huang
8e99a537ca Simplify 2019-03-04 17:47:48 -06:00
Thomas Huang
5a8221253e Improvement 2019-02-28 13:58:37 -06:00
Thomas Huang
973042bafa Show popup if notification or activeMMtab is true but not if popup is open 2019-02-28 13:24:48 -06:00
Vimal
ab5fe4d659 PR 5575 review comment fixes 2019-02-28 19:50:48 +05:30
Dan J Miller
cb2698d20e First time flow updates (#6192) 
* Action select step of onboarding flow added.

* Update navigation on create and import password screens.

* Adds terms of service checkbox to create and import account screens.

* Add security warning to jazzicon intro step

* Update and streamline unique image to confirm seed steps of first time flow.

* UI touch ups to welcome screen.

* UI touch up on select action page

* Fix first time import flow.

* Add end of flow screen to first time flow

* Replace unique image screen with updated fishing warning screen.

* Update e2e tests for onboarding flow changes.

* Add required translations to onboarding flow.

* Update design of select action screen to emphasize create new wallet option.

* Clean up onboarding flow code.

* Remove notice related code from first-time-flow directory.

* Use updater function argument in new-account.component
 2019-02-27 11:16:41 -03:30
Chi Kei Chan
a2320c76fe Show/Hide Fiat on Testnets based on User Preference (#6153) 2019-02-26 15:00:41 -03:30
Dan Finlay
f507f2a927 Feature Flag + Mobile Sync (#5955) 2019-02-25 15:40:13 -03:30
Jenny Pollack
c6e84ccf45 account tracker - update accounts from balanceChecker contract (#6181) 
* account tracker - update accounts from balanceChecker contract

* fall back to getBalance if the contract query fails
 2019-02-20 09:12:12 -10:00
Paul Bouchon
2f7d449427 EIP-1193: standard provider API (#6170) 
* EIP-1193: Implement new provider API

* EIP-1193: Updated implementation

* Remove test file

* Fix tests

* Update ping check

* Update logic

* PR feedback
 2019-02-19 16:42:08 -08:00
Dan J Miller
641f7c8f4b
Merge pull request #6183 from chikeichan/5171 
Bring Popup to front when ui is tiggered
 2019-02-19 20:59:02 -03:30
Dan Finlay
29b64bdb17 Version 6.1.0 RC1 2019-02-19 12:22:01 -08:00
Chi Kei Chan
24ed53bbf3 Change "Token Address" to "Token Contract Address" (#6182) 2019-02-19 16:22:09 -03:30
Chi Kei Chan
d9039f5292 Bring Popup to front when ui is tiggered 2019-02-18 20:34:29 -08:00
Graham Kaemmer
89c4353408 Fix inpage.js event handler memory leak (#6177) 
Fixes #6176
 2019-02-18 16:07:58 -05:00
Chi Kei Chan
b58a9bd202 Add Copy Tx ID button to transaction-list-item-details (#6146) 
* Add Copy Tx ID button to transaction-list-item-details

* Move justCopied toggle timeout inside setState callback
 2019-02-17 01:00:02 -03:30
Whymarrh Whitby
ce543f059e
Merge pull request #6137 from whymarrh/es6-background 
Sprinkle ES6 onto background files
 2019-02-14 10:43:56 -03:30
Jonathan Smirnoff
8dddf48904 Fixed issue #5838 (#6001) 
Update changelog file
 2019-02-13 10:30:46 -10:00
Thomas Huang
c54656efb7
Merge pull request #6124 from MetaMask/dissable-recent-block-controller 
recent-blocks - dont listen for block when on infura providers
 2019-02-12 11:42:29 -08:00
frankiebee
c10fb3ce3f fix typo 2019-02-12 09:05:06 -10:00
Whymarrh Whitby
ff292dcb70 Version 6.0.1 (#6141) 2019-02-12 08:33:40 -08:00
Whymarrh Whitby
92cc60f425 Update popup-core script to use ES6 destructuring, const, let 2019-02-12 10:36:15 -03:30
Whymarrh Whitby
ade96fda41 Update platforms/extension to use ES6 destructuring requires 2019-02-12 10:36:15 -03:30
Whymarrh Whitby
5d3aea7857 Update phishing-detect script to use ES6 destructuring requires 2019-02-12 10:36:15 -03:30
Whymarrh Whitby
d735439de9 Update NoticesController to use ES6 destructuring, const, let 2019-02-12 10:36:15 -03:30
Whymarrh Whitby
ae084cef6c Update MetaMaskController to use ES6 destructuring, const, let 2019-02-12 10:36:15 -03:30
Whymarrh Whitby
f5eb1512d4 Fix all "var used instead of let or const" problems in inpage.js 2019-02-12 10:36:15 -03:30
Whymarrh Whitby
3c915b0d7f Update contentscript to use ES6 destructuring, const, let 2019-02-12 10:36:15 -03:30
Whymarrh Whitby
969cf73fae Fix all "var used instead of let or const" problems in background.js 2019-02-12 10:36:15 -03:30
matteopey
7f9d8de4ce Update Italian translation (#6119) 2019-02-12 00:54:27 -03:30
S.C. Chen
f1048ad59a Improved Traditional Chinese translation (#6125) 2019-02-11 20:20:38 -08:00
frankiebee
7e64a578a4 recent-blocks - dont listen for block when on infura providers 2019-02-11 09:16:03 -10:00
Dan Finlay
140fcb4bf1
Version 6 RC1 (#6117) 
* Version 6 RC1

* Make gas input feature more readable

* Update CHANGELOG.md with additional 6.0.0 changes
 2019-02-11 10:19:07 -08:00
S.C. Chen
1a4203a8c6 Fix locale codes contains underscore will never be preferred (#6116) 2019-02-08 16:06:37 -03:30
Chi Kei Chan
798930afba Add Swap feature to CurrencyInput (#6091) 
* Add Swap feature to CurrencyInput

* Fix linter error

* Fix and Add unit tests
 2019-02-06 11:44:17 -03:30
Dan J Miller
38b91f63a2 Add togglable advanced gas controls on send and confirm screens (#6112) 
* Extract advanced gas input controls to their own component

* Add advanced inline gas toggle to settings

* Add optional advanced inline gas to send send screen

* Adds optional advanced gas inputs to the confirm screen

* Add info modals for advanced gas inputs.

* Fix translation of advance gas toggle description.

* Lint and unit test fixes for inline-advanced-gas-inputs

* Increase margin above advanced options button on send screen

* Move methods from constructor to property syntax in advanced-gas-inputs.component
 2019-02-05 16:24:28 -08:00
Whymarrh Whitby
59a5f550e4 Update design of phishing warning screen 2019-02-05 13:18:24 -03:30
Whymarrh Whitby
f3a7054f6b Add announcement for users migrated to the new UI 2019-02-05 08:49:55 -03:30
Whymarrh Whitby
c52ba96b85 Remove betaUI preference state, replace with completedUiMigration 2019-02-05 08:49:55 -03:30
Whymarrh Whitby
a7a6318c13 Default to the new UI for all users 2019-02-05 08:49:55 -03:30
Whymarrh Whitby
7bbd6e7039 Version 5.3.5 (#6109) 2019-02-04 12:04:43 -08:00
Bruno Barbieri
cc03a7db6a
Privacy mode fixes (#6087) 
* Version 5.3.4 RC1

* fix old ui approval screen

* fix error caused by meshtesting iframe

* fix linter errors
 2019-02-01 14:05:46 -05:00
Dan Finlay
015414c31d
Version 5.3.4 RC1 (#6084) 2019-01-31 10:27:58 -08:00
Frankie
4e27b644ab fix - migration 30 undefinds (#6079) 2019-01-31 10:09:28 -08:00
Dan Finlay
5c49ce77bd Version 5.3.3 RC1 2019-01-30 10:45:42 -08:00
Paul Bouchon
db776b5a02 EIP-1102 updates (#6006) 
* Update privacy notice

* Respond to 1102 messages using tab ID
 2019-01-30 10:27:33 -08:00
Pedro Gutiérrez
79cd40b979 Improved Spanish translations (#6072) 2019-01-30 14:45:27 -03:30
Dan J Miller
02bdbbbc3e Add visual indicator when displaying a cached balance (#5854) 2019-01-30 08:46:12 -03:30
Frankie
df3169d1c7
I#5956 fix2 dont overwrite existing rpc settings (#6044) 
* mm-controller - dont overwrite existing rpc settings

* ui-networkDropdown - dont pass old network as chainId

* add methods preferencesController.updateRpc and metamaskController.updateAndSetCustomRpc

* use updateAndSetCustomRpc in settings to allow rpcs to be updated

* use new rpc as nickname if no nick name has been supplied

* fix update rpc method
 2019-01-29 08:13:51 -10:00
Dan Finlay
98d5b4d632
Version 5.3.2 RC1 (#6069) 2019-01-28 11:14:32 -08:00
Jenny Pollack
456bfaf9ed add source for header in create infura client (#6023) 
* add source for header in create infura client

* bump eth-json-rpc-infura
 2019-01-24 14:56:55 -10:00
Alexander Tseung
fba17d77de Refactor first time flow, remove seed phrase from state (#5994) 
* Refactor and fix styling for first time flow. Remove seed phrase from persisted metamask state

* Fix linting and tests

* Fix translations, initialization notice routing

* Fix drizzle tests

* Fix e2e tests

* Fix integration tests

* Fix styling

* Fix migration naming from 030 to 031

* Open extension in browser when user has not completed onboarding
 2019-01-23 11:55:34 -03:30
oliver renwick
69fcfa427b Updated Spanish translations (#6046) 
* up to E's in translation, starting from about 60% incomplete
* Spanish at 100%
* Integrating changes as suggested by fernandomg
* with updates from Herman and Esteban.
 2019-01-23 11:54:27 -03:30
Esteban Miño
1d93d9a385 Prevent send to token (#6051) 
* check contact metadata

* check for tokens in state

* tests

* update tests

* validation only if sending tokens

* container test
 2019-01-22 11:05:59 -08:00
Bruno Barbieri
2cfea0b788 fix asset detection (#6049) 2019-01-22 10:23:11 -08:00
Esteban Miño
e21dfd1862 Use Parity on-chain registry only when is needed (#6052) 
* add and use knownMethodData to avoid infura requests

* dataMethod to methodData and check empty response
 2019-01-22 10:22:56 -08:00
Frankie
0ad7797076
I#5956 fix 1 (#6026) 
* prevent invalid chainId's when adding cusstom rpcs

* migration 30 removes invalid chaids from preferences and networkController for custom rpcs
 2019-01-17 09:10:33 -10:00
Alexander Tseung
de0ac53008 Fix grammar error in Current Conversion (#6029) 2019-01-17 11:37:38 -03:30
Dan Finlay
72775340bb Version 5.3.1 RC2 2019-01-16 11:25:41 -08:00
Thomas Huang
42e67295f4
Merge pull request #5966 from filips123/patch-1 
Update Slovenian translation
 2019-01-10 11:39:25 -08:00
Thomas Huang
3bd3e640b4 Set auto conversion off for token/eth conversion (#6005) 2019-01-10 10:36:30 -08:00
Filip Š
7ff8d6c6b1 Merge branch 'develop' of https://github.com/MetaMask/metamask-extension into patch-1 2019-01-10 14:27:21 +01:00
Dan Finlay
58f55eeca9
Refine app description 
Should help SEO on the chrome store.
 2019-01-05 11:10:47 -08:00
Wathis
089fd5f430 Wrong french translation 
Changing "Connection" by "Connexion"
 2019-01-04 08:21:03 -03:30
Thomas Huang
cdb202a65e
Merge pull request #5987 from MetaMask/Version-5.3.0 
Version 5.3.0 RC1
 2019-01-03 13:29:07 -08:00
Thomas Huang
9b0b2f32f7
Merge pull request #5992 from MetaMask/i5140-accounts 
Add scrolling button to account list
 2019-01-03 13:28:36 -08:00
Alexander Tseung
0b4469b842 Add scrolling button to account list 2019-01-03 11:22:38 -08:00
Paul Chonpimai
9de32722b8 fix typo in phishing.html title 2019-01-03 14:31:53 +07:00
Dan Finlay
da7208c16d Version 5.3.0 RC1 2019-01-02 16:44:59 -08:00
brunobar79
c49d975687 fix extension link 2019-01-02 19:03:35 -05:00
Bruno Barbieri
701bc1cbd1
Fix etherscan links on notifications 2018-12-28 17:34:26 -05:00
Filip Š
dc2d16ca47
Update Slovenian translation 2018-12-26 16:52:20 +01:00
Frankie
b5d6452454
Disallow loading as metamaskNetworkId (#5924) 
* transactions - throw an error if a transaction is generated while the network is loading

* add tests for failing when netId is loading
 2018-12-13 09:14:46 -10:00
Dan J Miller
c5861c88a5
Merge pull request #5893 from MetaMask/loading-network-screen 
Loading network screen
 2018-12-13 14:20:27 -03:30
Dan Finlay
75a737b69a Version 5.2.2 RC1 2018-12-12 18:48:50 -08:00
Dan Miller
04cc98d8e4 Clean up for the loading-network-screen 2018-12-12 14:14:52 -03:30
Dan Miller
0e5e51b8ff Add identifier of private network to the network loading screen message. 2018-12-12 13:53:37 -03:30
Dan J Miller
970bdebb86
Merge pull request #5919 from MetaMask/gas-customization-fixes 
Fix some styling and translations in the gas customization modal
 2018-12-12 13:38:11 -03:30
Dan J Miller
ea5eb855e8 Version 5.2.1 RC1 (#5918) 2018-12-12 09:02:42 -08:00
Dan Miller
3cca6fc886 Add missing translation to the gas customization component. 2018-12-12 13:05:25 -03:30
Thomas Huang
d6fa967b1f
Merge pull request #5902 from MetaMask/i5846-ProviderCrashes 
Fix provider crashes
 2018-12-11 10:24:14 -08:00
Dan Miller
5ab3f5bb20 Changelog and version bump for 5.2.0 2018-12-11 13:51:19 -03:30
Alexander Tseung
dde239797b
Show Failed transaction in the browser notification for on-chain failures (#5904) 2018-12-10 18:02:26 -08:00
Alexander Tseung
d8ab9cc002
Group transactions by nonce (#5886) 2018-12-09 12:48:06 -08:00
Thomas Huang
575fb607c3
Merge pull request #5892 from MetaMask/fix-net-version-race-condition 
Fix race condition in network controller lookup() method.
 2018-12-07 14:49:00 -08:00
Dan Miller
246dcf689c Fix race condition in network controller lookup() method. 2018-12-06 16:13:24 -03:30
Whymarrh Whitby
80d7be0a19 Fill in more Polish message translations 2018-12-06 11:11:02 -03:30
Dan Miller
fe535159bb Fix "fastest" translation message; change to sentence case 2018-12-04 00:06:22 -03:30
Dan Miller
9b9a2cc2e0 Adds createSpeedUpTransaction to txController 2018-12-04 00:06:05 -03:30
Dan Miller
3162a2747c Redesign of gas customization basic tab. 2018-12-04 00:06:05 -03:30
Dan Miller
6f8e2b1ad9 Clean up for advanced gas tab customization changes. 2018-12-04 00:06:05 -03:30
Dan Miller
5354325fab Test updates and additions for button integration with send screen. 2018-12-04 00:06:04 -03:30
Dan Miller
b567c78bca Integrate gas buttons with the send screen. 2018-12-04 00:06:04 -03:30
Dan Miller
d55a2615a4 Split advanced-tab-content.component.js render() method into smaller pieces; add translations to the same file. 2018-12-04 00:06:04 -03:30
Dan Miller
342dc95410 Adds the content of the advanced tab - w/o chart or dynamic content - to gas customize modal. 2018-12-04 00:06:04 -03:30
Dan Miller
f9aa5a70de Adds new gas customization modal container (without content) 2018-12-04 00:06:04 -03:30
Dan Finlay
a1528674bc Version 5.1.0: East Bay 2018-12-03 10:54:31 -08:00
Dan Finlay
4935c31711 Update phishing warning copy 
Per advice of legal counsel.
 2018-12-03 09:55:02 -08:00
Michael - Blurpesec
7f6928782a Hide link for phishing-detect page (#5864) 
* Soften language on phishing-detect page

* remove quotes
 2018-12-01 20:15:59 -08:00
Bruno Barbieri
be255210a9
fix visibility 2018-11-30 20:54:57 -05:00
Dan J Miller
4c24555545 Save recent network balances in local storage (#5843) 
* Use selector for state.metamask.accounts in all cases.

* Default to cached balance when selecting metamask accounts

* Adds the cached-balances controller

* Documentation and small codes fixes for #5843

Co-Authored-By: danjm <danjm.com@gmail.com>
 2018-11-30 14:51:24 -08:00
Paul Bouchon
45a9f40aa6
bugfix: normalize contract addresss when fetching exchange rates (#5863) 2018-11-30 11:52:00 -05:00
Dan Finlay
c7233e2cc7
Fixed Vivek's bug (#5860) 
* Fixed Vivek's bug

Fixes #5850

What was happening:

It seems that his MetaMask had crashed while some new transactions had
been loading defaults. He probably had a network connectivity issue to
Infura (which we are working with Infura to address).

As a result of this network cutout, his three unapproved transactions
were not marked failed, and were not marked as `loadingDefaults =
false`, as their gas prices had not yet been estimated.

Normally this behavior is supposed to clean itself up when the
transaction controller starts up, via the
`TransactionController._onBootCleanUp()` function, but in this case,
during unlock, that function was unable to do its job because when it
requested the transaction list, the current network was in the `loading`
state, making it proceed as if there were no pending transactions.

To fix this, I am doing two things:
- Setting transactions to loadingDefaults = false in more catch blocks.
- Calling `onBootCleanUp()` when the network store's status changes, so
that it will re-trigger when loading completes.

* Fixed reference

* Fixed infinite loop bug

Was refreshing the tx list on every tx state change instead of just
network changes, creating an infinite loop.

* Add notes to tx updates to clarify logs
 2018-11-29 16:08:03 -08:00
Dan Finlay
4be3fe5906 Version 5.0.4 RC1 (#5859) 2018-11-29 11:43:00 -10:00
Frankie
a803522a92 transactions/tx-gas-utils - add the acctual response for eth_getCode for NO_CONTRACT_ERROR's && add a debug object to simulationFailed (#5840) 2018-11-29 10:07:05 -08:00
Whymarrh Whitby
67d9f445bd
Merge pull request #5848 from MetaMask/Less-Certain-Language 
Soften accusatory language on phishing warning
 2018-11-28 15:44:36 -03:30
Dan Finlay
ac1b756bd0 Soften accusatory language on phishing warning 
We don't always know for sure that sites marked as phishers are
defiitely scams, and so we should avoid language that makes concrete
accusations.
 2018-11-28 08:35:03 -08:00
Whymarrh Whitby
a9d3c1a87d Open full-screen UI on install 2018-11-27 09:52:51 -03:30
Whymarrh Whitby
3e85d580f9 Revert "Don't open MetaMask website after install" 2018-11-27 08:50:54 -03:30
Frankie
8198ec9ae1
Autofill gasPrice for retry attempts with either the recommended gasprice or a %10 bump (#5786) 
* transactions - autofill gasPrice for retry attempts with either the recomened gasprice or a %10 bump

* lint
 2018-11-26 09:29:14 -10:00
Frankie
97c1e6bcc1
transactions - ensure err is defined when setting tx failed (#5801) 2018-11-26 09:00:58 -10:00
Bruno Barbieri
3b1e73eff8
Merge pull request #5792 from MetaMask/signed-type-data-error-hw-wallet 
Consider HW Wallets for signTypedMessage
 2018-11-26 13:40:04 -05:00
Bruno Barbieri
f2066432ba
Use Array.includes 2018-11-26 13:27:49 -05:00
Whymarrh Whitby
08c98a6df7 Show Connect Requests count in extension badge 2018-11-26 12:09:22 -03:30
Whymarrh Whitby
826eb82ed8 Use initState to avoid type-checking providerRequests in state 2018-11-26 12:06:17 -03:30
Thomas Huang
4054b1cb84 Increase Token Symbol length to twelve 2018-11-22 12:39:59 -06:00
Bruno Barbieri
ae8626eceb
Merge pull request #5797 from MetaMask/trezor-v6 
Add Firefox and Brave support for Trezor
 2018-11-21 14:45:55 -05:00
Whymarrh Whitby
66e0de73c5
Merge pull request #5334 from whymarrh/ui-switch 
Default to the new UI for first time users
 2018-11-21 15:21:04 -03:30
brunobar79
7fb9f91d27 trezor v6 2018-11-20 19:12:11 -05:00
brunobar79
9b1df386de fix merge conflicts 2018-11-20 17:44:28 -05:00
Dan Finlay
5956f8d260 Version 5.0.3 (#5785) 
* Version 5.0.3

Includes a fix to the `version:bump` script that now correctly updates
the changelog header.

* Include inpage provider events
 2018-11-20 08:34:14 -10:00
brunobar79
fb94c1bae7 remove extra semicolon 2018-11-20 12:57:58 -05:00
brunobar79
3abf9ec7db consider hw wallets 2018-11-20 12:48:43 -05:00
Whymarrh Whitby
6b32e82ac1 Remove "Beta" from welcome messages 
More sed magic:

    sed -i.bak 's/MetaMask Beta/MetaMask/' app/_locales/**/messages.json && \
    find app/_locales -name '*.bak' -delete

    sed -i.bak 's/"welcomeBeta"/"welcome"/' app/_locales/**/messages.json && \
    find app/_locales -name '*.bak' -delete
 2018-11-20 14:04:50 -03:30
Whymarrh Whitby
444c68ae53 Don't announce new UI to users switching back 2018-11-20 14:04:50 -03:30
Whymarrh Whitby
c5da84d7a2 Remove "Beta" from header logo 2018-11-20 14:04:50 -03:30
Whymarrh Whitby
c482c9926c Default to the new UI for first time users 2018-11-20 14:04:17 -03:30
Paul Bouchon
7fe37276a1
1102: Push publicConfigStore to next turn to avoid race conditiono (#5777) 2018-11-18 07:23:04 -05:00
Dan Finlay
fdea642e6d
Auto fail transactions that have been approved for over 12 hours (#5765) 
* Auto fail transactions that have been approved for over 12 hours

Converts txs using a migration.

This migration uses a new helper function that generates tx-failing
migrations, and only requires a version, error message, and condition to
run on each transaction.

* Linted

* Only migrate approved txs to failed

* Cleanup

* Cleanup

* Small lint fixes
 2018-11-16 21:27:01 -08:00
Whymarrh Whitby
1988e1e96b ESLint fixes (#5775) 
* eslint . --fix

* Upgrade all ESLint warnings to errors
 2018-11-16 14:54:55 -10:00
Frankie
ce147bf6d8 Tx controller now uses safe event emitter (#5769) 
* transactions - use safe-event-emitter over events

* tests - pass a platform object on init with a noop showTransactionNotification

* test - fix for tx-state-history-helper trying to reduce an empty array

* deps - safe-event-emitter

* lint
 2018-11-16 10:34:08 -08:00
brunobar79
e44b750f0f Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 2018-11-15 00:29:06 -05:00
Dan Finlay
22ba0b0c2d Resubmit approved transactions on new block (#5752) 
* Add beginning of test

* Resubmit approved transactions on new block

May fix #4343 and related issues, where an error could leave
transactions stranded in the approved state.

* Remove unused test

* Re-approve transactions when retrying approved

* Add retry approved test

* Include approved in pending tx count

* Fix getPendingTxs()

* Linted

* Only throw hash error in submitted state

* Only check submitted txs for block inclusion

* Fix test expectations
 2018-11-14 11:34:07 -10:00
brunobar79
18f39ef69e Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 2018-11-14 15:42:45 -05:00
Paul Bouchon
f6e042b7b1 1102: use meta title if it exists before title 2018-11-14 10:43:10 -08:00
brunobar79
484aa6801e Merge branch 'develop' into trezor-v5 2018-11-13 17:21:15 -05:00
Paul Bouchon
0549782595
Update Balanc3 API (#5744) 
* Update balanc3 API used in TokenRatesController

* Remove demo URL and use nativeCurrency when fetching token rates
 2018-11-13 14:57:43 -05:00
PaddyMc
7ce2cf4572 Fixes #3425: Better support for batch transactions (#5437) 2018-11-13 13:49:12 -03:30
Filip Š
d943345151 Slovenian and slovak fixes (#5730) 
* Fix Slovenian translation

* Add Slovak translation
 2018-11-12 11:15:55 -05:00
Vimal
6bb92a8672 merging upstream branch 2018-11-12 17:50:37 +05:30
Dan Finlay
da1036f2c4 Version 5.0.2 2018-11-09 20:03:18 -08:00
Paul Bouchon
c317624854 EIP-1102: Update publicConfig store concurrently with approval 2018-11-09 18:21:59 -08:00
Noah I
8bed073f20 1102: Fix inpage listener syntax (#5708) (#5709) 2018-11-09 07:14:32 -05:00
Dan Finlay
e53ceb6bc1 Version 5.0.1 (#5694) 2018-11-07 12:07:14 -05:00
Dan J Miller
0dd0d8fc83
Merge pull request #5547 from MetaMask/front-ends-deps-gulp-bundle 
Bundle some ui dependencies separately to limit the build size of ui.js
 2018-11-07 13:31:56 -03:30
bitpshr
718393f89a Cleanup 2018-11-07 08:47:25 -08:00
bitpshr
a224b71837 1102: use postMessage instead of injected scripts to bypass CSP 2018-11-07 08:47:25 -08:00
bitpshr
1ce3591c8e wip 2018-11-07 08:47:25 -08:00
brunobar79
c651212025 fix merge conflicts 2018-11-06 20:21:19 -05:00
bitpshr
896ae0ab89 Fix lint errors 2018-11-06 14:30:50 -05:00
bitpshr
d7b1cacabc Remove injected script tags after use 2018-11-06 14:26:02 -05:00
bitpshr
34d80f21e2 Clear cached approval after rejection 2018-11-06 14:13:27 -05:00
Dan Finlay
7b8a73b01f Version 5.0.0 (#5685) 2018-11-06 11:42:22 -05:00
bitpshr
b3f428fd1f Move experimental provider augmentation 2018-11-05 15:07:09 -08:00
bitpshr
879997af51 Add experimental RPC method support 2018-11-05 15:07:09 -08:00
Whymarrh Whitby
26ada8a828 Update Connect Request screen design (#5644) 
* Parameterize NetworkDisplay background colour

* Update design for login request screen

* Pass siteTitle, siteImage through for calls to ethereum.enable()

* Bring the site images closer together
 2018-11-05 15:07:09 -08:00
bitpshr
31cb111d2e Do not modify isApproved when locked 2018-11-05 15:07:09 -08:00
bitpshr
9984f7edeb Mark origins as unapproved if user explicitly locks MetaMask 2018-11-05 15:07:09 -08:00
Paul Bouchon
f557d33718 Enable caching 2018-11-05 15:07:09 -08:00
bitpshr
991e08e346 isApproved should return false 2018-11-05 15:07:09 -08:00
bitpshr
72730b3929 Remove internal listeners 2018-11-05 15:07:09 -08:00
bitpshr
cc27a09a1a rebase 2018-11-05 15:07:09 -08:00
bitpshr
d4171ccea5 Disable approval caching 2018-11-05 15:07:09 -08:00
bitpshr
cc1bab6ebb Differentiate locked and enabled 2018-11-05 15:07:09 -08:00
bitpshr
d7618bd5c6 Code bath 2018-11-05 15:07:09 -08:00
bitpshr
ba40fcbcb4 Handle logout gracefully 2018-11-05 15:07:09 -08:00
bitpshr
f02e18dd80 Fix lint issues 2018-11-05 15:07:09 -08:00
bitpshr
ace7cfa065 Only filter selectedAddress from publicConfig store 2018-11-05 15:07:09 -08:00
bitpshr
f35466a247 Fix race condition with publicConfigStore 2018-11-05 15:07:09 -08:00
bitpshr
32630b68df Move convenience methods to _metamask namespace 2018-11-05 15:07:09 -08:00
bitpshr
504f4a50f1 Fix lint issues 2018-11-05 15:07:09 -08:00
bitpshr
84874a639d Add isUnlocked provider hook 2018-11-05 15:07:09 -08:00
bitpshr
573139b935 Differentiate isEnabled and isApproved hook 2018-11-05 15:07:09 -08:00
bitpshr
3a2ade4e84 Update isEnabled check 2018-11-05 15:07:09 -08:00
bitpshr
5fff6dcbbd Remove duplicate i18n keys 2018-11-05 15:07:09 -08:00
bitpshr
226601a956 EIP-1102: add user privacy option 2018-11-05 15:07:09 -08:00
bitpshr
bfcb73ad53 EIP-1102: add isEnabled convenience method to provider 2018-11-05 15:07:09 -08:00
bitpshr
89b4aa5d62 EIP-1102: Add option to force-enable provider 2018-11-05 15:07:09 -08:00
bitpshr
c76c9ca2c8 EIP-1102: updated implementation 2018-11-05 15:07:09 -08:00
Dan Finlay
2d4ff1dd82 Version 4.17.1 2018-11-05 14:05:33 -08:00
kumavis
86f09e6bb5 network - infura - hardcode net_version and eth_chainId (#5670) 
* network - infura - hardcode net_version and eth_chainId
* network - infura - add rinkeby handling
* lint fix
 2018-11-05 14:13:37 -05:00
Esteban Miño
4489a57f2f Update watchAsset ERC20 validation (#5653) 
* update ERC20 token valodation for watchAsset

* update ERC20 validation test descriptions
 2018-11-05 15:36:34 -03:30
kumavis
14852669ac
Merge pull request #5659 from MetaMask/token-rates-bugfix 
token-rates - protect against bad token data
 2018-11-03 21:57:21 -04:00
Thomas Huang
ed4f612bdc Revert "support eth_chainId" 2018-11-03 14:21:41 -07:00
kumavis
2c1bca1ab0 token-rates - protect against bad token data 2018-11-02 22:14:40 -04:00
kumavis
e683684e8d 4.17.0 2018-11-01 21:05:37 -04:00
Dan Miller
da5f4a792c Bundle some ui dependencies separately to limit the build size of ui.js 2018-10-31 20:47:22 -02:30
kumavis
73eeeda215
Merge pull request #5560 from MetaMask/sentry-enhancements2 
Sentry - various enhancements to help debugging (alternate)
 2018-10-29 21:57:51 -04:00
kumavis
310229d22e
Merge pull request #5567 from MetaMask/HowardBraham-develop 
Feature: Warn when attempting to send tx with data to non-contract
 2018-10-29 21:47:07 -04:00
kumavis
7ae5a23b6c Merge branch 'sentry-enhancements2' of github.com:MetaMask/metamask-extension into sentry-enhancements2 2018-10-29 20:28:02 -04:00
kumavis
ccbc233282 Merge branch 'develop' of github.com:MetaMask/metamask-extension into sentry-enhancements2 2018-10-29 20:25:05 -04:00
kumavis
1bb4a8428c
Merge pull request #5596 from MetaMask/validateSignTypedData 
Validate signTypedData signer/address in eth-json-rpc-middleware
 2018-10-29 20:11:04 -04:00
kumavis
ad009a4606
Merge branch 'develop' into sentry-enhancements2 2018-10-29 19:49:53 -04:00
kumavis
18e530221b
Merge pull request #5552 from EthersocialNetwork/eth_chainid 
network - check eth_chainId and fallback to net_version
 2018-10-29 19:43:25 -04:00
kumavis
2baa57bc4a
Merge pull request #5625 from filips123/develop 
i18n - Better Slovenian translation
 2018-10-29 19:13:21 -04:00
kumavis
986f8b4c21
preferences - fix typo 2018-10-29 18:56:29 -04:00
Filip Š
26012f5879
Fix Slovenian translation 2018-10-27 16:54:37 +02:00
Filip Š
38f0a3e471 Add Slovenian translation for EIP-1102 2018-10-27 13:33:56 +02:00
Filip Š
77bc4227e3 Fix Slovenian translation 2018-10-27 13:22:34 +02:00
hackyminer
bc7f8d0a5b
Merge branch 'develop' into eth_chainid 2018-10-26 20:37:35 +09:00
HackyMiner
54a8ade266 Add support for RPC endpoints with custom chain IDs (#5134) 2018-10-26 10:26:43 +02:00
kumavis
9b42416fc0 Merge branch 'develop' of github.com:MetaMask/metamask-extension into HowardBraham-develop 2018-10-25 22:24:30 -04:00
Thomas
8c0e5e97e5 Add version to unapprovedMessage 2018-10-24 20:24:42 -07:00
Thomas
95b92a1ddc Remove commented out/unused methods 2018-10-24 20:13:40 -07:00
Thomas
1d65687ce4 Validate signTypedData in eth-json-rpc-middleware 2018-10-24 20:03:55 -07:00
Alexander Tseung
7852269ed1
Add Activity Log entry for onchain failures for a transaction. Change scrolling of the transaction list. Remove Transaction Details modal. (#5581) 2018-10-23 19:59:04 +08:00
kumavis
97056d2ee6
Merge pull request #5576 from marijnbent/patch-1 
i18n - Updated Dutch translation for main network name
 2018-10-22 23:02:33 -04:00
kumavis
3e2bf36d59 i18n - update haitian translations (#5565) 
* addedd new keys and updated translations to Haitian Creole

* changelog - add entry for hatian creole fix
 2018-10-22 21:55:06 +02:00
Marijn Bent
c12a5a23f7
Updated translation for main network name 
Current translation translates to 'most important Ethereum-network'. 'Main' is totally acceptable to use in Dutch.
 2018-10-22 20:13:12 +02:00
Vimal
82b11b69a5 Adding CoinSwitch exchange 2018-10-22 16:44:21 +05:30
kumavis
6d09f60bbf
ens-ipfs - refactor for readability (#5568) 
* ens-ipfs - refactor for readability

* ens-ipfs - use official ipfs gateway for better performance

* lint - remove unused code

* ens-ipfs - support path and search

* lint - gotta love that linter

* ens-ipfs - improve loading page formatting

* ens-ipfs - loading - redirect to 404 after 1 min timeout

* ens-ipfs - destructure for cleaner code
 2018-10-21 05:48:15 -04:00
kumavis
b62d07f3a5
Update network.js 2018-10-21 04:32:07 -04:00
brunobar79
9c1b2108f6 fix merge conflicts 2018-10-21 01:59:53 -04:00
kumavis
b0c649a4e3
Merge pull request #5555 from MetaMask/support-wallet-watch-asset 
Support for prefix wallet_watchAsset
 2018-10-21 01:27:08 -04:00
kumavis
61c7bbb1c1
network - improve logging and type conversion 2018-10-21 01:20:08 -04:00
kumavis
31e5cad1e3 tx-gas-util - set error message when invalidating tx based on tx data but no contract code 2018-10-21 01:01:21 -04:00
kumavis
17a856cfd3 send tx - validate - simplify error message for attempting to call function on non-contract address 2018-10-21 00:57:45 -04:00
Brandon Wissmann
b53a1f492c i18n - use localized names in language selection 
Fixes #4250 (#5559)

* Added localized names for languages

* Capital letter for Čeština

* capital letter Русский

* i18n - use localized names in language selection

* fix build

* package-lock.json build fix
 2018-10-20 23:55:37 -04:00
kumavis
f0602ca354 Merge branch 'develop' of github.com:MetaMask/metamask-extension into sentry-enhancements2 2018-10-20 23:51:00 -04:00
kumavis
3b46478024
Merge branch 'develop' into develop 2018-10-20 23:48:10 -04:00
kumavis
73ec4e66cb sentry - include app state in ui errors 2018-10-20 03:14:59 -04:00
kumavis
e3fda83ab2 sentry - replace raven-js with sentry/browser 2018-10-20 02:22:50 -04:00
Esteban Miño
7c4f98ffd6 specific add and remove methods for frequentRpcList (#5554) 2018-10-19 17:50:54 -02:30
Esteban MIno
75661673e5 add support for wallet_watchAsset 2018-10-19 13:57:11 -03:00
hackyminer
2f6530a494
support both eth_chainId and net_version 
get the real chainId using eth_chainId and use net_version as a fallback
 2018-10-20 01:08:46 +09:00
kumavis
31175dcb24 blacklist + currency - report error via log instead of throw 2018-10-19 07:18:16 -04:00
kumavis
a57d267dcb lint fix 2018-10-19 07:08:04 -04:00
kumavis
b85ae55cd5 fetch debugger - only append source stack if no stack is present 2018-10-19 06:42:53 -04:00
kumavis
3e3d4b9dde sentry - failed txs - namespace txMeta for better readability 2018-10-19 05:30:21 -04:00
kumavis
2394881511 currency - throw errors on failure 2018-10-19 04:58:19 -04:00
kumavis
65aa0a1d14 blacklist - throw errors on request/parse failure 2018-10-19 04:51:03 -04:00
kumavis
26b30a031d sentry - move isBrave decoration to insides of try-catch 2018-10-19 04:36:36 -04:00
kumavis
09c3611171 4.16.0 2018-10-17 19:49:25 -04:00
kumavis
fa36dbf981 inpage - increase provider max listeners to avoid warnings 2018-10-17 19:17:39 -04:00
Bartek
2c2ae8f4c7 i18n - add polish (pl) 2018-10-17 19:04:03 -04:00
kumavis
c289baa17a
Merge pull request #5127 from MetaMask/account-tracker-network-change 
Bug Fix: Force AccountTracker to update balances on network change
 2018-10-17 18:56:54 -04:00
Whymarrh Whitby
03b0929a28
Merge pull request #5536 from whymarrh/add-token-help 
Add clarifying text to the "Add Token" button
 2018-10-17 17:41:46 -02:30
Whymarrh Whitby
0d0bb4afd7
Merge pull request #5522 from MetaMask/fetch-debugging 
debugging - enable fetch debugging
 2018-10-17 17:38:55 -02:30
Whymarrh Whitby
42fa54678f Extract Add Token button into its own component 2018-10-17 15:49:29 -02:30
Alexander Tseung
badebe017f
Adds toggle for primary currency (#5421) 
* Add UnitInput component

* Add CurrencyInput component

* Add UserPreferencedCurrencyInput component

* Add UserPreferencedCurrencyDisplay component

* Add updatePreferences action

* Add styles for CurrencyInput, CurrencyDisplay, and UnitInput

* Update SettingsTab page with Primary Currency toggle

* Refactor currency displays and inputs to use UserPreferenced displays and inputs

* Add TokenInput component

* Add UserPreferencedTokenInput component

* Use TokenInput in the send screen

* Fix unit tests

* Fix e2e and integration tests

* Remove send/CurrencyDisplay component

* Replace diamond unicode character with Eth logo. Fix typos
 2018-10-17 07:03:29 +08:00
Whymarrh Whitby
e96188ce9d Fix wording of private key warning shown during export 2018-10-16 19:05:21 -02:30
Whymarrh Whitby
222da7f523 Update wording on export privkey modal 2018-10-16 17:03:18 -02:30
brunobar79
13820b6cc1 fix conflicts 2018-10-16 14:01:54 -04:00
Whymarrh Whitby
d44b7ef3da Fix document extension check when injecting web3 2018-10-16 11:08:48 -02:30
Noel Yoo
c7758ebd15 Improve Korean translations (#5515) 
* Add more korean translation

* Improve korean translation
 2018-10-15 19:43:32 -02:30
Pedro Gutiérrez
e997285a07 Fixed wrong Spanish translation of key (#5517) 2018-10-15 19:40:00 -02:30
Alexander Tseung
c821a8354c
Add txReceipt data to transaction details (#5513) 2018-10-16 06:00:47 +08:00
matteopey
61dec4ea46 Update Italian translations (#5502) 
* Add new english messages

* Update translation

* Update changelog

* Fix casing of MetaMask
 2018-10-15 19:07:18 -02:30
kumavis
70c45ae8be enable fetch debugging 2018-10-15 01:14:25 -04:00
kumavis
f194f07801 Merge branch 'master' of github.com:MetaMask/metamask-extension into develop 2018-10-11 22:42:37 -04:00
Dan Finlay
1bbc55a533 Correct 4.14.0 version 2018-10-11 10:21:29 -07:00
Thomas Huang
b44ea47066
Merge pull request #5505 from MetaMask/Version-4.14.0 
Version 4.14.0
 2018-10-11 09:56:42 -07:00
Dan Finlay
837eb796e5 Version 4.14.0 2018-10-11 09:42:21 -07:00
Noel Yoo
ba21606dfb Fix en, ko locales (#5483) 
* Fix en typo

* Fix ko typo

* Remove unnecessary space

* Fix ko typo

* Improve translation in ko
 2018-10-11 13:20:59 -02:30
Whymarrh Whitby
af43b7d6c9 Ensure that new transactions added are using the selected address 2018-10-10 16:16:20 -02:30
Whymarrh Whitby
428a7cacdf Revert "transactions - add txReceipt to the txMeta body for confirmed txs (#5375)" 
This reverts commit ff67293a8e.
 2018-10-10 15:30:12 -02:30
kumavis
70fc093b21
Merge pull request #5480 from noelyoo/typo 
Alphabetize locales keys
 2018-10-10 10:27:35 -04:00
Frankie
ff67293a8e transactions - add txReceipt to the txMeta body for confirmed txs (#5375) 2018-10-10 10:26:38 -04:00
noelyoo
63ba8b56fc Alphabetize ko locale json keys 2018-10-10 22:49:08 +09:00
noelyoo
fa228f1c7e Alphabetize en locale json keys 2018-10-10 22:49:04 +09:00
Noel Yoo
999a599a78 Fix formatting of locale files (#5479) 2018-10-10 09:25:11 -02:30
Bruno Barbieri
ccab4ee1a4 tests - integration - Add Drizzle tests (#5467) 
* added drizzle app for testing

* working

* clean up

* clean up script

* make build step required

* add drizzle-tests to .eslintignore

* clean up drizzle run script

* lint

* use truffle unbox

* undo eslintignore changes

* revert change

* dont use global

* dont need this steps

* use the new account flow

* restore package-lock.json
 2018-10-10 01:12:43 -04:00
Vincent
1eec21b945 i18n - fr - improvements 
* french locales: fix typos and improve wording

* french locales: more fixes and rewording

* fixed typo

* fixed typo

* added missing translations

* fixed alphabetical order

* fixed alphabetical order

* added missing translations for FR

* fixed verify-locale-strings.js

* fixed indentation

* fixed indentation

* updated french locale

* updated changelog with changes logs

* a few fixes after receiving comments, mostly Caps removing and adding

* translated 2 missing french locale words and also remove a caps

* Update messages.json

* Update messages.json
 2018-10-10 01:10:53 -04:00
kumavis
600f755dbf
tx-gas-utils - improve format + comments 2018-10-09 23:17:05 -04:00
Santiago Gonzalez Toral
f88373237b Added account options on home screen 2018-10-09 19:43:41 -07:00
Howard Braham
4cc0b1ef01 ganache-core merged my PR, so I changed some comments to clarify that ganache-core v2.2.1 and below will return the non-standard '0x0' 2018-10-09 15:31:25 -07:00
Howard Braham
222e62d7f1 Bug Fix: #1789 and #4525 eth.getCode() with no contract 2018-10-09 15:31:25 -07:00
Noel Yoo
d46d382b1f Fix Korean typos (#5472) 2018-10-09 16:07:49 -02:30
Bruno Barbieri
17b9f4c0db
Merge pull request #5458 from MetaMask/provider-subs 
Feature: Subscription support
 2018-10-09 13:25:13 -04:00
Vincent
cd91b45686 100% French locale, reordering of English locale, fixes #5457 (#5470) 
* french locales: fix typos and improve wording

* french locales: more fixes and rewording

* fixed typo

* fixed typo

* added missing translations

* fixed alphabetical order

* fixed alphabetical order

* added missing translations for FR

* fixed verify-locale-strings.js

* fixed indentation

* fixed indentation

* updated french locale

* updated changelog with changes logs

* a few fixes after receiving comments, mostly Caps removing and adding
 2018-10-09 12:17:38 -02:30
Noel Yoo
ebdefe81a1 Refactor buffer constructor (#5468) 2018-10-09 09:32:48 -02:30
kumavis
45feb43f30 workaround - fix for drizzle 2018-10-08 16:54:13 -04:00
Eduardo Antuña Díez
8279916ee4 Added webRequest.RequestFilter to filter main_frame .eth requests 2018-10-08 21:50:15 +02:00
kumavis
fe82c4a9fb provider - network - restore block-ref-rewrite middleware references 2018-10-08 12:39:18 -04:00
kumavis
354f8c0d7d provider - enable subscription support (newHeads, logs) 2018-10-08 11:55:07 -04:00
Dan Finlay
a909af92aa
Merge branch 'develop' into update-balance-on-unlock 2018-10-05 10:46:48 -07:00
Dan Finlay
507397f6c3 Fix updating of pending transactions 
Transaction statuses were not being properly updated when:

- MetaMask was unlocked
- The network was changed

This PR fixes both of those. Fixes #5174
 2018-10-05 10:35:14 -07:00
Dan Finlay
bc6d32e51e Update all balances on password unlock 2018-10-05 10:32:28 -07:00
Dan Finlay
182970c318
Merge pull request #5432 from alextsg/i5362-fix-translate 
Translate method names in the transaction list only when applicable
 2018-10-05 10:19:43 -07:00
Alexander Tseung
50d91f998d Translate method names in the transaction list only when applicable 2018-10-04 19:26:41 -07:00
Alexander Tseung
bf9fe1498b
Merge pull request #5427 from alextsg/i5371-update-cancel-copy 
Update "cancel" copy
 2018-10-04 14:31:26 -07:00
Dan Finlay
c49d854b55 Increase suggested gas percentile to 65 (#5359) 
* Increase suggested gas percentile to 65

I keep submitting transactions then waiting a long time. Apparently 50th percentile isn't enough.

* Update test for getGasPrice
 2018-10-04 18:38:05 -02:30
Alexander Tseung
41db5d0570 Update "cancel" copy 2018-10-04 10:56:58 -07:00
Whymarrh Whitby
b2939e8627
Merge pull request #5412 from whymarrh/after-install-steps 
Don't open MetaMask website after install
 2018-10-04 08:28:17 -02:30
Whymarrh Whitby
2c5fb11b37 Remove "Copy Contract Address" from token options 2018-10-03 13:49:03 -02:30
Whymarrh Whitby
ba39fbeb49 Don't open metamask.io after install anymore 2018-10-02 11:42:09 -02:30
Whymarrh Whitby
5539494a5e Style links on phishing page with an underline 2018-10-02 10:45:39 -02:30
Whymarrh Whitby
24ab1f5d60 Style links on phishing page with cursor: pointer; 2018-10-02 10:45:39 -02:30
Whymarrh Whitby
c92fee7771 Hook MetaMaskController up with phishing detection page 2018-10-02 10:45:39 -02:30
Whymarrh Whitby
58d856bd84 Add domain whitelist method to MetaMaskController 2018-10-02 10:43:46 -02:30
Whymarrh Whitby
4dd6c8168f Add ability to whitelist a blacklisted domain at runtime 2018-10-02 10:43:46 -02:30
Whymarrh Whitby
343ae7c143 Update title and copy of phishing warning page 2018-10-02 10:43:46 -02:30
Whymarrh Whitby
d28453234c Reword batch reject confirm as "Reject All" 2018-10-01 13:44:54 -02:30
Whymarrh Whitby
2e35c05f14 Confirm rejecting multiple transactions with modal 2018-10-01 13:44:54 -02:30
Whymarrh Whitby
7610248f8c s/Cancel/Reject/ on confirm screen for clarity 2018-10-01 13:44:54 -02:30
Whymarrh Whitby
0fa9299cd1 Add "Cancel All" button to confirm footer 2018-10-01 13:44:54 -02:30
HackyMiner
13a1d46720 support editable customRPC (#5267) 
* support editable customRPC #5246

* remove rpcList size restriction
 2018-09-28 17:23:58 -02:30
kumavis
49a3d52dd6
Merge pull request #5271 from farahbrunache/develop 
Added Haitian Creole translations
 2018-09-28 03:03:13 -04:00
kumavis
59ab595b5e
Merge branch 'develop' into account-tracker-network-change 2018-09-28 02:45:16 -04:00
kumavis
0df8e40702
i18n - ht - fix json formatting 2018-09-28 02:40:48 -04:00
kumavis
1f30ff5e47
i18n - index - fix whitespace 2018-09-28 02:36:40 -04:00
Dan Finlay
78709499da Version 4.13.0 2018-09-27 10:35:37 -07:00
Dan Finlay
9d8f4d547c Version 4.12.0 2018-09-27 10:12:44 -07:00
Dan Finlay
140cee6c32 Merge remote-tracking branch 'origin/master' into Version-4.12.0 2018-09-27 10:11:51 -07:00
Whymarrh Whitby
83666e8d28 Update extension badge with correct signTypedData count 2018-09-27 08:33:50 -07:00
Phyrex Tsai
386110ef0f fix tld bug (#5250) 2018-09-27 12:51:50 -02:30
Thomas Huang
8c3091aa7a
Merge pull request #5053 from hahnmichaelf/esdb-support 
Link to ESDB in local phishing.html
 2018-09-27 10:19:06 -05:00
Whymarrh Whitby
e4092d740a
Merge pull request #5367 from dasilvarosa/patch-1 
Update ledger-logo.svg
 2018-09-26 16:26:49 -02:30
Paul Bouchon
9359fc875d
EIP-1102: Add deprecation message (#5353) 2018-09-26 10:48:17 -04:00
bitpshr
c4caba1317 bugfix: update eth_signTypedData_v3 parameter order 2018-09-26 10:00:12 -04:00
David da Silva Rosa
9285d36925
Update ledger-logo.svg 
Noticed the implementation used the old Ledger logo. Simply replaced the .svg without testing, so hope someone can test the extension before merging 😄 .
 2018-09-26 13:15:38 +02:00
Esteban Miño
4d82df6995
Fix MetaMask web3 version (#5352) 2018-09-25 16:14:37 -03:00
Bruno Barbieri
ed3529b70b
Merge branch 'master' into v4.11.1 2018-09-25 11:58:43 -04:00
brunobar79
e1c6306f83 bump to v4.11.1 2018-09-25 11:57:28 -04:00
Alexander Tseung
5d57c7c4fd
Merge pull request #5282 from MetaMask/tx-cancel-ui 
Add Cancel Transaction feature. Refactor modals. Add Transaction Details modal.
 2018-09-24 11:34:12 -07:00
Thomas Huang
82ec86d953
Merge pull request #5310 from MetaMask/getPendingNonce-hotfix 
Adds getPendingNonce method to provider initialization in metamask-controller.
 2018-09-24 08:45:25 -05:00
Dan Finlay
6920429343 Version 4.11.0 2018-09-21 15:00:45 -07:00
Dan Miller
19d72c9b0b Adds getPendingNonce method to provider initialization options in metamask-controller. 2018-09-21 15:29:42 -02:30
Alexander Tseung
04988eca5e
Merge pull request #5241 from MetaMask/refactor-settings 
Refactor settings page to use JSX and follow component file folder st…
 2018-09-20 23:33:04 -07:00
Alexander Tseung
431beb9436 Fix multiplyCurrencies. Add onClose prop for Modal component. Remove hideModal from modal components. 2018-09-20 19:44:23 -07:00
Alexander Tseung
01166b26ed Fix translation casing 2018-09-20 15:53:53 -07:00
Farah Brunache
250b4a3e0a fixed quotes in line 749 2018-09-20 13:00:37 -04:00
Dan Finlay
d493ec6dc4 Remove EAL google analytics link. (#5081) 
Harry said he's not using this for Ether-Address-Lookup anymore, so removing it.
 2018-09-20 12:29:03 -02:30
Kevin Serrano
d8067072b5 Update messages.json (#5280) 
Added some translations for Chinese Traditional via Chainsights!
 2018-09-20 12:28:20 -02:30
Alexander Tseung
9088fd1de4 Add Current Conversion Updated string to translations 2018-09-19 16:55:58 -07:00
Alexander Tseung
b579ee9619 Refactor settings page to use JSX and follow component file folder structure 2018-09-19 16:37:23 -07:00
Alexander Tseung
95e1eff4ca Add TransactionDetails modal 2018-09-19 14:31:10 -07:00
Alexander Tseung
5a6c333506 Switch existing modals from using Notification to Modal. Remove Notification component. Add CancelTransaction modal 2018-09-19 14:31:10 -07:00
tmashuang
f0f798f7e1 Version 4.10.0 2018-09-17 14:42:04 -05:00
Paul Bouchon
daca7f9b41
Merge branch 'develop' into eip-712 2018-09-17 12:11:10 -04:00
Farah Brunache
b2a93ba278 fixed some grammatical errors 2018-09-16 12:36:44 -04:00
Farah Brunache
906628e54b added Haitian Creole translations 2018-09-15 18:12:22 -04:00
Paul Bouchon
2ec09362c5
EIP-1102: Transitionary API (#5256) 2018-09-14 19:26:03 -04:00
bitpshr
42fdcf6239 Update new method namespace from v2 to v3 2018-09-13 15:42:27 -04:00
bitpshr
68c2554296 Update error message for chainId mis-match 2018-09-13 15:40:57 -04:00
bitpshr
36dd0354e7 Implement latest EIP-712 protocol 2018-09-13 15:40:57 -04:00
Alexander Tseung
f1a309e0cc Fix identicon address. Fix styling of New Contract recipient. Fix Activity Log initial ETH value. Add timestamps to Activity Log events 2018-09-12 19:48:52 -07:00
Alexander Tseung
5beb34aa52 Add TransactionListItemDetails component 2018-09-12 19:48:52 -07:00
Alexander Tseung
084158f1a2 Add tests for TransactionActivityLog. Make changes to rendering events 2018-09-12 19:48:52 -07:00
Alexander Tseung
930dac110a Add ActivityLog component 2018-09-12 19:48:51 -07:00
Dan Finlay
ce1975fbb4
Merge pull request #5240 from MetaMask/i5238-account-balance-update 
Ensure account-tracker currentBlockNumber is set on first block update.
 2018-09-11 14:31:10 -07:00
Whymarrh Whitby
13bc46d824 Default NoticeController ctor opts to empty obj 2018-09-11 12:12:35 -07:00
Whymarrh Whitby
d60991ec88 Delete ConfigManager, replacing its usages with PreferencesController 2018-09-11 09:39:16 -07:00
Dan Miller
eb32ccb0c7 Ensure account-tracker currentBlockNumber is set on first block update. 2018-09-11 12:51:49 -02:30
Frankie
1552fe1c3e
Merge pull request #5216 from MetaMask/tx-cancel 
Add createCancelTransaction method
 2018-09-10 13:29:29 -10:00
Frankie
a43e71693f
Merge pull request #5223 from whymarrh/tx-error-tooltips 
Show transaction error message tooltips for statuses
 2018-09-10 13:25:59 -10:00
Alexander Tseung
43de189d06 Add createCancelTransaction method 2018-09-10 12:48:01 -07:00
Connor Christie
ee568d5f5a Upgrade obs-store and fix memory leaks 2018-09-09 19:33:51 -05:00
Whymarrh Whitby
7c3b69e1e4 Attach the RPC error value to txMeta 2018-09-08 19:59:50 -02:30
brunobar79
8ee01f4e99 Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 2018-09-05 16:26:09 -04:00
Dan J Miller
b9e4feac48
Merge pull request #5091 from MetaMask/i4945-feature-flag-hex-data 
Adds feature flag toggle for the hex data row on the send screen.
 2018-09-04 11:57:40 -02:30
Dan J Miller
03d789a490
Merge pull request #5115 from jdetychey/patch-1 
Typo in "send" translation
 2018-09-04 11:41:35 -02:30
Esteban MIno
e743f44150 fix conflicts 2018-08-28 15:20:30 -03:00
Esteban MIno
3106374cc3 watchAsset small changes 2018-08-27 22:10:14 -03:00
Dan Finlay
4b17ec67ec
Merge pull request #4919 from MetaMask/refactor-tx-list 
Refactor and Redesign Transaction List
 2018-08-27 15:02:07 -07:00
Dan Miller
65873e33e4 Adds feature flag toggle for the hex data row on the send screen. 2018-08-27 11:44:16 -02:30
bitpshr
803a79f836 Do not resolve .test domains using ENS 2018-08-24 12:40:37 -04:00
Alexander Tseung
342522c6cf Fix naming, add eth.getCode check for actions, fix translations for statuses 2018-08-23 16:45:28 -07:00
Alexander Tseung
eb17151ff4 Change "Outgoing" to "Sent Ether" or "Sent Token" 2018-08-23 16:45:28 -07:00
Alexander Tseung
9adf0c4b60 Fix integration tests 2018-08-23 16:45:27 -07:00
Alexander Tseung
5de48c67a0 Use css grid for TransactionListItem for responsive layout 2018-08-23 16:44:44 -07:00
Alexander Tseung
5ee40675b9 Refactor transactions list views. Add redesign components 2018-08-23 16:44:44 -07:00
Esteban MIno
053e262ae7 delete web3.metamassk.watchAsset 2018-08-23 16:32:04 -03:00
Esteban MIno
b59a1e91b8 typo watchAsset imageUrl to image 2018-08-23 15:54:40 -03:00
HackyMiner
dae07b32e5 update Korean translation (#4630) 
* update Korean translation

* update Korean translation, add updated missing strings

* update Korean i18n messages
 2018-08-23 14:39:45 -02:30
Evgeniy Filatov
9a80d6e859 updated docs, small improvement of recent RPC rendering 2018-08-23 01:26:30 +03:00
Evgeniy Filatov
b23cca1469 implemented improvements to RPC history 2018-08-23 01:18:13 +03:00
Esteban MIno
56bed3f1bc expose web3.metamask.watchAsset 2018-08-22 18:14:10 -03:00
Dan Finlay
f30b726df7
Merge pull request #5122 from MetaMask/lazy-account-tracker 
Network IO Optimization: Lazy AccountTracker
 2018-08-22 13:31:42 -07:00
Dan Finlay
bf6d624e76 Add todo to dedupe UI tracking in background 2018-08-22 12:05:41 -07:00
Whymarrh Whitby
171f6711d9
Merge pull request #5066 from whymarrh/fix-key-export 
Don't re-render the export modal when the selected identity changes
 2018-08-22 16:28:17 -02:30
kumavis
cb0af67f74 metamask controller - force account tracker to update balances on network change 2018-08-22 11:23:54 -07:00
Whymarrh Whitby
003d445a98 Update unlock logic to not overwrite existing selected address 2018-08-22 15:38:34 -02:30
brunobar79
b208ce7234 add port names blacklist 2018-08-22 14:04:26 -04:00
Alexander Tseung
7294aede4f Add new variant for SenderToRecipient component 2018-08-22 10:53:20 -07:00
brunobar79
fdff768549 handle onDisconnect 2018-08-22 13:39:43 -04:00
brunobar79
055e0f8dac fix merge conflicts 2018-08-22 13:37:47 -04:00
kumavis
a2654108be account-tracker - only track blocks when there are activeControllerConnections 2018-08-21 16:49:24 -07:00
kumavis
3ac2b40dcf metamask controller - track active controller connections 2018-08-21 16:30:11 -07:00
Esteban MIno
4e6c71e969 Merge branch 'develop' into WatchTokenFeature 2018-08-21 20:14:49 -03:00
Dan Finlay
babd59a2dc
Merge pull request #5109 from MetaMask/MoveOutInpageProvider 
Move inpage-provider and port-stream outside
 2018-08-21 14:38:47 -07:00
Dan Finlay
a485516488
Merge pull request #5118 from MetaMask/provider2-bugfix 
bugfix - prevents old blocktracker from getting internal hooks migrated
 2018-08-21 14:27:34 -07:00
kumavis
13dfea7f2d bugfix - prevents old blocktracker from getting internal hooks migrated 2018-08-21 14:13:23 -07:00
brunobar79
90886c5e05 Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 2018-08-21 15:58:29 -04:00
Jerome de Tychey
92af1ee95a
Typo in "send" translation 
send should be translated as Envoyer instead of Envoyé (which mean sent, not send)
 2018-08-21 18:56:24 +02:00
Esteban MIno
3a3732eb24 returning error in watchAsset 2018-08-21 13:12:45 -03:00
Esteban MIno
6fa889abcb refactor watchToken related functions 2018-08-21 12:59:42 -03:00
brunobar79
cee5783283 fix hardware wallets account name 2018-08-21 00:04:30 -04:00
brunobar79
34e3ec6092 fix account removal 2018-08-21 00:04:07 -04:00
brunobar79
ab7eb73ecc fix merge conflicts 2018-08-20 21:51:35 -04:00
Esteban MIno
68c1b4c170 watchAsset returns result wether token was added or not 2018-08-20 22:32:14 -03:00
Dan Finlay
6ce119d1fb Move inpage-provider and port-stream outside 
With the creation of the [metamask-extension-provider](https://github.com/MetaMask/metamask-extension-provider) we have our first non-core module that is dependent on the inpage-provider and port-stream.

To reduce the size of its dependencies, I have moved the
[metamask-inpage-provider](https://github.com/MetaMask/metamask-inpage-provider) into its own module, as well as [extension-port-stream](https://github.com/MetaMask/extension-port-stream).

This allows them to be more easily depended & iterated on by external
projects.
 2018-08-20 15:45:50 -07:00
Esteban MIno
81cd29df43 Merge branch 'develop' into WatchTokenFeature 2018-08-20 19:35:38 -03:00
Dan Finlay
097c1e90e3
Merge pull request #5084 from MetaMask/ledger-support-without-provider 
Ledger support (in case of rollback)
 2018-08-20 10:23:15 -07:00
Alexander Tseung
cec87a5b2c Update logo wordmark 2018-08-18 20:46:56 -07:00
Bruno Barbieri
bd904c86f6
Merge branch 'develop' into ledger-support 2018-08-17 13:45:46 -04:00
brunobar79
992e7f1b5a fix merge conflicts 2018-08-17 12:56:07 -04:00
Dan Matthews
df799d7fd6 Restores accounts until one with a zero balance is found 2018-08-17 10:26:47 -04:00
brunobar79
285814646f ui ready 2018-08-16 20:41:23 -04:00
Esteban MIno
dbab9a007f delete according image when token added with watchToken deleted 2018-08-16 21:17:02 -03:00
brunobar79
2ea05e303d connect screen ready 2018-08-16 19:39:52 -04:00
Esteban MIno
bb868f5834 correct behavior when notification is closed when popup 2018-08-16 20:19:19 -03:00
Esteban MIno
a36ea0e232 show watch asset image from hide token modal 2018-08-16 12:04:43 -03:00
Esteban MIno
5289a36664 change watchAsset to new spec for type ERC20 2018-08-15 20:01:59 -03:00
Dan Finlay
955ec2dca6
Merge pull request #4279 from MetaMask/network-remove-provider-engine 
Enhancement: New BlockTracker and Json-Rpc-Engine based Provider
 2018-08-15 15:41:05 -07:00
Esteban MIno
b766104c8d add suggested tokens objects in metamask state 2018-08-15 18:34:57 -03:00
Thomas
d636cc3552 v4.9.3 2018-08-15 10:06:20 -07:00
Dan Finlay
7c47187f4d
Merge pull request #5037 from MetaMask/master 
Update develop branch to v4.9.2
 2018-08-15 10:02:20 -07:00
brunobar79
837be704f5 change Metamask for MetaMask 2018-08-15 11:44:00 -04:00
Bruno Barbieri
80fe3ce888
Merge branch 'develop' into ledger-support 2018-08-14 22:55:47 -04:00
brunobar79
82a5ed1e03 remove console logs 2018-08-14 22:40:29 -04:00
brunobar79
fdf202efb0 fixed unit tests 2018-08-14 21:19:01 -04:00
brunobar79
c72ced79ae ui fixes 2018-08-14 19:22:00 -04:00
Esteban MIno
a4b6b2357a watchToken to watchAsset 2018-08-14 20:09:56 -03:00
Esteban MIno
a4c3f6b65c add support for images base64 and urls on new ui 2018-08-14 20:08:12 -03:00
Thomas
96d789d2cf Merge branch 'develop' into network-remove-provider-engine 
Override package-lock and fix merge conflicts
 2018-08-14 10:44:42 -07:00
Esteban MIno
8f5b80a0fe update method to metamask_watchToken 2018-08-14 13:58:47 -03:00
brunobar79
b77cc3d969 fix tx tests 2018-08-14 03:42:23 -04:00
brunobar79
61a279204a legacy and new hd path working 2018-08-14 01:26:18 -04:00
brunobar79
4e1d8ba19d good progress adding paths 2018-08-13 19:29:43 -04:00
Whymarrh Whitby
6e6a4825ac Fix casing of Bitcoin, Ethereum, and Litecoin across localized messages 
Using the following commands:

    sed -i.bak s/bitcoin/Bitcoin/ app/_locales/**/*.json && \
        find app/_locales/ -name '*.bak' -delete

    sed -i.bak s/ethereum/Ethereum/ app/_locales/**/*.json && \
        find app/_locales/ -name '*.bak' -delete

    sed -i.bak s/litecoin/Litecoin/ app/_locales/**/*.json && \
        find app/_locales/ -name '*.bak' -delete
 2018-08-13 19:47:56 -02:30
Whymarrh Whitby
6c11ae44bf Fix casing of MetaMask in all localized messages 
Using the following:

    sed -i.bak s/Metamask/MetaMask/ app/_locales/**/*.json && \
        find app/_locales/ -name '*.bak' -delete
 2018-08-13 19:47:45 -02:30
hahnmichaelf
e19eb7bc03 additional lint-test fix 2018-08-13 13:21:18 -04:00
hahnmichaelf
4808ce25eb fix for lint-test 2018-08-13 13:16:37 -04:00
hahnmichaelf
e454a5e0e8 fixed names 2018-08-13 12:56:35 -04:00
hahnmichaelf
8fb2dfe3d7 Re-added GA script 2018-08-13 12:47:18 -04:00
hahnmichaelf
7d2d71bcbc change name 2018-08-13 12:40:16 -04:00
hahnmichaelf
9666eaba66 base - working. fixes #4774 2018-08-12 18:57:58 -04:00
brunobar79
8f9a0a535c clean up 2018-08-12 01:43:41 -04:00
brunobar79
0b9b892c6b this should be ready to go 2018-08-12 01:34:01 -04:00
brunobar79
2355573340 clean up 2018-08-12 00:06:36 -04:00
brunobar79
e6d64cecf8 message signing works 2018-08-11 20:26:34 -04:00
brunobar79
068bf43615 working 2018-08-11 19:27:24 -04:00
brunobar79
12b41b8fc2 tx signature is valid 2018-08-11 18:20:50 -04:00
brunobar79
011cc141b3 tx signing should work 2018-08-11 16:00:29 -04:00
brunobar79
aa6a42e3de rename keyring 2018-08-11 05:11:21 -04:00
brunobar79
8e842a8947 able to add accounts 2018-08-11 05:02:02 -04:00
brunobar79
78a1cd3314 iframe communication working 2018-08-11 02:35:20 -04:00
brunobar79
5ef80495cf refactor to support multiple hw wallets 2018-08-10 21:54:34 -04:00
Bruno Barbieri
e2be22a4b7
Merge pull request #4897 from MetaMask/qr-code-scan 
QR Code Scanner
 2018-08-10 13:40:06 -04:00
brunobar79
6f2c4809b6 undo permission change 2018-08-10 13:10:21 -04:00
brunobar79
814c642d95 fixes 2018-08-10 11:44:32 -04:00
brunobar79
c8d75f3230 use new connect.js file 2018-08-09 23:19:17 -04:00
brunobar79
35282980cf Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 2018-08-09 18:49:21 -04:00
Thomas
b887730be7 v4.9.2 2018-08-09 14:42:34 -07:00
Dan Finlay
be1d5a7dd9
Merge pull request #5020 from MetaMask/FixMigration28 
Fixes migration 28
 2018-08-09 14:24:38 -07:00
Jenny Pollack
00a2ab21ae sentry - change releaseVersion to release 2018-08-09 13:49:40 -07:00
Esteban MIno
8df3f2696c fix migration 28 2018-08-09 16:15:56 -04:00
Thomas
1605c8544a v4.9.1 2018-08-09 10:23:16 -07:00
Thomas
500ef5cb3a Merge branch 'master' into develop 2018-08-09 10:09:53 -07:00
Eduardo Antuña Díez
a2082bae5c Avoid overwriting a domain that can be resolved by DNS 
According to the current implementation any domain ending in .eth or .test will try to resolve through ENS even if the DNS is able to resolve it.
changing `onBeforeRequest` to `onErrorOccurred` will only resolve those .eth or .test domains that the DNS is not able to resolve.
 2018-08-09 12:20:51 +02:00
Eduardo Antuña Díez
543207b5af Fixed ENS to IPFS functionality in Firefox 
`tabs.getSelected` is deprecated and it doesn't work in firefox replaced by `tabs.query({active: true}`
 2018-08-09 12:14:09 +02:00
brunobar79
286bde606f fix merge conflicts 2018-08-08 14:30:49 -04:00
brunobar79
c6b7e460b5 code review changes 2018-08-08 03:00:39 -04:00
brunobar79
2e0916d8ff fix merge conflicts 2018-08-08 02:32:35 -04:00
Esteban MIno
33357e3538 refactor unused code 2018-08-07 19:12:16 -04:00
Esteban MIno
15ea8c04b2 fix merge 2018-08-07 17:53:36 -04:00
Esteban Miño
3f57d5f66b
Merge branch 'develop' into WatchTokenFeature 2018-08-07 17:50:58 -04:00
Esteban MIno
c0cdda8321 Merge branch 'develop' into TokensPerAccountBasis 2018-08-07 14:17:40 -04:00
frankiebee
cbade51ebd Merge branch 'develop' of https://github.com/MetaMask/metamask-extension into network-remove-provider-engine-tests 2018-08-07 01:53:13 -07:00
frankiebee
115d3c9aaf Merge branch 'network-remove-provider-engine' into network-remove-provider-engine-tests 2018-08-07 01:38:32 -07:00
frankiebee
c2d4b237eb network - fix blockTracker reference to return the blockTrackerProxy instead of the direct blockTracker reference 2018-08-07 01:35:30 -07:00
Whymarrh Whitby
d0611741a2 Show invalid seed phrase error when importing new account 2018-08-07 02:09:26 -02:30
Esteban MIno
af35b415ab new confirm add suggested token component 2018-08-06 20:03:49 -04:00
Esteban MIno
78ad3c38e2 add suggested token params validation 2018-08-06 18:28:47 -04:00
brunobar79
0ebdd73e02 clean up 2018-08-05 03:17:51 -04:00
brunobar79
aaed44f1ec trezor v5 working on firefox 2018-08-05 02:43:02 -04:00
Esteban MIno
9ac9f53a73 eth_watchToken working 2018-08-03 19:24:12 -04:00
brunobar79
71ef4d85da design complete 2018-08-03 18:57:23 -04:00
Esteban MIno
081884bd80 rpc-engine not crashing when eth_watchToken 2018-08-03 16:42:13 -04:00
Esteban MIno
21a61f2987 merge develop 2018-08-03 14:56:02 -04:00
Thomas Huang
024ebe07e0 Merge branch 'develop' into network-remove-provider-engine-tests 2018-08-01 10:40:31 -07:00
brunobar79
710b4e294f added crossbrowser support and error handling 2018-07-31 18:30:56 -04:00
Esteban MIno
d8817b2646 fix doc tag 2018-07-31 16:18:06 -04:00
Esteban MIno
3124e8c612 tokens related functions refactor 2018-07-31 15:59:19 -04:00
Esteban MIno
ccae79d392 fix undefined for tokens on tests 2018-07-31 13:07:28 -04:00
brunobar79
edb154749d send to fullscreen if no permission from popup 2018-07-30 22:57:05 -04:00
Esteban MIno
22cf5a1391 improve comments 2018-07-30 20:44:22 -04:00
Esteban MIno
822c1734d6 fix double state update when account changed 2018-07-30 20:36:31 -04:00
Esteban MIno
fbcba8f019 create tokens storage when setadresses 2018-07-30 19:09:17 -04:00
Esteban MIno
31286673c3 isolation of tokens related methods in preferences 2018-07-30 18:43:34 -04:00
brunobar79
34617a21c3 copy 2018-07-30 18:36:37 -04:00
brunobar79
4339f04e80 use existing modals 2018-07-30 17:50:05 -04:00
Esteban MIno
0757f47e84 passing tokens to all accounts in migration 2018-07-30 11:41:31 -04:00
Thomas
d1734b8d7c Update Phishing Html 2018-07-27 14:10:18 -07:00
Esteban MIno
e687bc5a47 fix migration for preferences controller tokens 2018-07-27 16:17:28 -04:00
Dan Finlay
9dc5d0cee0
Merge pull request #4905 from MetaMask/eip-712-deprecation 
EIP-712: deprecation message
 2018-07-27 13:16:44 -07:00
Esteban Miño
228f48c6e5
Merge branch 'develop' into TokensPerAccountBasis 2018-07-27 16:07:08 -04:00
Esteban MIno
5b9725d1f1 refactor to accountTokens 2018-07-27 16:05:12 -04:00
Thomas Huang
1540b5e256
Merge pull request #4893 from kelvintyb/develop 
Move phishing warning to the extension
 2018-07-27 12:23:31 -07:00
bitpshr
642ae25073 Add deprecation message for eth_signTypedData 2018-07-27 15:23:05 -04:00
Esteban MIno
f5107fa12e migration for preferences controller tokens 2018-07-27 14:56:03 -04:00
Esteban MIno
2827e13caa add & delete tokens per network 2018-07-26 19:28:12 -04:00
kumavis
e715d0e691
Merge pull request #4858 from MetaMask/chinesesimplifiedandtraditional 
Update Chinese naming on our language list
 2018-07-26 15:13:24 -07:00
Esteban MIno
1d3ad7cfbb tokens per network for individual account 2018-07-26 18:04:34 -04:00
kumavis
ffefeb65d4
Merge pull request #4802 from 03-26/develop 
Update translation 🇯🇵
 2018-07-26 14:59:12 -07:00
Kelvin Tan
7ca402147d add phishing html page, and redirect to bundled page in-window 2018-07-27 00:03:39 +08:00
Thomas
138858647e Merge branch 'develop' into network-remove-provider-engine 2018-07-25 22:38:44 -07:00
Frankie
b5e3aafe2e
Merge pull request #4871 from MetaMask/3519-new-contract-gas 
tx-gas-utils -  catch all errors from gas estimation
 2018-07-25 15:33:17 -10:00
Esteban MIno
adee549c43 preferences test fixes for tokens per account 2018-07-25 17:46:31 -04:00
frankiebee
527b62ee8e migrations - fix to include 27 2018-07-25 14:11:07 -07:00
Esteban MIno
2770df80e3 add & delete tokens per account 2018-07-25 16:14:10 -04:00
William Morriss
5782926c28
Merge pull request #4825 from MetaMask/no-inject-ani-gamer 
Do not inject on ani.gamer.com.tw
 2018-07-24 19:48:10 -07:00
pinkiebell
3667f3cb85 network.js: convert rpc protocol to lower case (#4855) 
Fixes #4253
 2018-07-24 19:33:36 -02:30
Jenny Pollack
00bae74475 tx-gas-utils - catch all errors from gas estimation 2018-07-24 14:16:37 -07:00
Kevin Serrano
1d241bef76
Merge branch 'develop' into no-inject-ani-gamer 2018-07-24 12:27:18 -07:00
Dan Miller
a61227f224 Remove unneeded code from i4829-close-notifications-from-ui branch. 2018-07-24 15:01:03 -02:30
Dan Miller
64a82fd3da Uncomment closePopupIfOpen code. 2018-07-24 11:45:36 -02:30
Dan Miller
2359062b62 UI confirm screen closes confirmation window on submit or cancel of a tx 2018-07-23 22:20:06 -02:30
Kevin Serrano
519ca1c74b
Update Chinese naming 
I sincerely hope this is a non-controversial change.
 2018-07-23 09:38:02 -07:00
brunobar79
5ebefc0e50 run linter 2018-07-21 16:03:31 -04:00
Akihiro
3e6d13d309 Merge remote-tracking branch 'upstream/develop' into develop 2018-07-21 11:29:48 +09:00
Akihiro
8c77e998e0 Merge remote-tracking branch 'upstream/develop' into develop 2018-07-21 10:47:14 +09:00
Esteban MIno
9be22775c3 fix merge 2018-07-20 20:15:33 -04:00
Esteban Miño
110efa9ec1
Merge branch 'develop' into detectTokenFeature 2018-07-20 20:09:37 -04:00
Esteban MIno
9c95554933 fix detection on submit password 2018-07-20 19:58:03 -04:00
Csaba S
c11dea9afc
Merge branch 'develop' into transaction-notifications 2018-07-20 20:09:57 +02:00
Csaba Solya
72591d4f41 remove dropped handler 2018-07-20 19:58:26 +02:00
Esteban Miño
cb045fd8fe
Auto-detect tokens #3034 (#4683) 
* detect tokens polling

* network store to detect token

* tests for spec

* passtest-lint

* fix lint

* improve tests

* detect tokens through infura

* detect tokens when submit password and new account selected

* keyring unlocked detect and unit tests

* add changelog
 2018-07-20 12:36:24 -04:00
Csaba Solya
a3822b4680 add notifications 2018-07-20 13:20:40 +02:00
Esteban MIno
009b1cefbe keyring unlocked detect and unit tests 2018-07-19 19:46:46 -04:00
Csaba Solya
6921f94bfe initial test 2018-07-19 22:34:06 +02:00
Esteban MIno
3b97d816ff detect tokens when submit password and new account selected 2018-07-19 15:56:38 -04:00
Bruno Barbieri
9be2248d7a
Merge pull request #4625 from MetaMask/initial-trezor-support 
Initial trezor support
 2018-07-19 15:00:59 -04:00
Dan Finlay
3784a7e2c8
Merge pull request #4656 from MetaMask/portal-metamask-ens-test 
Add support for .test ENS domains
 2018-07-19 09:41:28 -07:00
Jenny Pollack
ae811628d9
Merge pull request #4833 from MetaMask/brave-flag-sentry 
sentry - add detection for Brave Browser
 2018-07-19 11:58:59 -04:00
Jenny Pollack
16fc7efef1 remove local tests 2018-07-19 09:59:58 -04:00
bitpshr
d24b5b76fd Update variable name 2018-07-19 08:04:17 -04:00
bitpshr
d02c160db5 Updates for linting 2018-07-19 08:04:17 -04:00
bitpshr
94f99b6ed0 Updates 2018-07-19 08:04:17 -04:00
bitpshr
8df433ca84 Add support for .test Ropsten ENS domains 2018-07-19 08:04:17 -04:00
brunobar79
df19163bf9 last css fixes 2018-07-19 02:31:13 -04:00
Jenny Pollack
1a9748667d sentry - add detection for Brave Browser 2018-07-19 02:22:56 -04:00
brunobar79
49d1bdea8a design done 2018-07-18 22:57:47 -04:00
Dan Finlay
6d04c80302
Merge pull request #4813 from MetaMask/no-inject-blueskybooking 
Do not inject on blueskybooking.com
 2018-07-18 17:27:25 -07:00
Dan Finlay
dd9e3587d4
Do not inject on ani.gamer.com.tw 
Fixes #4799
 2018-07-18 15:23:32 -07:00
brunobar79
cbb14f1d5e fix browser not supported screen 2018-07-17 21:57:19 -04:00
brunobar79
aa5a987765 added some e2e tests 2018-07-17 21:54:04 -04:00
brunobar79
cb53d5122c Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial-trezor-support 2018-07-17 20:43:32 -04:00
brunobar79
cb97517b26 updated account list based on new designs 2018-07-17 18:53:37 -04:00
Alexander Tseung
301ae305b8 Use Number constructor for number conversion. Use existing noConversionRateAvailable message 2018-07-17 14:06:30 -07:00
Alexander Tseung
d19c42fcae Add fallback when no function found, fix network colors, add fiat values for tokens with contract exchange rates 2018-07-17 13:38:14 -07:00
brunobar79
e89350b19f added tests for removeAccount 2018-07-17 01:44:28 -04:00
brunobar79
de4265c629 added more unit tests 2018-07-17 01:17:18 -04:00
brunobar79
e5512c306d added unit tests for metamaskcontroller 2018-07-16 19:36:08 -04:00
Dan Finlay
6be6b9ef29
Do not inject on blueskybooking.com 
Per zendesk 2312.
 2018-07-16 15:39:35 -07:00
Sara Reynolds
684fc710ee Fix edge cases and add translation compatibility 2018-07-16 13:03:24 -07:00
03-26
9dd637569d Update 2018-07-15 15:09:18 +09:00
brunobar79
d21d408d64 Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial-trezor-support 2018-07-13 20:53:22 -04:00
brunobar79
3ae5b4e772 update label 2018-07-13 19:47:45 -04:00
brunobar79
5399546388 added affiliate link to trezor 2018-07-13 13:49:20 -04:00
Esteban MIno
2fffe09873 detect tokens through infura 2018-07-12 20:43:43 -04:00
Dan Finlay
c4ae399577
Add harbourair.com to injection block list 
This site was getting unexpected results when MetaMask was installed.

https://consensys.zendesk.com/agent/tickets/2312
 2018-07-12 14:21:32 -07:00
Thomas Huang
5a45df72c6
Merge pull request #4669 from MetaMask/removeNonceTrackerFunction 
Remove unsued nonce tracker function
 2018-07-12 11:48:05 -07:00
brunobar79
07d8bfaec5 Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial-trezor-support 2018-07-12 12:54:08 -04:00
Whymarrh Whitby
d9f98a704e Add tooltip to new tab icon in tx-view 2018-07-12 12:32:45 -02:30
Whymarrh Whitby
7581a4906f Add tooltip to menu icon in tx-view 2018-07-12 12:32:45 -02:30
brunobar79
2a0a785324 added tooltip 2018-07-12 00:23:08 -04:00
Alexander Tseung
0d4dbbec2a
Merge pull request #4691 from MetaMask/i4404-confirm-refactor 
Refactor and redesign confirm transaction views
 2018-07-11 15:31:50 -10:00
brunobar79
80e875308b forget device and autiload account features added 2018-07-11 21:21:36 -04:00
brunobar79
89cc48789a update to temp dependencies 2018-07-11 20:01:44 -04:00
Esteban MIno
910713c6b3 improve tests 2018-07-11 15:59:05 -04:00
brunobar79
523cf9ad33 account removal is working 2018-07-11 00:20:40 -04:00
brunobar79
b9c2994d24 finish warning modal UI 2018-07-10 19:19:29 -04:00
Thomas
5188b727d4 Merge branch 'develop' into removeNonceTrackerFunction 2018-07-10 11:34:00 -07:00
frankiebee
28c509914b Merge branch 'develop' of https://github.com/MetaMask/metamask-extension into i#3896 2018-07-10 11:32:05 -07:00
brunobar79
9b81180ab1 added ui to remove accounts 2018-07-10 00:20:00 -04:00
brunobar79
85a4e39b05 fix trezor label 2018-07-09 20:54:47 -04:00
brunobar79
d3f793a44a added label for trezor accounts 2018-07-09 19:04:30 -04:00
brunobar79
2de3039b6b fix account duplication 2018-07-09 17:55:37 -04:00
brunobar79
7cca7ace2e fix all the account related bugs 2018-07-09 17:24:52 -04:00
brunobar79
5127601545 copy updated 2018-07-06 20:37:08 -04:00
brunobar79
dddbb4250b update connect harwdware screen 2018-07-06 20:04:20 -04:00
Alexander Tseung
a2d9c43fba Various fixes from PR comments 2018-07-06 16:27:08 -07:00
Alexander Tseung
9cde5ab11b Use eth-method-registry to get method data 2018-07-06 16:27:08 -07:00
Alexander Tseung
7732cd4100 Display newest transaction 2018-07-06 16:27:08 -07:00
Alexander Tseung
ea9d51e427 Refactor and redesign confirm transaction views 2018-07-06 16:27:08 -07:00
brunobar79
7c9d942ba1 Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial-trezor-support 2018-07-06 19:21:18 -04:00
brunobar79
6b2511f94f UI refactor 2018-07-05 20:59:31 -04:00
brunobar79
ba5cde0995 move strings to localization file 2018-07-05 17:04:36 -04:00
Dan J Miller
6595f84d07
Merge pull request #4648 from MetaMask/update-import-from-seed-screen 
Update import from seed screen on new ui.
 2018-07-05 16:26:21 -02:30
Dan J Miller
46cda26f3b
Merge pull request #4685 from MetaMask/estimate-gasprice-background-newui 
Use background gas price estimation method in new ui.
 2018-07-05 08:01:03 -02:30
Dan
f262f0ea64 Update import from seed screen on new ui. 2018-07-04 21:21:12 -02:30
brunobar79
9d3f2435e5 lint fix 2018-07-03 15:46:15 -04:00
kumavis
77daed5c74 Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine 2018-07-03 12:42:14 -07:00
brunobar79
3837c2ddd7 fix merge conflicts 2018-07-03 15:41:18 -04:00
brunobar79
13b03ec090 fix lint errors 2018-07-03 14:29:36 -04:00
brunobar79
595447ccac Merge remote-tracking branch 'upstream/develop' into HEAD 2018-07-03 14:21:17 -04:00
bitpshr
badf0ce314 Conditionally use Promise-based extension API when creating windows 2018-07-03 13:33:13 -04:00
brunobar79
3290421e2f fix merge conflicts 2018-07-03 13:31:30 -04:00
Esteban MIno
0494b2fc8a Merge branch 'develop' into detectTokenFeature 2018-07-03 13:23:15 -04:00
Esteban MIno
03fd4355af passtest-lint 2018-07-03 12:53:06 -04:00
brunobar79
a8f745f9fe eslint --fix . 2018-07-02 18:49:33 -04:00
kumavis
a89902c170 Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine 2018-07-02 13:54:05 -07:00
brunobar79
f19ffaf08d move hardcoded strings to localization file 2018-07-02 15:16:05 -04:00
brunobar79
317c3084df allow to open specific route in fullscreen mode 2018-07-02 15:14:31 -04:00
brunobar79
451c05bcbb fix environment detection regex 2018-07-02 15:14:05 -04:00
brunobar79
1494cc5e6c fix merge conflicts 2018-07-01 11:41:34 -10:00
PhyrexTsai
11736e6318
Update to support pathnames on IPFS hash 
As @Georgi87 mentioned about pathnames on the domain like `http://phyrextsai.eth/home` will pass to IPFS hash and append `/home` on redirection url.

You can try the example below: 
http://phyrextsai.eth/index.html
http://phyrextsai.eth/images/phyrex.jpg
 2018-06-29 13:57:41 +08:00
Dan
de01a6f112 Use background gas price estimation method in new ui. 2018-06-28 21:28:59 -02:30
Esteban MIno
6284e66481 tests for spec 2018-06-27 22:18:06 -04:00
Esteban MIno
0e863d5fab network store to detect token 2018-06-27 19:54:43 -04:00
Esteban MIno
bfac9c2c2d detect tokens polling 2018-06-27 16:29:24 -04:00
Dan J Miller
1839ab5346
Merge pull request #4574 from MetaMask/i4409-i4410-ens-input-enhancements 
[new-ui] Improve ENS input errors and update ens validation on network change
 2018-06-27 17:09:44 -02:30
frankiebee
9b92ba4c47 trandsactions - remove rejected transactions from history 2018-06-25 15:07:54 -07:00
tmashuang
dd18684a5d Remove unsued nonce tracker function 2018-06-25 15:01:14 -07:00
frankiebee
7d3da0ae96 migration 27 - remove rejected transactions from state 2018-06-25 11:45:00 -07:00
brunobar79
87dfca0767 fixes 2018-06-23 02:52:11 -04:00
Thomas Huang
46b2f1df11
Merge pull request #4592 from vittominacori/fix/close-popup-bug-#4553 
set an id to the metamask notification popup
 2018-06-20 15:50:07 -07:00
Dan
06307ef8ae Merge branch 'develop' into i4409-i4410-ens-input-enhancements 2018-06-19 21:39:52 -02:30
Dan Finlay
0481335dda Improved rpc-engine usage 2018-06-18 15:50:27 -07:00
Dan Finlay
5e4f3e430a Get popup appearing when suggesting new token 2018-06-18 15:37:37 -07:00
Dan Finlay
f14ed32980 Begin letting UI show suggested tokens 2018-06-18 15:33:50 -07:00
Dan Finlay
5d7c2810a7 Begin adding eth_watchToken 2018-06-18 15:07:08 -07:00
Thomas
ea0dcdd312 Merge branch 'develop' into v4.8.0 2018-06-18 12:37:01 -07:00
kumavis
356cc50095 notice controller - properly show new notices for non-new users 2018-06-18 12:10:35 -07:00
kumavis
9a7f363c2a
Merge pull request #4586 from MetaMask/block-idex-phisher 
Add apparent phishing address to block list
 2018-06-18 11:26:19 -07:00
Csaba S
8aab4dd1fa View address of an added token (#4591) 
* adding menu actions for tokens

* apply common style
 2018-06-18 10:29:09 -07:00
vittominacori
ff3c262621 set the popup id returned by create promise 2018-06-17 19:16:30 +02:00
vittominacori
4c1b526137 set an id to the metamask notification popup 2018-06-16 18:51:01 +02:00
kumavis
33cb0a8cb2 lint - fix recipient-blacklist.js 2018-06-15 11:07:56 -07:00
kumavis
83c02f90cf blacklist - recipient blacklist as js for inline comments 2018-06-15 10:47:42 -07:00
kumavis
753743e746
Update recipient-blacklist-config.json 2018-06-15 10:32:09 -07:00
Dan Finlay
a42299aab7
Add apparent phishing address to block list 
In [this reddit post](https://www.reddit.com/r/Metamask/comments/8r3nsu/help_me_please_somebody_stole_my_ethers/) a user suggests they got some ether stolen after visiting IDEX. Their ether was sent to [this address](https://etherscan.io/address/0x9bcb0a9d99d815bb87ee3191b1399b1bcc46dc77), which is full of comments of people telling similar stories of being phished on IDEX. I think we can safely block this, and probably safe some people some money.
 2018-06-15 08:55:39 -07:00
Dan Finlay
3a6cc3c8fd Re-enable dapp reload on network change 
We want to give devs some time to digest [this blog post](https://medium.com/metamask/breaking-change-no-longer-reloading-pages-on-network-change-4a3e1fd2f5e7) before we making a breaking change to our platform.

Makes it easy to re-implement the change.
 2018-06-14 15:15:23 -07:00
Dan
bb855707ef ENS input in send form shows distinct errors for invalid addresses and non-existent addresses. 2018-06-14 15:43:14 -02:30
Thomas
ef31eeccb2 v4.8.0 2018-06-14 10:48:38 -07:00
kumavis
d9ef72cb7e
Merge branch 'develop' into save-brave 2018-06-14 10:11:35 -07:00
Dan Finlay
11bfdf444d Handle brave throws 2018-06-14 10:09:45 -07:00
Dan Finlay
d814bee578
Merge pull request #4571 from MetaMask/disable-diagnostics 
diagnostics - temporarily disable
 2018-06-14 10:03:53 -07:00
Dan Finlay
3a5089da6f
Merge pull request #4566 from MetaMask/notice-phishing 
Push new notice on recent phishing incidents
 2018-06-14 09:49:38 -07:00
kumavis
722c5ae821 notice-controller - update memStore on boot 2018-06-14 00:23:01 -07:00
kumavis
4b8a4fd5fe test - e2e - check for phishing warning 2018-06-13 23:52:51 -07:00
kumavis
44a8e48a04 notices - replace getLatestNotice with getNextNotice 2018-06-13 23:30:31 -07:00
kumavis
ac8b56a00d notices - notices collection is now manually edited 2018-06-13 22:56:46 -07:00
kumavis
e9cb650832 Merge branch 'develop' of github.com:MetaMask/metamask-extension into ValidateEmptyKey 2018-06-13 21:11:04 -07:00
kumavis
691ac5d288 account-import-strategies - ensure privateKey is prefixed before converting to buffer 2018-06-13 21:06:33 -07:00
kumavis
43e805805e diagnostics - temporarily disable 2018-06-13 17:40:28 -07:00
kumavis
7b414f3ed0 background - persistence pipeline - fix persistence bug 2018-06-13 16:45:18 -07:00
Bruno
704e2a21f8 clean up 2018-06-13 02:09:25 -04:00
Bruno
bb4cc72646 fix merge conflicts 2018-06-13 02:01:47 -04:00
Bruno
8763ea898e move TrezorKeyring to its own package 2018-06-13 01:32:13 -04:00
Bruno
d4201ae1cc added support for signPersonalMessage 2018-06-13 00:22:04 -04:00
Erik Marks
bb201d7c4a
Merge branch 'develop' into stop-reload-on-network-change 2018-06-12 13:39:21 -07:00
kumavis
604289c96c controllers - transaction - prefer log over console 2018-06-12 12:08:06 -07:00
kumavis
177cc3f280 metamask - ensure all nonce locks are released 2018-06-12 11:51:35 -07:00
kumavis
8f93e34175 nonce-tracker - wrap nonce calculations in try-catch and release lock on error 2018-06-12 11:31:26 -07:00
kumavis
055346843b lint - fix lint for network 2018-06-12 11:27:32 -07:00
kumavis
6a2649a90f network - import createBlockTrackerInspectorMiddleware and rearrange cache middleware order 2018-06-12 11:12:32 -07:00
Erik Marks
b982961381 removed auto-reload.js, moved global web3 export to inpage.js 2018-06-12 11:04:37 -07:00
kumavis
c86f935889 nonce-tracker - wrap nonce calculations in try-catch and release lock on error 2018-06-12 10:55:54 -07:00
Erik Marks
f461bd8812 wip 2018-06-12 09:28:50 -07:00
Dan Finlay
b24efcb1cd Make account import tests much more specific 
However, they no longer seem to work. I'm unclear why this test is
failing. The private key being provided should be valid.
 2018-06-11 14:58:05 -07:00
kumavis
ebb9447593 test - e2e - factor out setup phase + rename METAMASK_CONFIG to METAMASK_TEST_CONFIG 2018-06-11 14:25:49 -07:00
kumavis
02f5502e16 test - e2e - inject metamask config to point at localhost 2018-06-11 11:04:28 -07:00
kumavis
0db776c3cc lint - controllers - whitepace fix 2018-06-11 10:17:09 -07:00
Bruno
999b6bd24a clean up 2018-06-11 01:58:19 -04:00
Bruno
68d97211ff sign transactions is pretty close 2018-06-11 01:52:41 -04:00
Bruno
d1880073f6 balances working 2018-06-10 21:10:22 -04:00
Bruno
f6b27fa9eb add account working 2018-06-10 19:02:54 -04:00
Bruno
f5f66f59d7 clean up 2018-06-10 18:48:42 -04:00
Bruno
8c4d58aa45 initial trezor support 2018-06-10 03:52:32 -04:00
Jenny Pollack
e7c2710a55 Merge branch 'develop' into save-brave 2018-06-07 14:10:56 -07:00
kumavis
3ce83570ee network - provider - infura - use block-reemit middleware 2018-06-07 12:26:37 -07:00
Dan Finlay
c0d2dab28b
Merge pull request #4523 from MetaMask/i4462-FixResetBug 
Fix bug where reset account would not work.
 2018-06-07 10:47:34 -07:00
kumavis
66b703b1a4 Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine 2018-06-07 10:07:36 -07:00
Jenny Pollack
fd8bcc9cb1 lint 2018-06-06 22:08:32 -07:00
Jenny Pollack
01a1eff8a8 remove loglevel 2018-06-06 18:35:41 -07:00
Jenny Pollack
7edde61c12 preferred first languauge - check for Brave 2018-06-06 18:24:45 -07:00
Jenny Pollack
275c31855d first language - add check for brave browser on getAcceptLanguages 2018-06-06 18:10:05 -07:00
Dan
11f5fdc927 Merge branch 'develop' into i3725-refactor-send-component- 2018-06-06 21:55:20 -02:30
Dan Finlay
c53c5d5c9e Fix bug where reset account would not work. 
Fixes #4462

Ensures that resetAccount() can work on non-stock providers.

I'm unclear how this was ever working, this code hasn't moved in months,
but users report it recently breaking. Maybe we only recently pushed it
to prod.
 2018-06-06 16:46:39 -07:00
kumavis
aea9491f6a
Merge pull request #4477 from MetaMask/i3073-block-gravityforms 
Block gravityforms.com from web3 injection
 2018-06-06 12:24:05 -07:00
Dan
ae55e8a3c1 Merge branch 'develop' into i3725-refactor-send-component- 2018-06-06 16:40:43 -02:30
kumavis
2198276bd5 Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine 2018-06-06 12:05:38 -07:00
kumavis
d30f03dcbf
Merge pull request #4414 from scsaba/recipient-blacklist 
Disallow sending to ganache default accounts on main net
 2018-06-06 11:54:01 -07:00
kumavis
546996c1f9
Merge pull request #4514 from whymarrh/account-label-type-check 
Add account type assertion to PreferencesController#setAccountLabel
 2018-06-06 11:42:52 -07:00
03-26
ccd4884db1 i18n - ja improvements 2018-06-06 11:38:57 -07:00
kumavis
ffb8fa1649 lint - remove unused require 2018-06-06 11:17:52 -07:00
kumavis
9d77b0a196 Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine 2018-06-06 11:08:29 -07:00
Whymarrh Whitby
3cc85c219e Add account type assertion to PreferencesController#setAccountLabel 2018-06-05 14:06:56 -07:00
Dan Finlay
d61c979de6 Add validation for importing empty private key 
Previously importing an empty string would result in a new empty Keyring
object to be constructed, with no notification to the user.

Now we render a clear error explaining the mistake.
 2018-06-05 13:44:03 -07:00
kumavis
f73feccf5a 4.7.4 2018-06-05 13:22:48 -07:00
kumavis
cb7307b7ca Merge branch 'master' of github.com:MetaMask/metamask-extension into v4.7.4 2018-06-05 13:20:31 -07:00
kumavis
60e61e6834 diagnostics - fix reportMultipleKeyrings call 2018-06-05 12:36:15 -07:00
kumavis
36a0574f56 diagnostics - minor fixes 2018-06-05 12:20:24 -07:00
kumavis
ece5cfc785 lint - fix diagnostics reporter 2018-06-05 11:53:21 -07:00
kumavis
20bdba3d17 diagnostics - rewrite bug-notifier as diagnostics-reporter 2018-06-05 11:51:27 -07:00
kumavis
6247e54fcc add multivault detection to diagnostics reporting 2018-06-05 11:15:58 -07:00
Dan
aee9247faa Merge branch 'develop' into i3725-refactor-send-component- 2018-06-04 22:32:30 -02:30
kumavis
12a7fc4016 4.7.3 2018-06-04 16:11:19 -07:00
Dan Finlay
41f292437d Record identity before deleting it 2018-06-04 15:34:38 -07:00
Dan Finlay
ae156e1087 Mock notifier in test 2018-06-04 15:26:01 -07:00
Dan Finlay
f07ca73e07 Add comment 2018-06-04 15:18:12 -07:00
Dan Finlay
415ab2d534 Do not alert to user 2018-06-04 15:17:03 -07:00
Dan Finlay
22754e3e1f Linted 2018-06-04 15:10:51 -07:00
Dan Finlay
7b87afb4b7 Add bug info under metadata key 2018-06-04 15:06:21 -07:00
Dan Finlay
0eacee8e45 Add first time info to bug report 2018-06-04 15:03:31 -07:00
Dan Finlay
3bfc40c284 Add version to report 2018-06-04 14:59:46 -07:00
Dan Finlay
d07c664b2c Fine tune error posting 2018-06-04 14:30:24 -07:00
Dan Finlay
b858cc4b1b Only notify first time lost ids are detected 2018-06-04 14:24:45 -07:00
Dan Finlay
f3b385cb09 Add reporting uri 2018-06-04 14:22:34 -07:00
Dan Finlay
fd1ce4d741 Begin adding unconfigured notifier 2018-06-04 14:21:46 -07:00
Dan Finlay
8fcaa2cf56 Persist lost identities to storage for later analysis 2018-06-04 14:05:56 -07:00
Dan Finlay
f5d4acf53b Add minimal user notification of issue. 2018-06-04 14:01:05 -07:00
Dan Finlay
7382bd0847 Add identity synchronizing code 
Addresses #4475, where entries in the identities object do not
necessarily have corresponding accounts in the vault.

On password submission, this change passes known accounts to the
preferencesController (responsible for nickname management), and removes
unknown entries.

Includes "TODO" notes for where we could log the issue to sentry or
notify the user.
 2018-06-04 13:43:26 -07:00
Dan Finlay
764643ed5f
Block gravityforms.com from web3 injection 
Fixes #3073
 2018-06-03 19:38:47 -07:00
kumavis
a09b3737f2 4.7.2 2018-06-03 12:31:09 -07:00
kumavis
eb3241ccba metamask-controller - clear account labels on restore from seed phrase 2018-06-03 12:02:35 -07:00
kumavis
54a9c62fd6 preferences controller - jsdoc fix 2018-06-03 11:30:11 -07:00
kumavis
d4cdd1a0f3 metamask - update preferences controller identities on keyring controller update 2018-06-03 11:27:25 -07:00
kumavis
a08e58f0fd
Merge pull request #4426 from MetaMask/sentry-url-rewrite-fix 
sentry - message rewrite - guard against missing message
 2018-06-03 10:50:05 -07:00
kumavis
72dde75e58
Merge pull request #4425 from MetaMask/master 
Merge Master into Develop
 2018-06-01 17:06:30 -07:00
Dan Finlay
b1b90a6bb9 Version 4.7.1 2018-06-01 15:48:16 -07:00
Dan Finlay
fbcea7043f Merge branch 'master' into develop 2018-06-01 15:47:28 -07:00
Whymarrh Whitby
1a18f03e2f
Fix return value of migration 26 when missing KC or PC 2018-06-01 15:46:31 -07:00
bitpshr
ccae937f41 Properly end the middleware stack on RPC error 2018-06-01 12:57:57 -04:00
PhyrexTsai
8a571ece36
Update 404.html 2018-06-02 00:00:11 +08:00
PhyrexTsai
f90d070190
Merge branch 'develop' into portal-metamask 2018-06-01 15:41:18 +08:00
Yung chieh Tsai
cc5bdadbf1 Update 404 2018-06-01 15:30:57 +08:00
Yung chieh Tsai
77d17f2d55 Update ipfs to infura 2018-06-01 11:27:05 +08:00
Yung chieh Tsai
4e14313ba8 Update manifest.json 2018-06-01 11:26:44 +08:00
Dan
701611e317 Merge branch 'i3725-refactor-send-component-' into i3914-fix-newui-send-gas-estimation 2018-05-31 15:39:24 -02:30
Dan
5091b03e4b Merge branch 'develop' into i3725-refactor-send-component- 2018-05-31 15:28:03 -02:30
Alexander Tseung
cc73d869fe Add new alert modals 2018-05-31 10:37:52 -07:00
kumavis
e2e4496c87 sentry - message rewrite - guard against missing message 2018-05-30 17:42:41 -07:00
Dan
0f20fce9b7 Auto update gas estimate when to changes. 2018-05-30 20:54:31 -02:30
kumavis
e59f606adb 4.7.0 2018-05-30 15:08:44 -07:00
Csaba Solya
1dda0c6469 remove generating blocked accounts and use a config file instead 2018-05-30 21:15:59 +02:00
Csaba Solya
3e489ea165 fix documentation 2018-05-30 17:42:41 +02:00
Csaba Solya
cf73581c0e adding tests for recipient blacklist checker 2018-05-30 17:38:27 +02:00
Csaba Solya
6affd8f949 adding transaction controller tests 2018-05-30 16:24:40 +02:00
Csaba Solya
afb5788861 initial implementation 2018-05-30 15:53:18 +02:00
Yung chieh Tsai
181a11eae2 Update default provider 2018-05-30 09:57:31 +08:00
Alexander Tseung
a19b911feb
Add rpc key to i18n messages (#4375) 2018-05-29 18:31:32 -07:00
kumavis
4205d92729 Merge branch 'master' of github.com:MetaMask/metamask-extension into merge-master 2018-05-29 16:12:36 -07:00
kumavis
39069710d1
Merge pull request #4390 from MetaMask/i18n-brave-fix 
i18n - getFirstPreferredLangCode - guard against missing i18n api
 2018-05-29 11:05:12 -07:00
Alexander Tseung
41e38fe553
Add notification for dropped retry transactions (#4363) 2018-05-29 10:23:06 -07:00
Yung chieh Tsai
384cb126dd Update lib 2018-05-29 19:29:12 +08:00
kumavis
58de5671cc controllers - transactions - fix tx status update on boot 2018-05-29 00:53:44 -07:00
kumavis
16d0db15e0 controllers - transactions - fix tx confirmation 2018-05-29 00:41:28 -07:00
kumavis
c9f3404ca5 metamask-controller - lint fix 2018-05-28 23:25:48 -07:00
kumavis
7e87600042
metamask-controller - lint fix 2018-05-28 23:14:38 -07:00
kumavis
09601439e3 metamask-controller - update preferences controller addresses after import account 2018-05-28 23:00:22 -07:00
kumavis
fe42de4642 metamask-controller - update preferences controller addresses after import account 2018-05-28 22:58:14 -07:00
kumavis
e3ecc94a52
i18n - getFirstPreferredLangCode - guard against missing i18n api 
fix for brave
 2018-05-28 21:50:23 -07:00
Yung chieh Tsai
829deacb57 Rename files 2018-05-29 12:44:37 +08:00
Yung chieh Tsai
86ead431c3 Update manifest.json 2018-05-29 12:39:10 +08:00
MikeCheng1208
8b8cc94f6f Intergrate ENS with IPFS 2018-05-29 12:38:32 +08:00
MikeCheng1208
88a6b4edc7 setTimeout bug fix 2018-05-29 12:38:32 +08:00
MikeCheng1208
695b157e7b Intergrate ENS with IPFS 2018-05-29 12:38:25 +08:00
kumavis
1b3fedd10d controllers - transaction - pending-tx-tracker - lint fix 2018-05-28 15:54:47 -07:00
kumavis
5be154ea20 controllers - transactions - merge @frankiebee's work with mine 2018-05-28 14:29:31 -07:00
Anton
71a6e97327 cleanErrorStack moved to separate library module 
more errors traces cleaned up
 2018-05-28 22:57:08 +02:00
Anton
1d23a5c81b error message fix 2018-05-28 18:08:33 +02:00
Anton
62dc6e20eb Clean up user rejection error message 2018-05-28 17:57:45 +02:00
kumavis
9f8d5f0547 controllers - transactions - pending-tx-tracker - _getBlock - poll until block is truthy 2018-05-25 13:30:26 -07:00
kumavis
61ef4f1f29 tx-gas-utils - query for block without tx bodies 2018-05-25 13:21:42 -07:00
kumavis
76cfb10864 metamask-controller - wrap txController.addUnapprovedTx for wallet middleware reference before txController is instantiated 2018-05-24 16:05:07 -07:00
kumavis
aab9691c42 provider - update wallet hooks for new wallet middleware 2018-05-24 15:51:46 -07:00
kumavis
66a62dfd0c metamask-controller - fix account lookup hook 2018-05-24 13:44:33 -07:00
kumavis
91accee2c6 account-tracker - guard against empty block 2018-05-24 13:43:36 -07:00
kumavis
49ef93b991 controllers - recent-blocks - guard against empty block 2018-05-24 13:43:16 -07:00
Dan
5bb399e55a Display correct titles and subtitles on send token and editing send transaction screens. 2018-05-24 17:27:33 -02:30
kumavis
ee800de025 controllers - recent-blocks - wrap block-tracker event in try-catch 2018-05-23 22:46:20 -07:00
kumavis
dc96b1eb93 Merge branch 'network-remove-provider-engine' of github.com:MetaMask/metamask-extension into network-remove-provider-engine 2018-05-23 22:34:00 -07:00
kumavis
f41198fbb6 sentry - setupRaven - ensure message is truthy 2018-05-23 22:33:02 -07:00
kumavis
22e59af741 controllers - recent-blocks - ensure full blocks 2018-05-23 22:32:33 -07:00
kumavis
3d8f41e912
Merge pull request #4347 from MetaMask/transactions-use-new-block-tracker 
Transactions use new block tracker
 2018-05-23 16:33:02 -07:00
kumavis
eb2423799d controllers - account-tracker - refactor + update for eth-block-tracker@4 2018-05-23 16:22:40 -07:00
kumavis
53b946362a controllers - recent-blocks - doc update 2018-05-23 16:20:35 -07:00
frankiebee
61caee9d94 Merge branch 'network-remove-provider-engine' of https://github.com/MetaMask/metamask-extension into transactions-use-new-block-tracker 2018-05-22 16:45:20 -07:00
frankiebee
c4b09da34e transactions - update pending-tx-tracker to use the new block tracker 2018-05-22 16:42:06 -07:00
frankiebee
10aecf4922 remove dependance on the even tx:confirmed 2018-05-22 16:40:01 -07:00
kumavis
145016be4c Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine 2018-05-22 16:22:10 -07:00
Frankie
ed01c6c826
Merge pull request #4337 from MetaMask/recent-blocks-parallel 
controllers - recent-blocks - pull first historical blocks in parallel
 2018-05-22 16:08:33 -07:00
kumavis
3a80f3dd83 Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine 2018-05-22 13:20:04 -07:00
kumavis
b5bbfd3264
Merge pull request #4308 from MetaMask/i4232-addtoken 
Update designs for Add Token screen
 2018-05-22 12:53:59 -07:00
kumavis
fa37ba3992 controllers - recent-blocks - pull first historical blocks in parallel 2018-05-22 01:58:36 -07:00
Frankie
e8b2e11c56 Reveal get filtered tx list (#4332) 
* add getFilteredTxList from txController to getApi

* transactions - remove dead code (isNonceTaken)
 2018-05-21 16:00:44 -07:00
kumavis
7a65c22a02
Merge branch 'develop' into ci-publish-release 2018-05-21 14:58:37 -07:00
kumavis
f19d8a5905 Merge branch 'develop' of https://github.com/Trigalti/metamask-extension into Trigalti-develop 2018-05-21 14:14:03 -07:00
kumavis
08d95bbafa
Merge pull request #4034 from whymarrh/account-nicknames 
Move account names out of KeyringController
 2018-05-21 13:44:07 -07:00
kumavis
e447438504
Merge pull request #3997 from jakubsta/master 
Allow other extensions to connect
 2018-05-21 13:41:09 -07:00
Alexander Tseung
4f6b53c1aa Update designs for Add Token screen 2018-05-19 23:04:19 -07:00
Dan Finlay
713c77db54
Merge pull request #4199 from MetaMask/i3487-provider-errors 
RPC error middleware for json-rpc-engine
 2018-05-18 11:57:29 -07:00
kumavis
2d4d77b17d docs - jsdoc - fix syntax 2018-05-18 11:52:28 -07:00
simon
22753d96fd Added trailing comma for eslint 2018-05-18 16:11:46 +02:00
simon
41502cb384 Added adyen.com to blacklisted domains because postMessages are blocking card encryption 2018-05-18 15:43:27 +02:00
Whymarrh Whitby
67310e151e Fix migration 026 to produce the correct shape for state.identities 2018-05-17 13:35:38 -02:30
Whymarrh Whitby
2d13fac476 Add migration to move identities from KeyringController 2018-05-17 12:57:39 -02:30
Whymarrh Whitby
c54e4c7191 Add PreferencesController#setAddresses to update ids 2018-05-17 12:57:39 -02:30
Whymarrh Whitby
cbe4d0d88c Update AddressBookController to read from preferences store 2018-05-17 12:57:39 -02:30
Whymarrh Whitby
924cc1fcf7 Move setAccountLabel into PreferencesController 2018-05-17 12:57:39 -02:30
kumavis
3084dc47d1 recent-blocks - fix backfill blockNumber tracking 2018-05-17 00:13:20 -07:00
kumavis
41c04ef721 controllers - recent-blocks - fix pifyd setTimeout args 2018-05-16 23:13:25 -07:00
kumavis
08dc238c9f deps - fix incorrect dep paths and versions 2018-05-16 22:46:11 -07:00
kumavis
32b3b8f2a7 controllers - balance - update for eth-block-tracker@4 2018-05-16 21:16:05 -07:00
kumavis
623533ab15 recent-blocks - update for eth-block-tracker@4 2018-05-16 21:13:53 -07:00
kumavis
3e04840a71 remove unused events-proxy, was replaced with module swappable-obj-proxy 2018-05-16 21:10:41 -07:00
kumavis
b6eff15bd2 lint fix 2018-05-16 21:08:19 -07:00
kumavis
088d7930e0 network - create provider and block-tracker via json-rpc-engine 2018-05-16 20:46:34 -07:00
kumavis
44f31f9a7e Merge branch 'develop' of github.com:MetaMask/metamask-extension into scsaba-transaction-history-timestamps 2018-05-16 13:56:32 -07:00
kumavis
76c8cb3d7b
Merge pull request #4146 from MetaMask/sentry-error-like2 
sentry - add helper to fully rewrite all error messages
 2018-05-16 13:54:15 -07:00
kumavis
8e1cad5ff6
tx-state-history-helper - use more readable Date.now method 2018-05-16 13:05:07 -07:00
kumavis
d62fc22611 network - remove debugging console.log 2018-05-16 11:59:50 -07:00
kumavis
c27d9162d7 Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-controller-remove-setNetworkEndpoints 2018-05-16 11:57:07 -07:00
bitpshr
ce2834400c Add new json-rpc-engine middleware for improved error handling 2018-05-14 08:33:47 -04:00
Alexander Tseung
0bcfbc1544 Add error message when passwords don't match in first time flow. Change input field styling in first time flow 2018-05-13 21:46:12 -07:00
Alexander Tseung
2381c0e0f4 Add new unlock screen design 2018-05-11 12:49:17 -07:00
Orange
bfc19e403b Chinese translation Enhancements (#4218) 2018-05-11 10:09:14 -07:00
Csaba Solya
2081768fc5 fix lint issues 2018-05-10 13:43:31 +02:00
Csaba Solya
3642810584 remove unnecessary lib 2018-05-10 13:34:56 +02:00
Csaba Solya
349fb9e0bc revert unnecessary change in state manager 2018-05-10 13:33:40 +02:00
Csaba Solya
9026651224 add time stamps to transaction history log entries 2018-05-10 13:26:02 +02:00
bitpshr
6351b7bb88 Fix documentation typo 2018-05-07 15:08:43 -04:00
Filip Š
caf5a6c15c Fix Slovenian translation (#4189) 2018-05-07 15:05:34 -04:00
kumavis
a1d13d45cf lint - cleanup some unused variables 2018-05-02 18:23:55 -07:00
kumavis
fec4c50657 controllers - network - move default config out of first-time-state 2018-05-02 18:03:59 -07:00
frankiebee
a45cb75435 transactions - add a nonce check utility for ui use 2018-05-01 13:57:43 -07:00
frankiebee
62bf76db53 fix - getTxsByMetaData check if the key is in the object not if the value is truthy 2018-05-01 13:57:14 -07:00
kumavis
53caa49666 network - refactor to remove unnecesary code 2018-04-30 17:59:53 -07:00
kumavis
6f316ca450 network - remove setNetworkEndpoints 2018-04-30 16:36:17 -07:00
kumavis
bfedd2776d controllers - network - more semantic assert 2018-04-30 16:23:16 -07:00
kumavis
84275456e4
Merge pull request #4143 from prettymuchbryce/blacklist-shopify-iframe 
Blacklist problematic shopify iFrame
 2018-04-30 17:06:19 -06:00
kumavis
93a9ef284e sentry - add helper to fully rewrite all error messages 2018-04-30 16:05:01 -07:00
Thomas Huang
3180b69b97
Merge pull request #4140 from MetaMask/v4.6.1 
Version 4.6.1
 2018-04-30 14:37:22 -07:00
Bryce Neal
18a8a21179 Blacklist problematic shopify iFrame 2018-04-30 14:35:47 -07:00
kumavis
477063a5a0 Version 4.6.1 2018-04-30 13:29:22 -07:00
kumavis
e881ea7aaf sentry - report error-like messages using the obj message 2018-04-30 12:10:15 -07:00
kumavis
2a8d3ea450 sentry - wrap report modifiers in a try-catch 2018-04-30 12:07:48 -07:00
kumavis
5f3f8c85fc
Merge pull request #4059 from MetaMask/i-4033-seed-words 
Use new design for Reveal Seed screen. Persist seed words only in the first time flow.
 2018-04-30 12:04:53 -06:00
frankiebee
98ae853b6c require log 2018-04-30 09:57:36 -07:00
kumavis
755d4945f7
Merge pull request #4132 from MetaMask/master 
Master
 2018-04-30 09:38:12 -06:00
frankiebee
706647785c log emitter errors 2018-04-29 16:35:08 -07:00
frankiebee
7eb735651b transactions - run event emitters outside context of _setTxStatus 2018-04-29 16:32:16 -07:00
frankiebee
873f85d996 guard adainst raven erroring 2018-04-29 13:46:07 -07:00
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
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
kumavis
1c63b11e3f rpc - bump provider-engine + eth-json-rpc-filters 2018-04-25 14:02:41 -07:00
frankiebee
8ffce8b59d transactions - more docs and clean ups 2018-04-25 11:13:51 -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
7ec775d614 Use latest balanc3 api for prices 2018-04-24 14:12:57 -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
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
9679cdae02
Merge pull request #4041 from MetaMask/DocumentBackground 
Document Background Script
 2018-04-23 14:49:01 -07:00
Dan Finlay
5abb0256a9 Linted docs 2018-04-23 14:47:11 -07:00
Alexander Tseung
9e41f58af2 Clean up network config 2018-04-23 10:18:05 -07:00
Dan Finlay
621e9334bc Cleaned up some typos and JSDocs in Transactions 
Nonce tracker is not fully documented yet.
Have not yet touched:
- tx-state-manager
- tx-state-history-helper
- util
- tx-gas-utils
- pending-tx-tracker
 2018-04-23 09:43:18 -07:00
Dan
0c26df9653 Fix nits. 2018-04-23 14:11:02 -02:30
Alexander Tseung
1d2d9798cb Merge branch 'master' of https://github.com/MetaMask/metamask-extension into i-4033-seed-words 2018-04-22 09:28:29 -07:00
Alexander Tseung
3082d2e4ef Use new design for reveal seed screen. Persist seed words only in first time flow 2018-04-22 09:24:21 -07:00
Alexander Tseung
477b74124d Revert "Fix UI getting stuck in Reveal Seed screen" 
This reverts commit 2c8156ebe9.
 2018-04-21 22:23:45 -07:00
Dan Finlay
74c419f9b6
Merge pull request #4020 from MetaMask/i3941-jsdoc-bitpshr 
Documentation
 2018-04-20 14:10:05 -07:00
Dan
69920045e9 Minor fixes in a number of docs. 2018-04-20 15:48:58 -02:30
Dan
3ec22dc7e1 Notification manager method docs. 2018-04-20 15:48:44 -02:30
Dan Finlay
327ec03d6f Remove wrong chars 2018-04-20 10:45:06 -07:00
Dan Finlay
357582cc52 Add ui note to background docs 2018-04-20 10:41:41 -07:00
Dan Finlay
17afe922d4 Lint background docs 2018-04-20 10:40:53 -07:00
Dan Finlay
ff689748a7 Document MetaMaskState and TransactionMeta 2018-04-20 10:39:31 -07:00
Dan Finlay
fad8afb7d1 Linted jsdocs 2018-04-20 09:26:24 -07:00
Dan
71b0de76ff Merge branch 'master' into dm-docs-2 2018-04-20 13:23:17 -02:30
bitpshr
8636f3bae5 Clean up JSDoc for background scripts 2018-04-19 15:14:00 -04:00
frankiebee
e862a5091e transactions - fix refernces 2018-04-19 12:07:45 -07:00
frankiebee
c20c97ce62 Merge branch 'master' into tx-controller-rewrite-v3 2018-04-19 11:49:11 -07:00
frankiebee
eeb9390de8 meta - transactions - docs yo! 2018-04-19 11:46:15 -07:00
bitpshr
9c7eafc86f Add more documentation to computed balances controller 2018-04-19 14:37:08 -04:00
Dan Finlay
16434776a4 Document Background Script 2018-04-19 11:27:53 -07:00
Dan
9f12c26d44 Even more documentation for various controllers and libs. 2018-04-19 13:08:56 -02:30
bitpshr
1ef6528921 Add JSDoc to various background scripts 2018-04-18 21:30:13 -04:00
Dan Finlay
f78d2f5e0b Added docs to MM-controller 2018-04-18 17:54:50 -07:00
Dan Finlay
4544d57f26
Merge pull request #3984 from whymarrh/3941-jsdoc 
Add a few docblocks to background files
 2018-04-18 15:37:50 -07:00
bitpshr
6dbdc87713 Add generated docs 2018-04-18 17:24:36 -04:00
bitpshr
c9f83fe8bc Add JSDoc to various background scripts 2018-04-18 17:02:08 -04:00
Dan Finlay
6742a5b272
Merge pull request #3987 from MetaMask/dm-docs-1 
Documentation for various controllers and and lib utils
 2018-04-18 13:39:31 -07:00
Whymarrh Whitby
603c1310ff Add a few missing docblocks to background files 2018-04-18 18:00:22 -02:30
Dan
164f9c4662 Missing bracket in docblock. 2018-04-18 16:17:06 -02:30
Dan
649d2f8b22 Merge branch 'master' into dm-docs-1 2018-04-18 16:15:48 -02:30
Dan Finlay
061975cd4a
Merge pull request #3977 from MetaMask/i-3913-big-number 
Fix BigNumber exception in confirm-send-ether
 2018-04-18 11:45:20 -07:00
Dan Finlay
0a14cedaf1
Merge pull request #4004 from MetaMask/i3955-reveal-seed 
Fix UI getting stuck in Reveal Seed screen
 2018-04-18 11:44:14 -07:00
Dan
e80bd230b9 NO MIXED TABS AND SPACES 2018-04-18 16:11:39 -02:30
Dan
6d96b1a2ab Documentation fix: @constant -> @property 2018-04-18 16:08:08 -02:30
Vikas Kumar Yadav
7e21fc2aa7 I18n - add Tamil + some Hindi fixes 
* removed ethereum, coinbase typos

* added ebtry for tamil

* removed tamil from index.json for now

will start adding tamil translations very soon.

* Added transaltion directory for tamil language

* Added some translations till BETA

* added all translations for c

* completed d and e alphabets

* completed fand g alphabets

* Added i,j and k translations

* Added l,m,n and o translations

* Added translations for p,q,r and s

* Completed the translations. Kept some abbreviations such as JSON, URI, HTTP, ShapeShoft as it is in the translated version itself
 2018-04-18 10:33:19 -07:00
Alexander Tseung
2c8156ebe9 Fix UI getting stuck in Reveal Seed screen 2018-04-18 10:18:24 -07:00
Alexander Tseung
053044fb65 Fix spinner layout 2018-04-18 01:03:07 -07:00
Alexander Tseung
de7fc781a5 Fix BigNumber exception in confirm-send-ether 2018-04-18 00:58:40 -07:00
Jakub Stasiak
ad7d38c0dc Update: allow other extension to connect 2018-04-17 21:49:40 +02:00
Alexander Tseung
b0a105ce80 Fix confirmation popup not always opening 2018-04-17 08:58:37 -07:00
Dan
6da00c4061 Add missing descriptions in util.js 2018-04-17 00:56:46 -02:30
Dan
7b5d506cec Document async function as returning a promise. 2018-04-17 00:55:10 -02:30
Dan
128cb1af46 Improve documentation of promises that return undefined. 2018-04-17 00:54:16 -02:30
Dan
e9ca7199ab Typo fixes, type fixes on the return clauses of the buyEthUrl and getPrefferedLangCode functions. 2018-04-16 21:23:29 -02:30
Dan Finlay
0668976514
Merge branch 'master' into i3981-contract-rates 2018-04-16 16:32:56 -07:00
Dan
cc7e71488e Spell deprecated correctly. 2018-04-16 19:47:52 -02:30
Dan Finlay
26d2f5cd0e
Merge pull request #3970 from MetaMask/i3651-removeGlobalLog 
Remove reliance on window.log
 2018-04-16 15:16:45 -07:00
Dan
23acddf8f6 @params -> @param fix 2018-04-16 19:45:27 -02:30
bitpshr
b4912f29cd Disable token price polling when no client is active 2018-04-16 18:12:05 -04:00
Dan
20a075657f Documentation for various controllers and libs 2018-04-16 14:38:04 -02:30
bitpshr
d0447f9058 Maintain token prices using a background service 2018-04-16 11:47:06 -04:00
Martin Šmíd
edc6797e75 Fix vault translation 2018-04-14 09:20:00 +02:00
Martin Šmíd
1d7e6d5298 Add czech translation 2018-04-14 09:20:00 +02:00
bitpshr
7129d7c0f3 Require loglevel singleton in each module that uses it 2018-04-13 17:56:28 -04:00
frankiebee
943eea043c fix up - more docs 2018-04-13 13:18:45 -07:00
frankiebee
88f4212363 meta - transactions - code clean up and jsDoc 2018-04-13 12:38:07 -07:00
bitpshr
8974f933fc Add tests for ComposableObservableStore 2018-04-13 14:32:58 -04:00
bitpshr
4780f825b1 Add ComposableObservableStore for subscription management 2018-04-13 10:20:44 -04:00
frankiebee
3aaa28531e transactions - code cleanup 2018-04-12 12:24:16 -07:00
Dan
8fb1237d64 Documentation for environemnt-type.js 2018-04-12 13:17:46 -02:30
frankiebee
5494aa4f9c transactions - lint fixes 2018-04-10 14:54:30 -07:00
frankiebee
2d7c3c2b00 meta - transactions - create a transactions dir in controller and move relevant files into it 2018-04-10 14:28:05 -07:00
kumavis
29dab1e9e0
Merge pull request #3938 from nyatla/master 
Japanese langurge Transration
 2018-04-10 02:08:51 -07:00
nyatla
cc246528b5 Merge tag 'v4.5.5' 
# Conflicts:
#	app/_locales/ja/messages.json
#	package-lock.json

messages.jsonのローカライズ
 2018-04-10 17:14:28 +09:00
R.IIzuka
bc0487006c Update messages.json 
Fixed Japanese phrases.
Add some translations.
 2018-04-10 10:46:12 +09:00