aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/metamask-controller.js
Commit message (Collapse)AuthorAgeFilesLines
* Right-to-left CSS (using module for conversion) (#7072)Nick Doiron2019-09-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | * Create RTL stylesheets using `gulp-rtl` * Handle RTL stylesheet special cases Certain blocks of Sass were set to bypass "rtlcss" using ignore comments. Certain icons had to be flipped 180 degrees. * Switch stylesheets when locale changes A second stylesheet has been added to each HTML page for use with right-to-left locales. It is disabled by default. It is enabled on startup if a RTL locale is set, and when switching to a RTL locale. Similarly the LTR stylesheet is disabled when a RTL locale is used. Unfortunately there is an unpleasant flash of unstyled content when switching between a LTR and a RTL locale. There is also a slightly longer page load time when using a RTL locale (<1s difference). We couldn't think of an easy way to avoid these problems. * Set `dir="auto"` as default on `TextFields`
* Remove ComputedbalancesController (#7057)Whymarrh Whitby2019-08-221-11/+0
|
* Add support for eth_signTypedData_v4 (#6930)Brendan Chou2019-08-211-1/+4
|
* Filter non-ERC-20 assets during mobile sync (#7035)Esteban Miño2019-08-211-2/+18
|
* Bug fixes for incoming transactions (#7043)Whymarrh Whitby2019-08-211-0/+2
| | | | | | * Fix styling of `.transaction-list` * Filter `incomingTxListSelector` by network as well * Start and stop block tracker polling in incoming tx controller * Add fetch with abort in bg for `IncomingTxController`
* Fetch & display received transactions (#6996)Dan J Miller2019-08-171-0/+10
|
* Connections settings tab (#7013)Whymarrh Whitby2019-08-161-2/+5
| | | | | | | | | | | | * Nix notification for Share Address * Add Connections settings tab in place of privacy mode toggle * Split ProviderApprovalController into two stores * Remove privacyMode feature flag altogether * Add migration to remove privacyMode feature flag
* Address book fixes (#6978)Dan J Miller2019-08-141-1/+1
| | | | | | | | | | * Ensure address book send flow correctly matches address book addresses to ens addresses * Use nodify on background.setAddressBook to receive correct result in actions.js * Better error handling for actions.js addToAddressBook * Eliminate unnecessary data normalization and move more data manipluation to ens-input and send-content containers
* Remove reload from Share Address button (#6991)Whymarrh Whitby2019-08-101-6/+0
| | | | | | * Update tooltip words for Share Address * Don't forceReload anything on Share Address
* Remove unused lostAccounts state (#6979)Whymarrh Whitby2019-08-091-25/+0
|
* I5849 incremental account security (#6874)Dan J Miller2019-08-021-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | * Implements ability to defer seed phrase backup to later * Adds incremental-security.spec.js, including test dapp that sends signed tx with stand alone localhost provider * Update metamask-responsive-ui for incremental account security changes * Update backup-notification style and fix responsiveness of seed phrase screen * Remove uneeded files from send-eth-with-private-key-test/ * Apply linguist flags in .gitattributes for send-eth-with-private-key-test/ethereumjs-tx.js * Improve docs in controllers/onboarding.js * Clean up metamask-extension/test/e2e/send-eth-with-private-key-test/index.html * Remove unnecessary newlines in a couple first-time-flow/ files * Fix import of backup-notification in home.component * Fix git attrs file
* Default Privacy Mode to ON, allow force sharing address (#6904)Whymarrh Whitby2019-08-011-0/+8
|
* Enable indent linting via ESLint (#6936)Whymarrh Whitby2019-08-011-51/+51
| | | | | | * Enable indent linting via ESLint * yarn run lint:fix
* Address book send plus contact list (#6914)Dan J Miller2019-08-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Style Send Header * Move Send to-row to send view and restyle * Add "Recents" group to select recipient view * Rename SendToRow to AddRecipient * Basic UI and Layout * New ENSInput component * wip - fuzzy search for input * small refactor * Add Dialog * contact list initial * initial error on invalid address * clean up edit * Click to open modal * Create AddToAddressBookModal component * Modal styling and layout * modal i18n * Add to Addressbook * ens wip * ens wip * ENS Resolution * Reset input * Send to explicit address * Happy Path Complete * Add back error checking * Reset send-to when emptying input * Add back warning object * Fix linter * Fix unit test #1 - fix import paths * Remove dead tests * One more to go * Fix all unit tests * add unit test for reducers and actions * test rendering AddRecipient * Add tests for dialog boxes in AddRecipient * Add test for validating * Fix linter * Fix e2e tests * Token send e2e fix * Style View Contact * Style edit-contact * Fix e2e * Fix from-import-beta-ui e2e spec * Make section header say "add recipient” by default * Auto-focus add recipient input * Update placeholder text * Update input title font size * Auto advance to next step if user paste a valid address * Ellipsify address when recipient is selected * Fix app header background color on desktop * Give each form row a margin of 16px * Use .container/.component naming pattern for ens-input * Auto-focus on input when add to addressbook modal is opened; Save on Enter * Fix and add unit test * Fix selectors name in e2e tests * Correct e2e test token amount for address-book-send changes * Adds e2e test for editing a transaction * Delete test/integration/lib/send-new-ui.js * Add tests for amount max button and high value error on send screen to test/e2e/metamask-ui.spec.js * lint and revert to address as object keys * add chainId based on current network to address book entry * fix test * only display contacts for the current network * Improve ENS message when not found on current network * Add error to indicate when network does not support ENS * bump gaba * address book, resolve comments * Move contact-list to its own component * De-duplicate getaddressbook selector and refactor name selection logic in contact-list-tab/ * Use contact-list component in contact-list-tab.component (i.e. in settings) * Improve/fix settings headers for popup and browser views * Lint fixes related to address book updates * Add 'My accounts' page to settings address book * Update add new contact button in settings to match floating circular design * Improve styles of view contact page * Improve styles and labels of the add-contact.component * Further lint fixes related to address book updates * Update unit tests as per address book updates * Ensure that contact list groups are sorted alphabetically * Refactor settings component to use a container for connection to redux; allow display of addressbook name in settings header * Decouple ens-input.component from send context * Add ens resolution to add contact screen in settings * Switching networks when an ens address is shown on send form removes the ens address. * Resolve send screen search for ensAddress to matching address book entry if it exists * Show resolved ens icon and address if exists (settings: add-contact.component) * Make the displayed and copied address in view-contact.component the checksummed address * Default alias state prop in AddToAddressBookModal to empty string * Use keyCode to detect enter key in AddToAddressBookModal * Ensure add-contact component properly updates after QR code detection * Fix display of all recents after clicking 'Load More' in contact list * Fix send screen contact searching after network switching * Code cleanup related to address book changes * Update unit tests for address book changes * Update ENS name not found on network message * Add ens registration error message * Cancel on edit mode takes user back to view screen * Adds support for memo to settings contact list view and edit screens * Modify designs of edit and view contact in popup environment * Update settings content list UX to show split columns in fullscreen and proper internal navigation * Correct background address book API usages in UI
* Remove `seedWords` completely from metamask state (#6920)Mark Stacey2019-07-261-34/+0
| | | | | | | | | | | | | | | | `seedWords` used to be stored on the metamask state temporarily at certain points. This hasn't been the case since #5994, but references to this state remained. All of the logic remained for correctly updating these `seedWords`, handling them during navigation, and scrubbing them from the state. However the state was never updated in practice. The `seedWords` are still returned by `verifySeedPhrase`, and they're still stored in component state in a few places. But they aren't ever set in the Redux metadata state or the Preferences controller. All references to this state have been removed, along with any logic for interacting with this state. A few unused actions were removed as well.
* Abstract domain provider from its stream transport (#6670)Dan Finlay2019-07-161-15/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Abstract domain provider from its stream transport Creating new provider-consuming extensions, like [a new platform](https://github.com/MetaMask/metamask-extension/blob/develop/docs/porting_to_new_environment.md) can be frustrating for new contributors because our provider construction has been tangled with our streaming interface. Here I've broken up our streaming domain connection from the provider construction, so developers can more easily construct local and domain-restricted providers without dealing with streams. * Abstract public API from stream interface * clean up noop * Document non-streaming interface * getSiteMetadata must be async * Clean up filters on stream end * Document cleaning up filters * Allow named filterMiddleware to be cleaned up * Linted * Require site metadata * Destroy any destroyable middleware during cleanup * Lint
* Remove UiMigrationAnnouncement and associated state (#6794)Whymarrh Whitby2019-07-041-1/+0
|
* feature: integrate gaba/CurrencyRateController (#6570)Paul Bouchon2019-06-011-20/+12
|
* Fixes bugs in 6.5.1 (#6613)Bruno Barbieri2019-05-151-1/+1
| | | | | | * fix bg error * fix ui exception
* feature: integrate gaba/ShapeShiftController (#6569)Paul Bouchon2019-05-151-7/+5
|
* Update auto-logout to recognize idle time in background (#6593)Whymarrh Whitby2019-05-141-0/+12
| | | | | | * Fix wording of autoLogoutTimeLimitDescription * AppStateController and update auto-logout functionality
* Merge pull request #6568 from MetaMask/feature/gaba-phishing-controllerThomas Huang2019-05-111-7/+8
|\ | | | | feature: integrate gaba/PhishingController
| * feature: integrate gaba/PhishingControllerbitpshr2019-05-091-7/+8
| |
* | New settings custom rpc form (#6490)Dan J Miller2019-05-101-7/+7
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* Check for unused function arguments (#6583)Whymarrh Whitby2019-05-091-5/+4
| | | | | | | | | | * 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
* Refactor ProviderApprovalController to use rpc and publicConfigStore (#6410)kumavis2019-05-041-22/+80
| | | | | | | | | | * 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
* Send metrics event from backend for on chain transaction failures (#6500)Dan J Miller2019-04-291-1/+18
| | | | | | * Send metrics event from backend for on chain transaction failures * Passes state object to backEndMetaMetricsEvent, and adds getMetaMetricState selector
* Opens the original webpage from where installation of MetaMask was re… (#6272)Sneh Koul2019-04-251-0/+1
| | | | | | | | | | * 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.
* metamask-controller - use improved provider-as-middleware utilitykumavis2019-04-041-2/+2
|
* Remove NoticeController (#6382)Thomas Huang2019-04-021-16/+0
|
* notices - markAllNoticesRead - use async/awaitkumavis2019-03-291-1/+1
|
* Clear notices when setCompletedOnboarding is calledThomas Huang2019-03-211-0/+1
|
* GABA: Integrate AddressBookController (#5847)Paul Bouchon2019-03-121-10/+5
| | | | | | * gaba: integrate AddressBookController * pin gaba version and update lockfile
* Metametrics (#6171)Dan J Miller2019-03-051-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* Feature Flag + Mobile Sync (#5955)Dan Finlay2019-02-261-0/+58
|
* account tracker - update accounts from balanceChecker contract (#6181)Jenny Pollack2019-02-211-0/+1
| | | | | | * account tracker - update accounts from balanceChecker contract * fall back to getBalance if the contract query fails
* EIP-1193: standard provider API (#6170)Paul Bouchon2019-02-201-1/+1
| | | | | | | | | | | | | | | | * EIP-1193: Implement new provider API * EIP-1193: Updated implementation * Remove test file * Fix tests * Update ping check * Update logic * PR feedback
* Merge pull request #6137 from whymarrh/es6-backgroundWhymarrh Whitby2019-02-141-5/+5
|\ | | | | Sprinkle ES6 onto background files
| * Update MetaMaskController to use ES6 destructuring, const, letWhymarrh Whitby2019-02-121-5/+5
| |
* | recent-blocks - dont listen for block when on infura providersfrankiebee2019-02-121-0/+1
|/
* Add announcement for users migrated to the new UIWhymarrh Whitby2019-02-051-0/+1
|
* I#5956 fix2 dont overwrite existing rpc settings (#6044)Frankie2019-01-301-2/+25
| | | | | | | | | | | | | | * 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
* Refactor first time flow, remove seed phrase from state (#5994)Alexander Tseung2019-01-231-0/+1
| | | | | | | | | | | | | | | | | | | | * 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
* Use Parity on-chain registry only when is needed (#6052)Esteban Miño2019-01-231-0/+1
| | | | | | * add and use knownMethodData to avoid infura requests * dataMethod to methodData and check empty response
* Group transactions by nonce (#5886)Alexander Tseung2018-12-101-5/+9
|
* Adds createSpeedUpTransaction to txControllerDan Miller2018-12-041-0/+7
|
* Save recent network balances in local storage (#5843)Dan J Miller2018-12-011-0/+9
| | | | | | | | | | | | * 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>
* Use Array.includesBruno Barbieri2018-11-271-4/+4
|
* remove extra semicolonbrunobar792018-11-211-1/+1
|
* consider hw walletsbrunobar792018-11-211-9/+16
|
* ESLint fixes (#5775)Whymarrh Whitby2018-11-171-2/+2
| | | | | | * eslint . --fix * Upgrade all ESLint warnings to errors
* Update Balanc3 API (#5744)Paul Bouchon2018-11-141-0/+1
| | | | | | * Update balanc3 API used in TokenRatesController * Remove demo URL and use nativeCurrency when fetching token rates
* Clear cached approval after rejectionbitpshr2018-11-071-2/+2
|
* Disable approval cachingbitpshr2018-11-061-0/+1
|
* Differentiate locked and enabledbitpshr2018-11-061-1/+0
|
* Code bathbitpshr2018-11-061-1/+4
|
* Handle logout gracefullybitpshr2018-11-061-1/+6
|
* Add isUnlocked provider hookbitpshr2018-11-061-0/+1
|
* EIP-1102: add user privacy optionbitpshr2018-11-061-2/+2
|
* EIP-1102: Add option to force-enable providerbitpshr2018-11-061-1/+3
|
* EIP-1102: updated implementationbitpshr2018-11-061-2/+19
|
* Merge pull request #5596 from MetaMask/validateSignTypedDatakumavis2018-10-301-27/+4
|\ | | | | Validate signTypedData signer/address in eth-json-rpc-middleware
| * Add version to unapprovedMessageThomas2018-10-251-2/+2
| |
| * Remove commented out/unused methodsThomas2018-10-251-27/+2
| |
| * Validate signTypedData in eth-json-rpc-middlewareThomas2018-10-251-28/+30
| |
* | Add support for RPC endpoints with custom chain IDs (#5134)HackyMiner2018-10-261-5/+13
|/
* specific add and remove methods for frequentRpcList (#5554)Esteban Miño2018-10-201-2/+2
|
* Merge pull request #5127 from MetaMask/account-tracker-network-changekumavis2018-10-181-1/+7
|\ | | | | Bug Fix: Force AccountTracker to update balances on network change
| * Merge branch 'develop' into account-tracker-network-changekumavis2018-09-281-71/+161
| |\
| * | metamask controller - force account tracker to update balances on network changekumavis2018-08-231-0/+4
| | |
* | | Adds toggle for primary currency (#5421)Alexander Tseung2018-10-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | Merge pull request #5458 from MetaMask/provider-subsBruno Barbieri2018-10-101-5/+15
|\ \ \ | | | | | | | | Feature: Subscription support
| * | | provider - enable subscription support (newHeads, logs)kumavis2018-10-081-5/+15
| | | |
* | | | Merge branch 'develop' into update-balance-on-unlockDan Finlay2018-10-061-0/+1
|\ \ \ \
| * | | | Fix updating of pending transactionsDan Finlay2018-10-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Transaction statuses were not being properly updated when: - MetaMask was unlocked - The network was changed This PR fixes both of those. Fixes #5174
* | | | | Update all balances on password unlockDan Finlay2018-10-061-0/+1
|/ / / /
* / / / Increase suggested gas percentile to 65 (#5359)Dan Finlay2018-10-051-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | * 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
* | | Add domain whitelist method to MetaMaskControllerWhymarrh Whitby2018-10-021-0/+11
| | |
* | | support editable customRPC (#5267)HackyMiner2018-09-291-0/+9
| |/ |/| | | | | | | | | * support editable customRPC #5246 * remove rpcList size restriction
* | bugfix: update eth_signTypedData_v3 parameter orderbitpshr2018-09-261-4/+4
| |
* | Fix MetaMask web3 version (#5352)Esteban Miño2018-09-261-0/+1
| |
* | Adds getPendingNonce method to provider initialization options in ↵Dan Miller2018-09-221-0/+14
| | | | | | | | metamask-controller.
* | Update new method namespace from v2 to v3bitpshr2018-09-141-2/+2
| |
* | Implement latest EIP-712 protocolbitpshr2018-09-141-17/+60
| |
* | Delete ConfigManager, replacing its usages with PreferencesControllerWhymarrh Whitby2018-09-121-37/+9
| |
* | Merge pull request #5216 from MetaMask/tx-cancelFrankie2018-09-111-0/+14
|\ \ | | | | | | Add createCancelTransaction method
| * | Add createCancelTransaction methodAlexander Tseung2018-09-111-0/+14
| | |
* | | Upgrade obs-store and fix memory leaksConnor Christie2018-09-101-3/+7
|/ /
* | fix conflictsEsteban MIno2018-08-291-13/+50
|\ \
| * \ Merge pull request #5122 from MetaMask/lazy-account-trackerDan Finlay2018-08-231-0/+21
| |\ \ | | | | | | | | Network IO Optimization: Lazy AccountTracker
| | * | Add todo to dedupe UI tracking in backgroundDan Finlay2018-08-231-0/+1
| | | |
| | * | account-tracker - only track blocks when there are activeControllerConnectionskumavis2018-08-221-0/+8
| | | |
| | * | metamask controller - track active controller connectionskumavis2018-08-221-0/+12
| | |/
| * / Update unlock logic to not overwrite existing selected addressWhymarrh Whitby2018-08-231-13/+29
| |/
* | Merge branch 'develop' into WatchTokenFeatureEsteban MIno2018-08-221-2/+5
|\|
| * fix hardware wallets account namebrunobar792018-08-211-1/+3
| |
| * fix account removalbrunobar792018-08-211-1/+2
| |
* | watchAsset returns result wether token was added or notEsteban MIno2018-08-211-2/+2
| |
* | Merge branch 'develop' into WatchTokenFeatureEsteban MIno2018-08-211-145/+141
|\|
| * Merge branch 'develop' into ledger-supportBruno Barbieri2018-08-181-2/+47
| |\
| | * Restores accounts until one with a zero balance is foundDan Matthews2018-08-171-2/+47
| | |
| | * Merge branch 'develop' into network-remove-provider-engineThomas2018-08-151-1/+2
| | |\ | | | | | | | | | | | | Override package-lock and fix merge conflicts
| | * \ Merge branch 'develop' into network-remove-provider-engineThomas2018-07-261-1/+169
| | |\ \
| | * \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-07-041-4/+3
| | |\ \ \ | | | | | | | | | | | | | | | | | | network-remove-provider-engine
| | * \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-07-031-27/+9
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine
| | * \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-06-081-0/+14
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine
| | * | | | | | lint - remove unused requirekumavis2018-06-071-1/+0
| | | | | | | |
| | * | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-06-071-1/+38
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine
| | * | | | | | | metamask-controller - lint fixkumavis2018-05-291-1/+1
| | | | | | | | |
| | * | | | | | | metamask-controller - update preferences controller addresses after import ↵kumavis2018-05-291-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | account
| | * | | | | | | metamask-controller - wrap txController.addUnapprovedTx for wallet ↵kumavis2018-05-251-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | middleware reference before txController is instantiated
| | * | | | | | | provider - update wallet hooks for new wallet middlewarekumavis2018-05-251-60/+17
| | | | | | | | |
| | * | | | | | | metamask-controller - fix account lookup hookkumavis2018-05-251-2/+2
| | | | | | | | |
| | * | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-05-231-11/+16
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine
| | * | | | | | | | network - create provider and block-tracker via json-rpc-enginekumavis2018-05-171-3/+4
| | | | | | | | | |
| * | | | | | | | | fix merge conflictsbrunobar792018-08-181-65/+34
| | | | | | | | | |
| * | | | | | | | | remove console logsbrunobar792018-08-151-7/+1
| | | | | | | | | |
| * | | | | | | | | fixed unit testsbrunobar792018-08-151-0/+6
| | | | | | | | | |
| * | | | | | | | | fix tx testsbrunobar792018-08-141-3/+3
| | | | | | | | | |
| * | | | | | | | | legacy and new hd path workingbrunobar792018-08-141-1/+2
| | | | | | | | | |
| * | | | | | | | | good progress adding pathsbrunobar792018-08-141-8/+11
| | | | | | | | | |
| * | | | | | | | | this should be ready to gobrunobar792018-08-121-3/+3
| | | | | | | | | |
| * | | | | | | | | able to add accountsbrunobar792018-08-111-1/+1
| | | | | | | | | |
| * | | | | | | | | iframe communication workingbrunobar792018-08-111-4/+2
| | | | | | | | | |
| * | | | | | | | | refactor to support multiple hw walletsbrunobar792018-08-111-75/+55
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'develop' into WatchTokenFeatureEsteban Miño2018-08-081-1/+2
|\| | | | | | | |
| * | | | | | | | improve commentsEsteban MIno2018-07-311-1/+1
| | | | | | | | |
| * | | | | | | | tokens per network for individual accountEsteban MIno2018-07-271-0/+1
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | eth_watchToken workingEsteban MIno2018-08-041-0/+1
| | | | | | | |
* | | | | | | | merge developEsteban MIno2018-08-041-4/+171
|\| | | | | | |
| * | | | | | | run linterbrunobar792018-07-221-1/+1
| | | | | | | |
| * | | | | | | fix mergeEsteban MIno2018-07-211-1/+0
| | | | | | | |
| * | | | | | | Merge branch 'develop' into detectTokenFeatureEsteban Miño2018-07-211-1/+161
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'develop' into transaction-notificationsCsaba S2018-07-211-1/+161
| | |\ \ \ \ \ \ \
| | | * | | | | | | Auto-detect tokens #3034 (#4683)Esteban Miño2018-07-211-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | | * | | | | | | added some e2e testsbrunobar792018-07-181-1/+1
| | | | | | | | | |
| | | * | | | | | | added tests for removeAccountbrunobar792018-07-171-2/+0
| | | | | | | | | |
| | | * | | | | | | added more unit testsbrunobar792018-07-171-4/+3
| | | | | | | | | |
| | | * | | | | | | added unit tests for metamaskcontrollerbrunobar792018-07-171-3/+17
| | | | | | | | | |
| | | * | | | | | | forget device and autiload account features addedbrunobar792018-07-121-1/+36
| | | | | | | | | |
| | | * | | | | | | update to temp dependenciesbrunobar792018-07-121-1/+6
| | | | | | | | | |
| | | * | | | | | | account removal is workingbrunobar792018-07-111-1/+15
| | | | | | | | | |
| | | * | | | | | | fix trezor labelbrunobar792018-07-101-1/+1
| | | | | | | | | |
| | | * | | | | | | added label for trezor accountsbrunobar792018-07-101-1/+3
| | | | | | | | | |
| | | * | | | | | | fix account duplicationbrunobar792018-07-101-1/+3
| | | | | | | | | |
| | | * | | | | | | fix all the account related bugsbrunobar792018-07-101-4/+15
| | | | | | | | | |
| | | * | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵brunobar792018-07-071-0/+1
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initial-trezor-support
| | | * | | | | | | | UI refactorbrunobar792018-07-061-2/+4
| | | | | | | | | | |
| | | * | | | | | | | lint fixbrunobar792018-07-041-2/+2
| | | | | | | | | | |
| | | * | | | | | | | fix merge conflictsbrunobar792018-07-021-11/+0
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / | | | | |/| | | | | |
| | | * | | | | | | | fixesbrunobar792018-06-231-3/+3
| | | | | | | | | | |
| | | * | | | | | | | clean upBruno2018-06-131-16/+19
| | | | | | | | | | |
| | | * | | | | | | | fix merge conflictsBruno2018-06-131-12/+8
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | move TrezorKeyring to its own packageBruno2018-06-131-2/+3
| | | | | | | | | | | |
| | | * | | | | | | | | balances workingBruno2018-06-111-3/+2
| | | | | | | | | | | |
| | | * | | | | | | | | add account workingBruno2018-06-111-0/+2
| | | | | | | | | | | |
| | | * | | | | | | | | clean upBruno2018-06-111-3/+4
| | | | | | | | | | | |
| | | * | | | | | | | | initial trezor supportBruno2018-06-101-1/+62
| | | | | | | | | | | |
| | * | | | | | | | | | remove dropped handlerCsaba Solya2018-07-211-1/+1
| | | | | | | | | | | |
| | * | | | | | | | | | add notificationsCsaba Solya2018-07-201-0/+7
| | | |_|_|/ / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge pull request #4685 from MetaMask/estimate-gasprice-background-newuiDan J Miller2018-07-051-0/+1
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | Use background gas price estimation method in new ui.
| | | * | | | | | | | Use background gas price estimation method in new ui.Dan2018-06-291-0/+1
| | | | |_|/ / / / / | | | |/| | | | | |
| * | | | | | | | | fix detection on submit passwordEsteban MIno2018-07-211-3/+2
| | | | | | | | | |
| * | | | | | | | | keyring unlocked detect and unit testsEsteban MIno2018-07-201-7/+9
| | | | | | | | | |
| * | | | | | | | | detect tokens through infuraEsteban MIno2018-07-131-1/+1
| | | | | | | | | |
| * | | | | | | | | improve testsEsteban MIno2018-07-121-1/+1
| | | | | | | | | |
| * | | | | | | | | Merge branch 'develop' into detectTokenFeatureEsteban MIno2018-07-041-3/+2
| |\| | | | | | | |
| | * | | | | | | | eslint --fix .brunobar792018-07-031-3/+2
| | |/ / / / / / /
| * | | | | | | | network store to detect tokenEsteban MIno2018-06-281-1/+1
| | | | | | | | |
| * | | | | | | | detect tokens pollingEsteban MIno2018-06-281-0/+8
| |/ / / / / / /
* | | | | | | | Get popup appearing when suggesting new tokenDan Finlay2018-06-191-0/+1
| | | | | | | |
* | | | | | | | Begin adding eth_watchTokenDan Finlay2018-06-191-0/+1
|/ / / / / / /
* | | | | | | Merge pull request #4571 from MetaMask/disable-diagnosticsDan Finlay2018-06-151-8/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | diagnostics - temporarily disable
| * | | | | | | diagnostics - temporarily disablekumavis2018-06-141-8/+0
| | |/ / / / / | |/| | | | |
* / | | | | | notices - replace getLatestNotice with getNextNoticekumavis2018-06-141-3/+0
|/ / / / / /
* / / / / / metamask - ensure all nonce locks are releasedkumavis2018-06-131-12/+8
|/ / / / /
* | | | | Merge pull request #4523 from MetaMask/i4462-FixResetBugDan Finlay2018-06-081-4/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | Fix bug where reset account would not work.
| * | | | Fix bug where reset account would not work.Dan Finlay2018-06-071-4/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-06-071-1/+14
|\| | |
| * | | diagnostics - fix reportMultipleKeyrings callkumavis2018-06-061-1/+1
| | | |
| * | | diagnostics - minor fixeskumavis2018-06-061-2/+2
| | | |
| * | | diagnostics - rewrite bug-notifier as diagnostics-reporterkumavis2018-06-061-29/+9
| | | |
| * | | add multivault detection to diagnostics reportingkumavis2018-06-061-0/+33
| | | |
* | | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-06-051-1/+24
|\| | |
| * | | Add first time info to bug reportDan Finlay2018-06-051-0/+1
| | | |
| * | | Add identity synchronizing codeDan Finlay2018-06-051-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | metamask-controller - clear account labels on restore from seed phrasekumavis2018-06-041-0/+4
| | | |
| * | | metamask - update preferences controller identities on keyring controller updatekumavis2018-06-041-0/+2
| | | |
* | | | Merge branch 'i3725-refactor-send-component-' into ↵Dan2018-06-011-17/+18
|\| | | | | | | | | | | | | | | i3914-fix-newui-send-gas-estimation
| * | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵kumavis2018-05-301-7/+8
| |\ \ \ | | | | | | | | | | | | | | | merge-master
| | * | | cleanErrorStack moved to separate library moduleAnton2018-05-291-7/+8
| | | | | | | | | | | | | | | | | | | | more errors traces cleaned up
| * | | | metamask-controller - lint fixkumavis2018-05-291-1/+1
| | | | |
| * | | | metamask-controller - update preferences controller addresses after import ↵kumavis2018-05-291-10/+10
| | |_|/ | |/| | | | | | | | | | account
* / | | Auto update gas estimate when to changes.Dan2018-05-311-0/+14
|/ / /
* | | Reveal get filtered tx list (#4332)Frankie2018-05-221-1/+1
| | | | | | | | | | | | | | | | | | * add getFilteredTxList from txController to getApi * transactions - remove dead code (isNonceTaken)
* | | Add PreferencesController#setAddresses to update idsWhymarrh Whitby2018-05-171-8/+12
| | |
* | | Update AddressBookController to read from preferences storeWhymarrh Whitby2018-05-171-1/+2
| | |
* | | Move setAccountLabel into PreferencesControllerWhymarrh Whitby2018-05-171-1/+1
| |/ |/|
* | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-05-171-0/+1
|\ \ | | | | | | | | | network-controller-remove-setNetworkEndpoints
| * | transactions - add a nonce check utility for ui usefrankiebee2018-05-021-0/+1
| |/
* / network - remove setNetworkEndpointskumavis2018-05-011-1/+0
|/
* Merge pull request #4059 from MetaMask/i-4033-seed-wordskumavis2018-05-011-2/+0
|\ | | | | Use new design for Reveal Seed screen. Persist seed words only in the first time flow.
| * Revert "Fix UI getting stuck in Reveal Seed screen"Alexander Tseung2018-04-221-2/+0
| | | | | | | | This reverts commit 2c8156ebe91941309d49e8f8f1ed8e9d740bb9de.
* | Linted docsDan Finlay2018-04-241-1/+1
| |
* | Linted jsdocsDan Finlay2018-04-211-52/+60
| |
* | Added docs to MM-controllerDan Finlay2018-04-191-130/+321
|/
* Fix UI getting stuck in Reveal Seed screenAlexander Tseung2018-04-191-0/+2
|
* Merge branch 'master' into i3981-contract-ratesDan Finlay2018-04-171-0/+1
|\
| * Require loglevel singleton in each module that uses itbitpshr2018-04-141-0/+1
| |
* | Disable token price polling when no client is activebitpshr2018-04-171-0/+9
| |
* | Maintain token prices using a background servicebitpshr2018-04-161-0/+7
|/
* Add ComposableObservableStore for subscription managementbitpshr2018-04-131-70/+36
|
* transactions - put the origing on the txMeta to help with debuggingfrankiebee2018-03-311-2/+5
|
* Merge pull request #3760 from MetaMask/i3439-ResetCacheOnAccountResetkumavis2018-03-281-34/+39
|\ | | | | Fix bug where resetAccount does not clear network cache
| * metamask-controller - fix typokumavis2018-03-281-1/+1
| |
| * Fix bug where resetAccount does not clear network cacheDan Finlay2018-03-281-34/+39
| | | | | | | | Fixes #3439
* | Undo unnecessary line removals.Dan2018-03-271-0/+1
| |
* | Use extension api to get initial locale.Dan2018-03-221-1/+1
| |
* | Merge branch 'master' into i18n-translator-reduxDan2018-03-221-245/+354
|\|
| * moves setup-related code towads end of file, re #3568Lazaridis2018-03-171-115/+124
| |
| * add ESLint exceptions for //= and //-, re #3568Lazaridis2018-03-161-3/+3
| |
| * group all vault/keyring related methods together, re #3568Lazaridis2018-03-161-128/+130
| |
| * adds initial documentation, re #3568Lazaridis2018-03-161-40/+138
| |
* | Handle i18n with redux.Dan2018-03-161-0/+10
|/
* modify verifySeedPhrase to async and call it from addNewAccount alsoCsaba Solya2018-03-061-32/+34
|
* add documentationCsaba Solya2018-03-041-0/+4
|
* verify seedwords on log inCsaba Solya2018-03-041-3/+16
|
* fix lint issuesCsaba Solya2018-03-031-2/+2
|
* seed phrase verifierCsaba Solya2018-03-031-2/+18
|
* Merge branch 'master' into uat-masterDan Finlay2018-02-221-1/+1
|\
| * use the providers initial _blocktracker. fixes #2393Lazaridis2018-02-111-1/+1
| |
* | Merge branch 'uat' into uat-nextDan2018-02-081-9/+12
|\ \
| * | Merge branch 'master' into uatDan2018-02-081-9/+12
| |\|
| | * Merge branch 'master' into localStorage-clean-upFrankie2018-02-011-0/+8
| | |\
| | | * wipe only transactions for current accountBruno Barbieri2018-01-311-4/+4
| | | |
| | | * added reset account featureBruno Barbieri2018-01-311-0/+8
| | | |
| | * | remove RecentBlocks from diskfrankiebee2018-02-011-3/+1
| | | |
| | * | remove BlacklistController from disk statefrankiebee2018-01-311-6/+1
| | |/
| | * Bump limit for event emitter warning.Kevin Serrano2018-01-261-0/+2
| | |
* | | [NewUI] Opens to full screen when restoring from seed. (#3201)Dan J Miller2018-02-081-0/+15
|/ / | | | | | | | | | | * Opens to full screen when restoring from seed. * Remove redundant parameter in actions.markPasswordForgotten call.
* | Merge branch 'uat' into uat-master-011618Alexander Tseung2018-01-171-0/+14
|\ \ | |/ |/|
| * Track usage of old and new UI (#2794)Alexander Tseung2017-12-231-0/+1
| | | | | | [NewUI] Track usage of old and new UI
| * Merge branch 'NewUI-flat' into merge-master-to-newUI-flat-dec20Chi Kei Chan2017-12-211-0/+1
| |\
| | * Adds updateTransaction to background and used it to update after editing in ↵Dan2017-12-211-1/+1
| | | | | | | | | | | | send-v2.
| | * Canceled, edited transactions show edited amount.Dan2017-12-211-0/+1
| | |
| * | Merge branch 'master' into NewUI-flatDan2017-12-211-14/+34
| |\ \ | | |/ | |/|
| * | Merge branch 'NewUI-flat' into MM-333-auto-add-users-to-new-UIChi Kei Chan2017-12-081-5/+42
| |\ \
| | * | Merge branch 'master' into NewUI-flat-merge-with-masterDan2017-12-071-5/+42
| | | |
| * | | Add UI selectionDan2017-12-051-0/+1
| |/ /
| * | more eslint fixesJason Clark2017-11-261-1/+1
| | |