Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | feature: integrate gaba/CurrencyRateController (#6570) | Paul Bouchon | 2019-06-01 | 2 | -206/+1 |
| | |||||
* | transactions/deps - use broken out nonce-tracker module (#6555) | Frankie | 2019-05-21 | 2 | -162/+1 |
| | |||||
* | bugfix: show extension window if locked regardless of approval | bitpshr | 2019-05-16 | 1 | -1/+2 |
| | |||||
* | drop transactions who's nonce is lower then the known network nonce but were ↵ | Frankie | 2019-05-16 | 2 | -8/+46 |
| | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | feature: integrate gaba/ShapeShiftController (#6569) | Paul Bouchon | 2019-05-15 | 1 | -180/+0 |
| | |||||
* | Set a default value for code in _determineTransactionCategory (#6604) | Dan J Miller | 2019-05-15 | 2 | -13/+13 |
| | | | | | | | | | | * 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 | ||||
* | Update auto-logout to recognize idle time in background (#6593) | Whymarrh Whitby | 2019-05-14 | 1 | -0/+73 |
| | | | | | | * Fix wording of autoLogoutTimeLimitDescription * AppStateController and update auto-logout functionality | ||||
* | Merge pull request #6568 from MetaMask/feature/gaba-phishing-controller | Thomas Huang | 2019-05-11 | 1 | -136/+0 |
|\ | | | | | feature: integrate gaba/PhishingController | ||||
| * | feature: integrate gaba/PhishingController | bitpshr | 2019-05-09 | 1 | -136/+0 |
| | | |||||
* | | New settings custom rpc form (#6490) | Dan J Miller | 2019-05-10 | 2 | -17/+18 |
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 Whitby | 2019-05-09 | 4 | -7/+7 |
| | | | | | | | | | | * 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 | ||||
* | Adds a transactionCategory to txMeta for use in UI (#6567) | Dan J Miller | 2019-05-09 | 2 | -7/+59 |
| | | | | | | * Adds a transactionCategory to txMeta for use in UI * Update transaction controller and tx-gas-util documentation on new code param in multiple functions. | ||||
* | Refactor ProviderApprovalController to use rpc and publicConfigStore (#6410) | kumavis | 2019-05-04 | 6 | -115/+54 |
| | | | | | | | | | | * 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 | ||||
* | Include token checksum address in prices lookup for token rates (#6526) | Thomas Huang | 2019-05-01 | 1 | -1/+3 |
| | |||||
* | Send metrics event from backend for on chain transaction failures (#6500) | Dan J Miller | 2019-04-29 | 1 | -0/+8 |
| | | | | | | * Send metrics event from backend for on chain transaction failures * Passes state object to backEndMetaMetricsEvent, and adds getMetaMetricState selector | ||||
* | feature: add Goerli support (#6459) | Paul Bouchon | 2019-04-18 | 5 | -2/+19 |
| | |||||
* | Merge pull request #6444 from MetaMask/localhost-network-dropdown | Thomas Huang | 2019-04-17 | 1 | -2/+2 |
|\ | | | | | Fixes #6321 & #6421 - Add Localhost 8545 for network dropdown names | ||||
| * | Set rpcTarget, nickname, and ticker when selecting one of the default networks | Thomas Huang | 2019-04-17 | 1 | -2/+2 |
| | | |||||
* | | feature: switch token pricing to CoinGecko API (#6424) | Paul Bouchon | 2019-04-11 | 1 | -8/+8 |
|/ | |||||
* | Merge pull request #6406 from MetaMask/remove-user-actions-controller | Jenny Pollack | 2019-04-05 | 1 | -17/+0 |
|\ | | | | | remove user actions controller | ||||
| * | remove user actions controller | Jenny Pollack | 2019-03-26 | 1 | -17/+0 |
| | | |||||
* | | Default to localhost network when running e2e tests | Dan Miller | 2019-03-29 | 1 | -2/+10 |
| | | |||||
* | | enable privacy mode for first time users (#6347) | Thomas Huang | 2019-03-26 | 1 | -1/+3 |
|/ | |||||
* | Folder restructure (#6304) | Chi Kei Chan | 2019-03-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
* | GABA: Integrate AddressBookController (#5847) | Paul Bouchon | 2019-03-12 | 1 | -98/+0 |
| | | | | | | * gaba: integrate AddressBookController * pin gaba version and update lockfile | ||||
* | Metametrics (#6171) | Dan J Miller | 2019-03-05 | 1 | -1/+43 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 Finlay | 2019-02-26 | 1 | -1/+12 |
| | |||||
* | account tracker - update accounts from balanceChecker contract (#6181) | Jenny Pollack | 2019-02-21 | 1 | -0/+11 |
| | | | | | | * account tracker - update accounts from balanceChecker contract * fall back to getBalance if the contract query fails | ||||
* | EIP-1193: standard provider API (#6170) | Paul Bouchon | 2019-02-20 | 5 | -13/+33 |
| | | | | | | | | | | | | | | | | * EIP-1193: Implement new provider API * EIP-1193: Updated implementation * Remove test file * Fix tests * Update ping check * Update logic * PR feedback | ||||
* | fix typo | frankiebee | 2019-02-13 | 1 | -4/+4 |
| | |||||
* | recent-blocks - dont listen for block when on infura providers | frankiebee | 2019-02-12 | 2 | -4/+29 |
| | |||||
* | Add announcement for users migrated to the new UI | Whymarrh Whitby | 2019-02-05 | 1 | -1/+1 |
| | |||||
* | Remove betaUI preference state, replace with completedUiMigration | Whymarrh Whitby | 2019-02-05 | 1 | -4/+10 |
| | |||||
* | Privacy mode fixes (#6087) | Bruno Barbieri | 2019-02-02 | 1 | -13/+15 |
| | | | | | | | | | | * Version 5.3.4 RC1 * fix old ui approval screen * fix error caused by meshtesting iframe * fix linter errors | ||||
* | EIP-1102 updates (#6006) | Paul Bouchon | 2019-01-31 | 1 | -22/+24 |
| | | | | | | * Update privacy notice * Respond to 1102 messages using tab ID | ||||
* | I#5956 fix2 dont overwrite existing rpc settings (#6044) | Frankie | 2019-01-30 | 1 | -0/+26 |
| | | | | | | | | | | | | | | * 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 | ||||
* | add source for header in create infura client (#6023) | Jenny Pollack | 2019-01-25 | 1 | -1/+1 |
| | | | | | | * add source for header in create infura client * bump eth-json-rpc-infura | ||||
* | Refactor first time flow, remove seed phrase from state (#5994) | Alexander Tseung | 2019-01-23 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | * 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 | ||||
* | fix asset detection (#6049) | Bruno Barbieri | 2019-01-23 | 1 | -2/+18 |
| | |||||
* | Use Parity on-chain registry only when is needed (#6052) | Esteban Miño | 2019-01-23 | 1 | -0/+14 |
| | | | | | | * add and use knownMethodData to avoid infura requests * dataMethod to methodData and check empty response | ||||
* | I#5956 fix 1 (#6026) | Frankie | 2019-01-18 | 1 | -1/+5 |
| | | | | | * prevent invalid chainId's when adding cusstom rpcs * migration 30 removes invalid chaids from preferences and networkController for custom rpcs | ||||
* | Set auto conversion off for token/eth conversion (#6005) | Thomas Huang | 2019-01-11 | 1 | -1/+1 |
| | |||||
* | Disallow loading as metamaskNetworkId (#5924) | Frankie | 2018-12-14 | 1 | -1/+3 |
| | | | | | | * transactions - throw an error if a transaction is generated while the network is loading * add tests for failing when netId is loading | ||||
* | Group transactions by nonce (#5886) | Alexander Tseung | 2018-12-10 | 2 | -2/+6 |
| | |||||
* | Fix race condition in network controller lookup() method. | Dan Miller | 2018-12-07 | 1 | -4/+10 |
| | |||||
* | Adds createSpeedUpTransaction to txController | Dan Miller | 2018-12-04 | 1 | -0/+23 |
| | |||||
* | Save recent network balances in local storage (#5843) | Dan J Miller | 2018-12-01 | 1 | -0/+83 |
| | | | | | | | | | | | | * 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> | ||||
* | bugfix: normalize contract addresss when fetching exchange rates (#5863) | Paul Bouchon | 2018-12-01 | 1 | -1/+3 |
| | |||||
* | Fixed Vivek's bug (#5860) | Dan Finlay | 2018-11-30 | 1 | -2/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
* | transactions/tx-gas-utils - add the acctual response for eth_getCode for ↵ | Frankie | 2018-11-30 | 1 | -0/+9 |
| | | | | NO_CONTRACT_ERROR's && add a debug object to simulationFailed (#5840) | ||||
* | Autofill gasPrice for retry attempts with either the recommended gasprice or ↵ | Frankie | 2018-11-27 | 1 | -0/+9 |
| | | | | | | | | a %10 bump (#5786) * transactions - autofill gasPrice for retry attempts with either the recomened gasprice or a %10 bump * lint | ||||
* | transactions - ensure err is defined when setting tx failed (#5801) | Frankie | 2018-11-27 | 1 | -4/+6 |
| | |||||
* | Use initState to avoid type-checking providerRequests in state | Whymarrh Whitby | 2018-11-26 | 1 | -3/+5 |
| | |||||
* | Don't announce new UI to users switching back | Whymarrh Whitby | 2018-11-21 | 1 | -0/+1 |
| | |||||
* | Default to the new UI for first time users | Whymarrh Whitby | 2018-11-21 | 1 | -1/+3 |
| | |||||
* | ESLint fixes (#5775) | Whymarrh Whitby | 2018-11-17 | 2 | -2/+2 |
| | | | | | | * eslint . --fix * Upgrade all ESLint warnings to errors | ||||
* | Tx controller now uses safe event emitter (#5769) | Frankie | 2018-11-17 | 3 | -3/+3 |
| | | | | | | | | | | | | * 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 | ||||
* | Resubmit approved transactions on new block (#5752) | Dan Finlay | 2018-11-15 | 3 | -2/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
* | Update Balanc3 API (#5744) | Paul Bouchon | 2018-11-14 | 1 | -23/+15 |
| | | | | | | * Update balanc3 API used in TokenRatesController * Remove demo URL and use nativeCurrency when fetching token rates | ||||
* | EIP-1102: Update publicConfig store concurrently with approval | Paul Bouchon | 2018-11-10 | 1 | -2/+8 |
| | |||||
* | Fix lint errors | bitpshr | 2018-11-07 | 1 | -1/+1 |
| | |||||
* | Clear cached approval after rejection | bitpshr | 2018-11-07 | 1 | -6/+9 |
| | |||||
* | Add experimental RPC method support | bitpshr | 2018-11-06 | 1 | -4/+4 |
| | |||||
* | Update Connect Request screen design (#5644) | Whymarrh Whitby | 2018-11-06 | 1 | -18/+22 |
| | | | | | | | | | | * 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 | ||||
* | Do not modify isApproved when locked | bitpshr | 2018-11-06 | 1 | -2/+1 |
| | |||||
* | Mark origins as unapproved if user explicitly locks MetaMask | bitpshr | 2018-11-06 | 1 | -2/+4 |
| | |||||
* | Enable caching | Paul Bouchon | 2018-11-06 | 1 | -1/+1 |
| | |||||
* | Disable approval caching | bitpshr | 2018-11-06 | 1 | -3/+17 |
| | |||||
* | Differentiate locked and enabled | bitpshr | 2018-11-06 | 1 | -10/+1 |
| | |||||
* | Code bath | bitpshr | 2018-11-06 | 1 | -17/+27 |
| | |||||
* | Handle logout gracefully | bitpshr | 2018-11-06 | 1 | -10/+15 |
| | |||||
* | Fix lint issues | bitpshr | 2018-11-06 | 1 | -1/+3 |
| | |||||
* | Add isUnlocked provider hook | bitpshr | 2018-11-06 | 1 | -1/+9 |
| | |||||
* | EIP-1102: add user privacy option | bitpshr | 2018-11-06 | 1 | -21/+20 |
| | |||||
* | EIP-1102: add isEnabled convenience method to provider | bitpshr | 2018-11-06 | 1 | -1/+19 |
| | |||||
* | EIP-1102: Add option to force-enable provider | bitpshr | 2018-11-06 | 1 | -3/+16 |
| | |||||
* | EIP-1102: updated implementation | bitpshr | 2018-11-06 | 2 | -2/+86 |
| | |||||
* | network - infura - hardcode net_version and eth_chainId (#5670) | kumavis | 2018-11-06 | 1 | -0/+33 |
| | | | | | | * network - infura - hardcode net_version and eth_chainId * network - infura - add rinkeby handling * lint fix | ||||
* | Update watchAsset ERC20 validation (#5653) | Esteban Miño | 2018-11-06 | 1 | -2/+2 |
| | | | | | | * update ERC20 token valodation for watchAsset * update ERC20 validation test descriptions | ||||
* | Merge pull request #5659 from MetaMask/token-rates-bugfix | kumavis | 2018-11-04 | 1 | -4/+7 |
|\ | | | | | token-rates - protect against bad token data | ||||
| * | token-rates - protect against bad token data | kumavis | 2018-11-03 | 1 | -4/+7 |
| | | |||||
* | | Revert "support eth_chainId" | Thomas Huang | 2018-11-04 | 1 | -14/+4 |
|/ | |||||
* | Merge pull request #5560 from MetaMask/sentry-enhancements2 | kumavis | 2018-10-30 | 2 | -6/+49 |
|\ | | | | | Sentry - various enhancements to help debugging (alternate) | ||||
| * | Merge branch 'sentry-enhancements2' of ↵ | kumavis | 2018-10-30 | 1 | -2/+3 |
| |\ | | | | | | | | | | github.com:MetaMask/metamask-extension into sentry-enhancements2 | ||||
| | * | Merge branch 'develop' into sentry-enhancements2 | kumavis | 2018-10-30 | 3 | -32/+132 |
| | |\ | |||||
| * | \ | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-10-30 | 4 | -31/+138 |
| |\ \ \ | | |/ / | |/| | | | | | | sentry-enhancements2 | ||||
| * | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-10-21 | 1 | -26/+25 |
| |\ \ \ | | | | | | | | | | | | | | | | sentry-enhancements2 | ||||
| * | | | | blacklist + currency - report error via log instead of throw | kumavis | 2018-10-19 | 2 | -5/+12 |
| | | | | | |||||
| * | | | | lint fix | kumavis | 2018-10-19 | 2 | -3/+1 |
| | | | | | |||||
| * | | | | currency - throw errors on failure | kumavis | 2018-10-19 | 1 | -3/+17 |
| | | | | | |||||
| * | | | | blacklist - throw errors on request/parse failure | kumavis | 2018-10-19 | 1 | -4/+19 |
| | | | | | |||||
* | | | | | Merge pull request #5567 from MetaMask/HowardBraham-develop | kumavis | 2018-10-30 | 1 | -9/+26 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Feature: Warn when attempting to send tx with data to non-contract | ||||
| * | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-10-26 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | HowardBraham-develop | ||||
| * | | | | | tx-gas-util - set error message when invalidating tx based on tx data but no ↵ | kumavis | 2018-10-21 | 1 | -4/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | contract code | ||||
| * | | | | | Merge branch 'develop' into develop | kumavis | 2018-10-21 | 3 | -27/+98 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| * | | | | | tx-gas-utils - improve format + comments | kumavis | 2018-10-10 | 1 | -12/+18 |
| | | | | | | |||||
| * | | | | | ganache-core merged my PR, so I changed some comments to clarify that ↵ | Howard Braham | 2018-10-10 | 1 | -5/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | ganache-core v2.2.1 and below will return the non-standard '0x0' | ||||
| * | | | | | Bug Fix: #1789 and #4525 eth.getCode() with no contract | Howard Braham | 2018-10-10 | 1 | -7/+16 |
| | | | | | | |||||
* | | | | | | Merge pull request #5596 from MetaMask/validateSignTypedData | kumavis | 2018-10-30 | 1 | -0/+2 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Validate signTypedData signer/address in eth-json-rpc-middleware | ||||
| * | | | | | Validate signTypedData in eth-json-rpc-middleware | Thomas | 2018-10-25 | 1 | -0/+2 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #5552 from EthersocialNetwork/eth_chainid | kumavis | 2018-10-30 | 1 | -4/+14 |
|\ \ \ \ \ | | | | | | | | | | | | | network - check eth_chainId and fallback to net_version | ||||
| * \ \ \ \ | Merge branch 'develop' into eth_chainid | hackyminer | 2018-10-26 | 3 | -49/+135 |
| |\ \ \ \ \ | |||||
| * | | | | | | Update network.js | kumavis | 2018-10-21 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | network - improve logging and type conversion | kumavis | 2018-10-21 | 1 | -4/+6 |
| | | | | | | | |||||
| * | | | | | | support both eth_chainId and net_version | hackyminer | 2018-10-20 | 1 | -4/+11 |
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | get the real chainId using eth_chainId and use net_version as a fallback | ||||
* | | | | | | preferences - fix typo | kumavis | 2018-10-30 | 1 | -1/+1 |
| |/ / / / |/| | | | | |||||
* | | | | | Add support for RPC endpoints with custom chain IDs (#5134) | HackyMiner | 2018-10-26 | 3 | -28/+115 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #5555 from MetaMask/support-wallet-watch-asset | kumavis | 2018-10-21 | 1 | -1/+1 |
|\ \ \ \ | |_|_|/ |/| | | | Support for prefix wallet_watchAsset | ||||
| * | | | add support for wallet_watchAsset | Esteban MIno | 2018-10-20 | 1 | -1/+1 |
| |/ / | |||||
* / / | specific add and remove methods for frequentRpcList (#5554) | Esteban Miño | 2018-10-20 | 1 | -26/+25 |
|/ / | |||||
* | | Adds toggle for primary currency (#5421) | Alexander Tseung | 2018-10-17 | 1 | -0/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
* | | Add txReceipt data to transaction details (#5513) | Alexander Tseung | 2018-10-16 | 2 | -1/+39 |
| | | |||||
* | | Ensure that new transactions added are using the selected address | Whymarrh Whitby | 2018-10-11 | 1 | -0/+4 |
| | | |||||
* | | Revert "transactions - add txReceipt to the txMeta body for confirmed txs ↵ | Whymarrh Whitby | 2018-10-11 | 1 | -23/+1 |
| | | | | | | | | | | | | (#5375)" This reverts commit ff67293a8ef61308d602d09f26b163b9b9ec90d3. | ||||
* | | transactions - add txReceipt to the txMeta body for confirmed txs (#5375) | Frankie | 2018-10-10 | 1 | -1/+23 |
|/ | |||||
* | Merge pull request #5458 from MetaMask/provider-subs | Bruno Barbieri | 2018-10-10 | 3 | -8/+10 |
|\ | | | | | Feature: Subscription support | ||||
| * | provider - network - restore block-ref-rewrite middleware references | kumavis | 2018-10-09 | 2 | -4/+4 |
| | | |||||
| * | provider - enable subscription support (newHeads, logs) | kumavis | 2018-10-08 | 1 | -4/+6 |
| | | |||||
* | | Fix updating of pending transactions | Dan Finlay | 2018-10-06 | 1 | -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 | ||||
* | Add ability to whitelist a blacklisted domain at runtime | Whymarrh Whitby | 2018-10-02 | 1 | -0/+22 |
| | |||||
* | support editable customRPC (#5267) | HackyMiner | 2018-09-29 | 1 | -7/+6 |
| | | | | | | * support editable customRPC #5246 * remove rpcList size restriction | ||||
* | Merge pull request #5282 from MetaMask/tx-cancel-ui | Alexander Tseung | 2018-09-25 | 1 | -2/+3 |
|\ | | | | | Add Cancel Transaction feature. Refactor modals. Add Transaction Details modal. | ||||
| * | Switch existing modals from using Notification to Modal. Remove Notification ↵ | Alexander Tseung | 2018-09-20 | 1 | -2/+3 |
| | | | | | | | | component. Add CancelTransaction modal | ||||
* | | Adds getPendingNonce method to provider initialization options in ↵ | Dan Miller | 2018-09-22 | 1 | -1/+1 |
|/ | | | | metamask-controller. | ||||
* | Delete ConfigManager, replacing its usages with PreferencesController | Whymarrh Whitby | 2018-09-12 | 1 | -0/+18 |
| | |||||
* | Merge pull request #5216 from MetaMask/tx-cancel | Frankie | 2018-09-11 | 2 | -2/+59 |
|\ | | | | | Add createCancelTransaction method | ||||
| * | Add createCancelTransaction method | Alexander Tseung | 2018-09-11 | 2 | -2/+59 |
| | | |||||
* | | Attach the RPC error value to txMeta | Whymarrh Whitby | 2018-09-09 | 1 | -0/+1 |
|/ | |||||
* | fix conflicts | Esteban MIno | 2018-08-29 | 1 | -2/+2 |
|\ | |||||
| * | updated docs, small improvement of recent RPC rendering | Evgeniy Filatov | 2018-08-23 | 1 | -1/+1 |
| | | |||||
| * | implemented improvements to RPC history | Evgeniy Filatov | 2018-08-23 | 1 | -1/+1 |
| | | |||||
* | | watchAsset small changes | Esteban MIno | 2018-08-28 | 1 | -1/+1 |
| | | |||||
* | | typo watchAsset imageUrl to image | Esteban MIno | 2018-08-24 | 1 | -6/+6 |
| | | |||||
* | | Merge branch 'develop' into WatchTokenFeature | Esteban MIno | 2018-08-22 | 1 | -1/+1 |
|\| | |||||
| * | bugfix - prevents old blocktracker from getting internal hooks migrated | kumavis | 2018-08-22 | 1 | -1/+1 |
| | | |||||
* | | returning error in watchAsset | Esteban MIno | 2018-08-22 | 1 | -4/+12 |
| | | |||||
* | | refactor watchToken related functions | Esteban MIno | 2018-08-21 | 1 | -37/+36 |
| | | |||||
* | | watchAsset returns result wether token was added or not | Esteban MIno | 2018-08-21 | 1 | -7/+9 |
| | | |||||
* | | Merge branch 'develop' into WatchTokenFeature | Esteban MIno | 2018-08-21 | 12 | -188/+285 |
|\| | |||||
| * | Merge branch 'develop' into network-remove-provider-engine | Thomas | 2018-08-15 | 2 | -17/+79 |
| |\ | | | | | | | | | | Override package-lock and fix merge conflicts | ||||
| * \ | Merge branch 'network-remove-provider-engine' into ↵ | frankiebee | 2018-08-07 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | network-remove-provider-engine-tests | ||||
| | * | | network - fix blockTracker reference to return the blockTrackerProxy instead ↵ | frankiebee | 2018-08-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | of the direct blockTracker reference | ||||
| * | | | Merge branch 'develop' into network-remove-provider-engine-tests | Thomas Huang | 2018-08-02 | 1 | -7/+3 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'develop' into network-remove-provider-engine | Thomas | 2018-07-26 | 5 | -14/+162 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-07-04 | 5 | -7/+7 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | network-remove-provider-engine | ||||
| * \ \ \ \ | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-07-03 | 6 | -21/+36 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine | ||||
| * | | | | | | lint - fix lint for network | kumavis | 2018-06-13 | 3 | -3/+0 |
| | | | | | | | |||||
| * | | | | | | network - import createBlockTrackerInspectorMiddleware and rearrange cache ↵ | kumavis | 2018-06-13 | 3 | -37/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | middleware order | ||||
| * | | | | | | nonce-tracker - wrap nonce calculations in try-catch and release lock on error | kumavis | 2018-06-13 | 1 | -22/+28 |
| | | | | | | | |||||
| * | | | | | | lint - controllers - whitepace fix | kumavis | 2018-06-12 | 1 | -5/+5 |
| | | | | | | | |||||
| * | | | | | | network - provider - infura - use block-reemit middleware | kumavis | 2018-06-08 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-06-07 | 4 | -1/+44 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine | ||||
| * \ \ \ \ \ \ | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-06-07 | 4 | -13/+113 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine | ||||
| * | | | | | | | | controllers - transactions - fix tx status update on boot | kumavis | 2018-05-29 | 2 | -2/+13 |
| | | | | | | | | | |||||
| * | | | | | | | | controllers - transactions - fix tx confirmation | kumavis | 2018-05-29 | 2 | -3/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | controllers - transaction - pending-tx-tracker - lint fix | kumavis | 2018-05-29 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | controllers - transactions - merge @frankiebee's work with mine | kumavis | 2018-05-29 | 3 | -96/+55 |
| | | | | | | | | | |||||
| * | | | | | | | | controllers - transactions - pending-tx-tracker - _getBlock - poll until ↵ | kumavis | 2018-05-26 | 1 | -1/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | block is truthy | ||||
| * | | | | | | | | tx-gas-utils - query for block without tx bodies | kumavis | 2018-05-26 | 1 | -2/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | controllers - recent-blocks - guard against empty block | kumavis | 2018-05-25 | 1 | -3/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | controllers - recent-blocks - wrap block-tracker event in try-catch | kumavis | 2018-05-24 | 1 | -1/+7 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'network-remove-provider-engine' of ↵ | kumavis | 2018-05-24 | 2 | -9/+24 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:MetaMask/metamask-extension into network-remove-provider-engine | ||||
| | * \ \ \ \ \ \ \ | Merge pull request #4347 from MetaMask/transactions-use-new-block-tracker | kumavis | 2018-05-24 | 2 | -9/+24 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Transactions use new block tracker | ||||
| | | * \ \ \ \ \ \ \ | Merge branch 'network-remove-provider-engine' of ↵ | frankiebee | 2018-05-23 | 4 | -53/+41 |
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/MetaMask/metamask-extension into transactions-use-new-block-tracker | ||||
| | | * | | | | | | | | | transactions - update pending-tx-tracker to use the new block tracker | frankiebee | 2018-05-23 | 1 | -7/+18 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | remove dependance on the even tx:confirmed | frankiebee | 2018-05-23 | 1 | -2/+6 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | controllers - recent-blocks - ensure full blocks | kumavis | 2018-05-24 | 1 | -2/+2 |
| |/ / / / / / / / / / | |||||
| * | / / / / / / / / | controllers - recent-blocks - doc update | kumavis | 2018-05-24 | 1 | -4/+4 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-05-23 | 1 | -15/+7 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine | ||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-05-23 | 3 | -38/+34 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine | ||||
| * | | | | | | | | | | recent-blocks - fix backfill blockNumber tracking | kumavis | 2018-05-17 | 1 | -3/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | controllers - recent-blocks - fix pifyd setTimeout args | kumavis | 2018-05-17 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | deps - fix incorrect dep paths and versions | kumavis | 2018-05-17 | 4 | -4/+4 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | controllers - balance - update for eth-block-tracker@4 | kumavis | 2018-05-17 | 1 | -3/+3 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | recent-blocks - update for eth-block-tracker@4 | kumavis | 2018-05-17 | 1 | -27/+14 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | remove unused events-proxy, was replaced with module swappable-obj-proxy | kumavis | 2018-05-17 | 1 | -1/+0 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | lint fix | kumavis | 2018-05-17 | 5 | -13/+18 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | network - create provider and block-tracker via json-rpc-engine | kumavis | 2018-05-17 | 7 | -67/+213 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | delete according image when token added with watchToken deleted | Esteban MIno | 2018-08-17 | 1 | -13/+14 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | correct behavior when notification is closed when popup | Esteban MIno | 2018-08-17 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | show watch asset image from hide token modal | Esteban MIno | 2018-08-16 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | change watchAsset to new spec for type ERC20 | Esteban MIno | 2018-08-16 | 1 | -15/+27 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | add suggested tokens objects in metamask state | Esteban MIno | 2018-08-16 | 1 | -6/+16 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | watchToken to watchAsset | Esteban MIno | 2018-08-15 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | add support for images base64 and urls on new ui | Esteban MIno | 2018-08-15 | 1 | -6/+7 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | update method to metamask_watchToken | Esteban MIno | 2018-08-15 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | refactor unused code | Esteban MIno | 2018-08-08 | 1 | -2/+4 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | fix merge | Esteban MIno | 2018-08-08 | 1 | -0/+1 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'develop' into WatchTokenFeature | Esteban Miño | 2018-08-08 | 2 | -17/+79 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
| * | | | | | | | | | | fix doc tag | Esteban MIno | 2018-08-01 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | tokens related functions refactor | Esteban MIno | 2018-08-01 | 1 | -15/+22 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | fix undefined for tokens on tests | Esteban MIno | 2018-08-01 | 1 | -1/+3 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | fix double state update when account changed | Esteban MIno | 2018-07-31 | 1 | -5/+3 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | create tokens storage when setadresses | Esteban MIno | 2018-07-31 | 1 | -2/+4 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | isolation of tokens related methods in preferences | Esteban MIno | 2018-07-31 | 1 | -43/+42 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'develop' into TokensPerAccountBasis | Esteban Miño | 2018-07-28 | 1 | -7/+3 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |||||
| * | | | | | | | | | | refactor to accountTokens | Esteban MIno | 2018-07-28 | 1 | -53/+47 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | add & delete tokens per network | Esteban MIno | 2018-07-27 | 1 | -10/+8 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | tokens per network for individual account | Esteban MIno | 2018-07-27 | 1 | -15/+51 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | preferences test fixes for tokens per account | Esteban MIno | 2018-07-26 | 1 | -9/+16 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | add & delete tokens per account | Esteban MIno | 2018-07-26 | 2 | -8/+27 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
* | | | | | | | | | | add suggested token params validation | Esteban MIno | 2018-08-07 | 1 | -4/+25 |
| | | | | | | | | | | |||||
* | | | | | | | | | | eth_watchToken working | Esteban MIno | 2018-08-04 | 1 | -0/+7 |
| | | | | | | | | | | |||||
* | | | | | | | | | | rpc-engine not crashing when eth_watchToken | Esteban MIno | 2018-08-04 | 1 | -5/+4 |
| | | | | | | | | | | |||||
* | | | | | | | | | | merge develop | Esteban MIno | 2018-08-04 | 12 | -35/+182 |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #4871 from MetaMask/3519-new-contract-gas | Frankie | 2018-07-26 | 1 | -7/+3 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | tx-gas-utils - catch all errors from gas estimation | ||||
| | * | | | | | | | | tx-gas-utils - catch all errors from gas estimation | Jenny Pollack | 2018-07-25 | 1 | -7/+3 |
| | | | | | | | | | | |||||
| * | | | | | | | | | network.js: convert rpc protocol to lower case (#4855) | pinkiebell | 2018-07-25 | 1 | -0/+3 |
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | Fixes #4253 | ||||
| * | | | | | | | | run linter | brunobar79 | 2018-07-22 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'develop' into detectTokenFeature | Esteban Miño | 2018-07-21 | 5 | -15/+37 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Auto-detect tokens #3034 (#4683) | Esteban Miño | 2018-07-21 | 1 | -0/+123 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| | * | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | brunobar79 | 2018-07-14 | 1 | -13/+0 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initial-trezor-support | ||||
| | | * \ \ \ \ \ \ \ | Merge pull request #4669 from MetaMask/removeNonceTrackerFunction | Thomas Huang | 2018-07-13 | 1 | -13/+0 |
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Remove unsued nonce tracker function | ||||
| | | | * \ \ \ \ \ \ \ | Merge branch 'develop' into removeNonceTrackerFunction | Thomas | 2018-07-11 | 8 | -14/+14 |
| | | | |\ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|/ | | | | | |/| | | | | | | |||||
| | | | * | | | | | | | | Remove unsued nonce tracker function | tmashuang | 2018-06-26 | 1 | -13/+0 |
| | | | | |_|_|_|_|_|/ | | | | |/| | | | | | | |||||
| | * | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | brunobar79 | 2018-07-13 | 2 | -1/+8 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initial-trezor-support | ||||
| | | * | | | | | | | | Merge pull request #4691 from MetaMask/i4404-confirm-refactor | Alexander Tseung | 2018-07-12 | 1 | -1/+2 |
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Refactor and redesign confirm transaction views | ||||
| | | | * | | | | | | | | Various fixes from PR comments | Alexander Tseung | 2018-07-07 | 1 | -10/+12 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | Use eth-method-registry to get method data | Alexander Tseung | 2018-07-07 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | Display newest transaction | Alexander Tseung | 2018-07-07 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | Refactor and redesign confirm transaction views | Alexander Tseung | 2018-07-07 | 2 | -13/+12 |
| | | | | |/ / / / / / | | | | |/| | | | | | | |||||
| | | * | | | | | | | | Merge branch 'develop' of https://github.com/MetaMask/metamask-extension ↵ | frankiebee | 2018-07-11 | 8 | -14/+14 |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into i#3896 | ||||
| | | * | | | | | | | | trandsactions - remove rejected transactions from history | frankiebee | 2018-06-26 | 1 | -0/+6 |
| | | | |/ / / / / / | | | |/| | | | | | | |||||
| | * | | | | | | | | account removal is working | brunobar79 | 2018-07-11 | 1 | -0/+24 |
| | | |/ / / / / / | | |/| | | | | | | |||||
| * | | | | | | | | fix detection on submit password | Esteban MIno | 2018-07-21 | 1 | -5/+8 |
| | | | | | | | | | |||||
| * | | | | | | | | keyring unlocked detect and unit tests | Esteban MIno | 2018-07-20 | 1 | -12/+16 |
| | | | | | | | | | |||||
| * | | | | | | | | detect tokens when submit password and new account selected | Esteban MIno | 2018-07-20 | 1 | -13/+39 |
| | | | | | | | | | |||||
| * | | | | | | | | detect tokens through infura | Esteban MIno | 2018-07-13 | 1 | -21/+24 |
| | | | | | | | | | |||||
| * | | | | | | | | improve tests | Esteban MIno | 2018-07-12 | 1 | -16/+13 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'develop' into detectTokenFeature | Esteban MIno | 2018-07-04 | 8 | -14/+14 |
| |\| | | | | | | | |||||
| | * | | | | | | | eslint --fix . | brunobar79 | 2018-07-03 | 8 | -14/+14 |
| | |/ / / / / / | |||||
| * | | | | | | | passtest-lint | Esteban MIno | 2018-07-04 | 1 | -6/+0 |
| | | | | | | | | |||||
| * | | | | | | | tests for spec | Esteban MIno | 2018-06-28 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | network store to detect token | Esteban MIno | 2018-06-28 | 1 | -8/+10 |
| | | | | | | | | |||||
| * | | | | | | | detect tokens polling | Esteban MIno | 2018-06-28 | 1 | -0/+97 |
| |/ / / / / / | |||||
* | | | | | | | Improved rpc-engine usage | Dan Finlay | 2018-06-19 | 1 | -5/+1 |
| | | | | | | | |||||
* | | | | | | | Get popup appearing when suggesting new token | Dan Finlay | 2018-06-19 | 1 | -1/+3 |
| | | | | | | | |||||
* | | | | | | | Begin letting UI show suggested tokens | Dan Finlay | 2018-06-19 | 1 | -6/+24 |
| | | | | | | | |||||
* | | | | | | | Begin adding eth_watchToken | Dan Finlay | 2018-06-19 | 1 | -0/+25 |
|/ / / / / / | |||||
* | | | | | | lint - fix recipient-blacklist.js | kumavis | 2018-06-16 | 1 | -13/+13 |
| | | | | | | |||||
* | | | | | | blacklist - recipient blacklist as js for inline comments | kumavis | 2018-06-16 | 2 | -2/+2 |
| | | | | | | |||||
* | | | | | | Update recipient-blacklist-config.json | kumavis | 2018-06-16 | 1 | -0/+2 |
| | | | | | | |||||
* | | | | | | Add apparent phishing address to block list | Dan Finlay | 2018-06-15 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | | | | controllers - transaction - prefer log over console | kumavis | 2018-06-13 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | metamask - ensure all nonce locks are released | kumavis | 2018-06-13 | 3 | -5/+10 |
| | | | | | | |||||
* | | | | | | nonce-tracker - wrap nonce calculations in try-catch and release lock on error | kumavis | 2018-06-13 | 1 | -22/+28 |
| | | | | | | |||||
* | | | | | | Fix bug where reset account would not work. | Dan Finlay | 2018-06-07 | 1 | -2/+9 |
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 pull request #4414 from scsaba/recipient-blacklist | kumavis | 2018-06-07 | 3 | -1/+43 |
|\ \ \ \ \ | | | | | | | | | | | | | Disallow sending to ganache default accounts on main net | ||||
| * | | | | | remove generating blocked accounts and use a config file instead | Csaba Solya | 2018-05-31 | 3 | -18/+20 |
| | | | | | | |||||
| * | | | | | fix documentation | Csaba Solya | 2018-05-30 | 1 | -1/+1 |
| | | | | | |