| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Folder restructure (#6304) | Chi Kei Chan | 2019-03-22 | 129 | -9350/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| * | Enable mobile sync (#6332) | Bruno Barbieri | 2019-03-22 | 2 | -8/+1 |
| | | | | | | | | | * enable mobile sync * remove mobile sync as a preference * Fix typo | ||||
| * | Fixing spelling of Ethereum in MetaMetrics copy (#6329) | fixanoid | 2019-03-21 | 1 | -1/+1 |
| | | |||||
| * | Allow seed phrases with a trailing newline | Whymarrh Whitby | 2019-03-13 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #6281 from MetaMask/fix-browser-back-on-reveal-seed | Thomas Huang | 2019-03-13 | 1 | -2/+2 |
| |\ | | | | | Fixes the use of the browser back button on the reveal seed screen | ||||
| | * | Fixes the use of the browser back button on the reveal seed screen | Dan Miller | 2019-03-12 | 1 | -2/+2 |
| | | | |||||
| * | | ui - add missing PropTypes (#6287) | kumavis | 2019-03-12 | 1 | -0/+2 |
| |/ | |||||
| * | Metametrics fixes (#6238) | Dan J Miller | 2019-03-06 | 2 | -17/+17 |
| | | | | | | | | | | | | | * Improve opt-in opt-out event tracking after going 'back' in onboarding. * Fix 'Switched Networks' metrics event. * Fix custom variables ids (can only use ids 1-5) * Fix tracking of function type custom variable for metametrics in confirm-transaction-base * Add missing metametrics events | ||||
| * | Wrap in span | Thomas Huang | 2019-03-06 | 1 | -1/+1 |
| | | |||||
| * | Metametrics (#6171) | Dan J Miller | 2019-03-05 | 36 | -95/+903 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| * | First time flow updates (#6192) | Dan J Miller | 2019-02-27 | 33 | -339/+550 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Action select step of onboarding flow added. * Update navigation on create and import password screens. * Adds terms of service checkbox to create and import account screens. * Add security warning to jazzicon intro step * Update and streamline unique image to confirm seed steps of first time flow. * UI touch ups to welcome screen. * UI touch up on select action page * Fix first time import flow. * Add end of flow screen to first time flow * Replace unique image screen with updated fishing warning screen. * Update e2e tests for onboarding flow changes. * Add required translations to onboarding flow. * Update design of select action screen to emphasize create new wallet option. * Clean up onboarding flow code. * Remove notice related code from first-time-flow directory. * Use updater function argument in new-account.component | ||||
| * | Show/Hide Fiat on Testnets based on User Preference (#6153) | Chi Kei Chan | 2019-02-27 | 4 | -3/+47 |
| | | |||||
| * | Feature Flag + Mobile Sync (#5955) | Dan Finlay | 2019-02-26 | 3 | -1/+426 |
| | | |||||
| * | Merge pull request #6184 from chikeichan/6132 | Dan J Miller | 2019-02-20 | 2 | -1/+26 |
| |\ | | | | | turn camcelCase method name to space separated | ||||
| | * | turn camcelCase method name to space separated | Chi Kei Chan | 2019-02-19 | 2 | -1/+26 |
| | | | |||||
| * | | Merge pull request #6185 from chikeichan/5681 | Dan J Miller | 2019-02-20 | 1 | -5/+0 |
| |\ \ | | | | | | | Remove password check when importing Account JSON | ||||
| | * | | Remove password check when importing Account JSON | Chi Kei Chan | 2019-02-19 | 1 | -5/+0 |
| | |/ | |||||
| * / | Change "Token Address" to "Token Contract Address" (#6182) | Chi Kei Chan | 2019-02-20 | 1 | -1/+1 |
| |/ | |||||
| * | Checksum address before slicing it for the confirm screen (#6133) | Whymarrh Whitby | 2019-02-14 | 1 | -2/+6 |
| | | |||||
| * | Add button to force edit token symbol when adding custom token (#6147) | Chi Kei Chan | 2019-02-13 | 2 | -2/+38 |
| | | |||||
| * | Merge pull request #6139 from whymarrh/fix-confirm-advanced-gas | Whymarrh Whitby | 2019-02-12 | 1 | -1/+1 |
| |\ | | | | | Fix advanced gas controls on the confirm screen | ||||
| | * | Fix advanced gas controls on the confirm screen | Whymarrh Whitby | 2019-02-12 | 1 | -1/+1 |
| | | | |||||
| * | | Trim whitespace from seed phrase during import | Whymarrh Whitby | 2019-02-12 | 1 | -2/+4 |
| |/ | | | | Somehow we lost 33b85cf2e | ||||
| * | Fix inline advanced gas editing | Whymarrh Whitby | 2019-02-09 | 2 | -26/+11 |
| | | |||||
| * | Add togglable advanced gas controls on send and confirm screens (#6112) | Dan J Miller | 2019-02-06 | 4 | -5/+89 |
| | | | | | | | | | | | | | | | | | | | | | * Extract advanced gas input controls to their own component * Add advanced inline gas toggle to settings * Add optional advanced inline gas to send send screen * Adds optional advanced gas inputs to the confirm screen * Add info modals for advanced gas inputs. * Fix translation of advance gas toggle description. * Lint and unit test fixes for inline-advanced-gas-inputs * Increase margin above advanced options button on send screen * Move methods from constructor to property syntax in advanced-gas-inputs.component | ||||
| * | Remove "Use old UI" setting | Whymarrh Whitby | 2019-02-05 | 2 | -37/+1 |
| | | |||||
| * | EIP-1102 updates (#6006) | Paul Bouchon | 2019-01-31 | 2 | -2/+3 |
| | | | | | | | * Update privacy notice * Respond to 1102 messages using tab ID | ||||
| * | I#5956 fix2 dont overwrite existing rpc settings (#6044) | Frankie | 2019-01-30 | 2 | -3/+2 |
| | | | | | | | | | | | | | | | * 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 Tseung | 2019-01-23 | 49 | -128/+2037 |
| | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| * | I#5956 fix 1 (#6026) | Frankie | 2019-01-18 | 1 | -0/+3 |
| | | | | | | * prevent invalid chainId's when adding cusstom rpcs * migration 30 removes invalid chaids from preferences and networkController for custom rpcs | ||||
| * | Fix grammar error in Current Conversion (#6029) | Alexander Tseung | 2019-01-17 | 1 | -1/+1 |
| | | |||||
| * | Fix confirm screen for sending ether tx with hex data (#6008) | Alexander Tseung | 2019-01-11 | 1 | -0/+6 |
| | | |||||
| * | Group transactions by nonce (#5886) | Alexander Tseung | 2018-12-10 | 1 | -1/+1 |
| | | |||||
| * | Uses more reliable api on main send screen; caches basic api results in modal | Dan Miller | 2018-12-04 | 2 | -5/+5 |
| | | |||||
| * | Read only connection of gas price chart to redux | Dan Miller | 2018-12-04 | 2 | -5/+5 |
| | | |||||
| * | Connects remained of the gas customization component to redux. | Dan Miller | 2018-12-04 | 3 | -2/+19 |
| | | |||||
| * | Adds new gas customization modal container (without content) | Dan Miller | 2018-12-04 | 1 | -1/+1 |
| | | |||||
| * | Save recent network balances in local storage (#5843) | Dan J Miller | 2018-12-01 | 4 | -4/+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> | ||||
| * | Increase Token Symbol length to twelve | Thomas Huang | 2018-11-23 | 1 | -2/+2 |
| | | |||||
| * | Merge pull request #5797 from MetaMask/trezor-v6 | Bruno Barbieri | 2018-11-22 | 1 | -4/+3 |
| |\ | | | | | Add Firefox and Brave support for Trezor | ||||
| | * | fix merge conflicts | brunobar79 | 2018-11-21 | 3 | -10/+10 |
| | |\ | |||||
| | * \ | Merge branch 'develop' into trezor-v5 | brunobar79 | 2018-11-14 | 3 | -11/+44 |
| | |\ \ | |||||
| | * \ \ | fix merge conflicts | brunobar79 | 2018-11-07 | 9 | -41/+233 |
| | |\ \ \ | |||||
| | * \ \ \ | fix merge conflicts | brunobar79 | 2018-10-21 | 6 | -42/+190 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | fix conflicts | brunobar79 | 2018-10-17 | 26 | -694/+980 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 | brunobar79 | 2018-09-06 | 18 | -348/+351 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | fix merge conflicts | brunobar79 | 2018-08-21 | 3 | -54/+194 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | add error messages | brunobar79 | 2018-08-11 | 1 | -2/+4 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fix usage of setState in ConfirmTransactionBase#handleSubmit (#5799) | Whymarrh Whitby | 2018-11-22 | 1 | -16/+29 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Show byte count for hex data on confirm screen (#5798) | Whymarrh Whitby | 2018-11-22 | 1 | -1/+2 |
| | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | | Fix button styling for Create Account Connect (#5787) | Alexander Tseung | 2018-11-20 | 2 | -9/+9 |
| | | | | | | | | | |||||
| * | | | | | | | | ESLint fixes (#5775) | Whymarrh Whitby | 2018-11-17 | 1 | -1/+1 |
| | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * eslint . --fix * Upgrade all ESLint warnings to errors | ||||
| * | | | | | | | Fixes #3425: Better support for batch transactions (#5437) | PaddyMc | 2018-11-14 | 3 | -11/+44 |
| | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | | Update Connect Request screen design (#5644) | Whymarrh Whitby | 2018-11-06 | 2 | -20/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| * | | | | | | EIP-1102: add user privacy option | bitpshr | 2018-11-06 | 2 | -36/+37 |
| | | | | | | | |||||
| * | | | | | | EIP-1102: Add option to force-enable provider | bitpshr | 2018-11-06 | 2 | -0/+33 |
| | | | | | | | |||||
| * | | | | | | EIP-1102: updated implementation | bitpshr | 2018-11-06 | 7 | -0/+91 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #5567 from MetaMask/HowardBraham-develop | kumavis | 2018-10-30 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Feature: Warn when attempting to send tx with data to non-contract | ||||
| | * \ \ \ \ \ | Merge branch 'develop' into develop | kumavis | 2018-10-21 | 9 | -45/+193 |
| | |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | | Bug Fix: #1789 and #4525 eth.getCode() with no contract | Howard Braham | 2018-10-10 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Add support for RPC endpoints with custom chain IDs (#5134) | HackyMiner | 2018-10-26 | 3 | -38/+110 |
| | |/ / / / / |/| | | | | | |||||
| * | | | | | | Adds toggle for primary currency (#5421) | Alexander Tseung | 2018-10-17 | 6 | -42/+190 |
| | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| * | | | | | Update Zendesk links for new subdomain | Whymarrh Whitby | 2018-10-12 | 2 | -2/+2 |
| | | | | | | |||||
| * | | | | | tests - integration - Add Drizzle tests (#5467) | Bruno Barbieri | 2018-10-10 | 1 | -1/+1 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * added drizzle app for testing * working * clean up * clean up script * make build step required * add drizzle-tests to .eslintignore * clean up drizzle run script * lint * use truffle unbox * undo eslintignore changes * revert change * dont use global * dont need this steps * use the new account flow * restore package-lock.json | ||||
| * | | | | Fix markup for inline instances of `PageContainer`s | Whymarrh Whitby | 2018-10-06 | 3 | -64/+64 |
| | | | | | |||||
| * | | | | Only use current network txs when calculating "Reject All" | Whymarrh Whitby | 2018-10-02 | 1 | -1/+6 |
| | | | | | |||||
| * | | | | Confirm rejecting multiple transactions with modal | Whymarrh Whitby | 2018-10-02 | 2 | -4/+17 |
| | | | | | |||||
| * | | | | Add "Cancel All" button to confirm footer | Whymarrh Whitby | 2018-10-02 | 2 | -3/+26 |
| | | | | | |||||
| * | | | | support editable customRPC (#5267) | HackyMiner | 2018-09-29 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | * support editable customRPC #5246 * remove rpcList size restriction | ||||
| * | | | | Merge pull request #5282 from MetaMask/tx-cancel-ui | Alexander Tseung | 2018-09-25 | 2 | -4/+5 |
| |\ \ \ \ | | | | | | | | | | | 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 | 2 | -4/+5 |
| | | | | | | | | | | | | | | | | | | | | | component. Add CancelTransaction modal | ||||
| * | | | | | Merge pull request #5241 from MetaMask/refactor-settings | Alexander Tseung | 2018-09-21 | 13 | -592/+800 |
| |\ \ \ \ \ | | | | | | | | | | | | | Refactor settings page to use JSX and follow component file folder st… | ||||
| | * | | | | | Fix translation casing | Alexander Tseung | 2018-09-21 | 1 | -4/+0 |
| | | | | | | | |||||
| | * | | | | | Add Current Conversion Updated string to translations | Alexander Tseung | 2018-09-20 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Refactor settings page to use JSX and follow component file folder structure | Alexander Tseung | 2018-09-20 | 13 | -592/+804 |
| | |/ / / / | |||||
| * / / / / | Move main-container wrapper div into its own class | Whymarrh Whitby | 2018-09-20 | 1 | -0/+1 |
| |/ / / / | |||||
| * | | | | Bug Fix: #5183 history not defined | Sean Rabaut | 2018-09-14 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Add raised type buttons to Button component. Refactor all buttons within app ↵ | Alexander Tseung | 2018-09-13 | 7 | -54/+88 |
| | |_|/ |/| | | | | | | | | to Button components | ||||
| * | | | Merge pull request #5188 from taobun/develop | Dan J Miller | 2018-09-05 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | edit decimal check in old-ui/ | ||||
| | * | | | fix check valid decimals code in new ui | bunoi | 2018-09-05 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge pull request #5167 from MetaMask/fix-watcAsset-images | Dan Finlay | 2018-09-05 | 2 | -1/+6 |
| |\ \ \ \ | | | | | | | | | | | Fix images for watched tokens | ||||
| | * | | | | fix images for watched tokens | Esteban MIno | 2018-08-30 | 2 | -1/+6 |
| | |/ / / | |||||
| * | | | | Merge pull request #5091 from MetaMask/i4945-feature-flag-hex-data | Dan J Miller | 2018-09-04 | 1 | -0/+29 |
| |\ \ \ \ | |/ / / |/| | | | Adds feature flag toggle for the hex data row on the send screen. | ||||
| | * | | | Adds feature flag toggle for the hex data row on the send screen. | Dan Miller | 2018-08-27 | 1 | -0/+29 |
| | | | | | |||||
| * | | | | Merge pull request #5155 from MetaMask/i5154-confirm-spinner | Alexander Tseung | 2018-08-29 | 1 | -4/+7 |
| |\ \ \ \ | | | | | | | | | | | Fix infinite spinner on failed transactions | ||||
| | * | | | | Fix infinite spinner on failed transactions | Alexander Tseung | 2018-08-29 | 1 | -4/+7 |
| | | | | | | |||||
| * | | | | | fix conflicts | Esteban MIno | 2018-08-29 | 13 | -351/+152 |
| |\| | | | | |||||
| | * | | | | Fix naming, add eth.getCode check for actions, fix translations for statuses | Alexander Tseung | 2018-08-24 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | Fix shapeshift transactions. Delete unused files | Alexander Tseung | 2018-08-24 | 1 | -2/+0 |
| | | | | | | |||||
| | * | | | | Refactor transactions list views. Add redesign components | Alexander Tseung | 2018-08-24 | 4 | -28/+10 |
| | | | | | | |||||
| | * | | | | Add withMethodData HOC, add higher-order-component folder | Alexander Tseung | 2018-08-24 | 4 | -36/+2 |
| | | | | | | |||||
| | * | | | | Add react-media package to prevent rendering wallet-view twice in the popup view | Alexander Tseung | 2018-08-24 | 1 | -1/+5 |
| | | | | | | |||||
| | * | | | | Refactor home screen and remove unused files | Alexander Tseung | 2018-08-24 | 4 | -239/+108 |
| | |/ / / | |||||
| | * | | | Merge pull request #5089 from MetaMask/i5085-ethcode | Alexander Tseung | 2018-08-23 | 2 | -5/+14 |
| | |\ \ \ | | | | | | | | | | | Use eth_getCode to sort transaction action type | ||||
| | | * | | | Use eth_getCode to sort transaction action type | Alexander Tseung | 2018-08-23 | 2 | -5/+14 |
| | | | |/ | | |/| | |||||
| | * / | | Add tabs support for PageContainer | Alexander Tseung | 2018-08-23 | 1 | -57/+25 |
| | |/ / | |||||
| * | | | typo watchAsset imageUrl to image | Esteban MIno | 2018-08-24 | 2 | -3/+3 |
| | | | | |||||
| * | | | Merge branch 'develop' into WatchTokenFeature | Esteban MIno | 2018-08-21 | 4 | -55/+198 |
| |\| | | |||||
| | * | | fix ledger affiliate link | brunobar79 | 2018-08-17 | 1 | -1/+1 |
| | | | | |||||
| | * | | ui ready | brunobar79 | 2018-08-17 | 1 | -3/+9 |
| | | | | |||||
| | * | | connect screen ready | brunobar79 | 2018-08-17 | 1 | -25/+63 |
| | | | | |||||
| | * | | more ui | brunobar79 | 2018-08-15 | 1 | -1/+2 |
| | | | | |||||
| | * | | fix | brunobar79 | 2018-08-15 | 1 | -1/+1 |
| | | | | |||||
| | * | | ui fixes | brunobar79 | 2018-08-15 | 2 | -18/+21 |
| | | | | |||||
| | * | | fix tx tests | brunobar79 | 2018-08-14 | 1 | -1/+2 |
| | | | | |||||
| | * | | legacy and new hd path working | brunobar79 | 2018-08-14 | 2 | -23/+44 |
| | | | | |||||
| | * | | good progress adding paths | brunobar79 | 2018-08-14 | 2 | -13/+71 |
| | | | | |||||
| | * | | able to add accounts | brunobar79 | 2018-08-11 | 2 | -3/+3 |
| | | | | |||||
| | * | | iframe communication working | brunobar79 | 2018-08-11 | 1 | -1/+0 |
| | | | | |||||
| | * | | refactor to support multiple hw wallets | brunobar79 | 2018-08-11 | 3 | -23/+39 |
| | |/ | |||||
| | * | Show error while allowing confirmation of transaction where simulation fails | Dan Miller | 2018-08-09 | 1 | -1/+1 |
| | | | |||||
| * | | correct behavior when notification is closed when popup | Esteban MIno | 2018-08-17 | 3 | -7/+9 |
| | | | |||||
| * | | WIP | Esteban MIno | 2018-08-17 | 3 | -3/+10 |
| | | | |||||
| * | | add support for images base64 and urls on new ui | Esteban MIno | 2018-08-15 | 2 | -7/+10 |
| | | | |||||
| * | | refactor unused code | Esteban MIno | 2018-08-08 | 2 | -9/+3 |
| | | | |||||
| * | | Merge branch 'develop' into WatchTokenFeature | Esteban Miño | 2018-08-08 | 1 | -3/+18 |
| |\| | |||||
| | * | Disable Confirm button on subsequent clicks to prevent confirming multiple times | Alexander Tseung | 2018-08-04 | 1 | -3/+18 |
| | | | |||||
| * | | clean confirm add token component | Esteban MIno | 2018-08-07 | 2 | -6/+2 |
| | | | |||||
| * | | new confirm add suggested token component | Esteban MIno | 2018-08-07 | 4 | -2/+147 |
| | | | |||||
| * | | eth_watchToken working | Esteban MIno | 2018-08-04 | 2 | -3/+9 |
| | | | |||||
| * | | popup initializing with suggested tokens | Esteban MIno | 2018-08-04 | 1 | -6/+2 |
| | | | |||||
| * | | rpc-engine not crashing when eth_watchToken | Esteban MIno | 2018-08-04 | 1 | -4/+0 |
| | | | |||||
| * | | merge develop | Esteban MIno | 2018-08-04 | 36 | -288/+1996 |
| |\| | |||||
| | * | Round large exponential numbers | Alexander Tseung | 2018-07-28 | 1 | -2/+5 |
| | | | |||||
| | * | Add close window support to signature requests. Move logic to actions | Alexander Tseung | 2018-07-24 | 2 | -21/+10 |
| | | | |||||
| | * | UI confirm screen closes confirmation window on submit or cancel of a tx | Dan Miller | 2018-07-24 | 1 | -4/+15 |
| | | | |||||
| | * | show alert ONLY when device is connected | brunobar79 | 2018-07-23 | 1 | -4/+11 |
| | | | |||||
| | * | Add fallback options for displaying recipient name in the Confirm screen | Alexander Tseung | 2018-07-21 | 1 | -1/+13 |
| | | | |||||
| | * | Merge pull request #4625 from MetaMask/initial-trezor-support | Bruno Barbieri | 2018-07-20 | 5 | -1/+552 |
| | |\ | | | | | | | Initial trezor support | ||||
| | | * | last css fixes | brunobar79 | 2018-07-19 | 2 | -4/+23 |
| | | | | |||||
| | | * | fix support link | brunobar79 | 2018-07-19 | 1 | -1/+1 |
| | | | | |||||
| | | * | fix unsupported browser view | brunobar79 | 2018-07-19 | 1 | -1/+1 |
| | | | | |||||
| | | * | lint | brunobar79 | 2018-07-19 | 1 | -1/+1 |
| | | | | |||||
| | | * | scroll smooth | brunobar79 | 2018-07-19 | 1 | -3/+11 |
| | | | | |||||
| | | * | design done | brunobar79 | 2018-07-19 | 1 | -23/+86 |
| | | | | |||||
| | | * | fix browser not supported screen | brunobar79 | 2018-07-18 | 1 | -1/+1 |
| | | | | |||||
| | | * | updated account list based on new designs | brunobar79 | 2018-07-18 | 3 | -14/+28 |
| | | | | |||||
| | | * | Merge branch 'develop' into initial-trezor-support | brunobar79 | 2018-07-17 | 2 | -3/+3 |
| | | |\ | |||||
| | | * \ | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | brunobar79 | 2018-07-14 | 1 | -1/+1 |
| | | |\ \ | | | | | | | | | | | | | | | | initial-trezor-support | ||||
| | | * | | | fix account selection | brunobar79 | 2018-07-14 | 1 | -2/+6 |
| | | | | | | |||||
| | | * | | | added affiliate link to trezor | brunobar79 | 2018-07-14 | 1 | -0/+6 |
| | | | | | | |||||
| | | * | | | detect ability to open popup instead of browser | brunobar79 | 2018-07-13 | 2 | -6/+13 |
| | | | | | | |||||
| | | * | | | fix account balance bug | brunobar79 | 2018-07-13 | 1 | -9/+15 |
| | | | | | | |||||
| | | * | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | brunobar79 | 2018-07-13 | 27 | -130/+1170 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | initial-trezor-support | ||||
| | | * | | | | forget device and autiload account features added | brunobar79 | 2018-07-12 | 2 | -1/+40 |
| | | | | | | | |||||
| | | * | | | | fix account duplication | brunobar79 | 2018-07-10 | 1 | -6/+0 |
| | | | | | | | |||||
| | | * | | | | fix all the account related bugs | brunobar79 | 2018-07-10 | 2 | -13/+27 |
| | | | | | | | |||||
| | | * | | | | copy updated | brunobar79 | 2018-07-07 | 1 | -1/+4 |
| | | | | | | | |||||
| | | * | | | | update connect harwdware screen | brunobar79 | 2018-07-07 | 1 | -8/+20 |
| | | | | | | | |||||
| | | * | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | brunobar79 | 2018-07-07 | 1 | -151/+162 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | initial-trezor-support | ||||
| | | * | | | | | UI refactor | brunobar79 | 2018-07-06 | 3 | -97/+106 |
| | | | | | | | | |||||
| | | * | | | | | Refactor UI | brunobar79 | 2018-07-06 | 4 | -266/+328 |
| | | | | | | | | |||||
| | | * | | | | | move strings to localization file | brunobar79 | 2018-07-06 | 1 | -11/+12 |
| | | | | | | | | |||||
| | | * | | | | | added message for non-chrome browsers | brunobar79 | 2018-07-06 | 1 | -1/+26 |
| | | | | | | | | |||||
| | | * | | | | | lint fix | brunobar79 | 2018-07-04 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | * | | | | | fix merge conflicts | brunobar79 | 2018-07-04 | 2 | -2/+4 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | fix merge conflicts | brunobar79 | 2018-07-04 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ | |||||
| | | * | | | | | | | move hardcoded strings to localization file | brunobar79 | 2018-07-03 | 1 | -17/+7 |
| | | | | | | | | | | |||||
| | | * | | | | | | | fix merge conflicts | brunobar79 | 2018-07-02 | 2 | -10/+10 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | move TrezorKeyring to its own package | Bruno | 2018-06-13 | 1 | -3/+3 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | balances working | Bruno | 2018-06-11 | 1 | -2/+18 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | initial trezor support | Bruno | 2018-06-10 | 3 | -1/+260 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Use Number constructor for number conversion. Use existing ↵ | Alexander Tseung | 2018-07-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | noConversionRateAvailable message | ||||
| | * | | | | | | | | | Fix tests | Alexander Tseung | 2018-07-18 | 2 | -1/+5 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Add fallback when no function found, fix network colors, add fiat values for ↵ | Alexander Tseung | 2018-07-18 | 11 | -92/+183 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tokens with contract exchange rates | ||||
| | * | | | | | | | | | Remove unused confirm transaction files | Alexander Tseung | 2018-07-18 | 2 | -21/+0 |
| | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| | * | | | | | | | | Fix send import paths in confirm tx components | Whymarrh Whitby | 2018-07-16 | 2 | -3/+3 |
| | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| | * | | | | | | | Merge pull request #4766 from whymarrh/null-translations | Whymarrh Whitby | 2018-07-13 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | Rework i18n-helper getMessage function | ||||
| | | * | | | | | | Remove unneeded MetaMaskConnect connect wrapper | Whymarrh Whitby | 2018-07-12 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge pull request #4691 from MetaMask/i4404-confirm-refactor | Alexander Tseung | 2018-07-12 | 26 | -94/+1134 |
| | |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | Refactor and redesign confirm transaction views | ||||
| | | * | | | | | | Fix font sizes, colors. Include data tab for send-eth transaction ↵ | Alexander Tseung | 2018-07-12 | 2 | -2/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | confirmations that have data | ||||
| | | * | | | | | | Various fixes from PR comments | Alexander Tseung | 2018-07-07 | 6 | -119/+162 |
| | | | | | | | | | |||||
| | | * | | | | | | Use eth-method-registry to get method data | Alexander Tseung | 2018-07-07 | 5 | -22/+36 |
| | | | | | | | | | |||||
| | | * | | | | | | Display newest transaction | Alexander Tseung | 2018-07-07 | 1 | -2/+3 |
| | | | | | | | | | |||||
| | | * | | | | | | Refactor data flow, signature request routing | Alexander Tseung | 2018-07-07 | 6 | -79/+145 |
| | | | | | | | | | |||||
| | | * | | | | | | Refactor and redesign confirm transaction views | Alexander Tseung | 2018-07-07 | 26 | -94/+994 |
| | | | |_|_|_|/ | | |/| | | | | |||||
| | * / | | | | | Prevent users from submitting password multiple times on the unlock screen | Alexander Tseung | 2018-07-11 | 1 | -36/+36 |
| | |/ / / / / | |||||
| | * | | | | | Merge pull request #4648 from MetaMask/update-import-from-seed-screen | Dan J Miller | 2018-07-06 | 1 | -151/+162 |
| | |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | Update import from seed screen on new ui. | ||||
| | | * | | | | Delete old restore vault file. | Dan | 2018-07-06 | 2 | -340/+162 |
| | | | | | | | |||||
| | | * | | | | Update import from seed screen on new ui. | Dan | 2018-07-05 | 1 | -0/+189 |
| | | | | | | | |||||
| | * | | | | | Merge pull request #4716 from MetaMask/i4663-clearErrorMessages | Dan J Miller | 2018-07-04 | 2 | -0/+2 |
| | |\ \ \ \ \ | | |/ / / / | |/| | | | | fixes #4663 - Clear Error Messages when Importing Accounts are Successful | ||||
| | | * | | | | fixes 4663 | Sara Reynolds | 2018-07-04 | 2 | -0/+2 |
| | | | |_|/ | | |/| | | |||||
| | * | | | | Merge pull request #4633 from MetaMask/i4580-import-account-errors | Alexander Tseung | 2018-07-04 | 2 | -2/+2 |
| | |\ \ \ \ | | |/ / / | |/| | | | Show all errors on account creation screen. | ||||
| | | * | | | Check that error is defined in import-account error catch. | Dan | 2018-06-29 | 2 | -2/+2 |
| | | | | | | |||||
| | | * | | | Show all errors on account creation screen. | Dan | 2018-06-29 | 2 | -2/+2 |
| | | | |/ | | |/| | |||||
| | * / | | eslint --fix . | brunobar79 | 2018-07-03 | 1 | -1/+1 |
| | |/ / | |||||
| * | | | Linted | Dan Finlay | 2018-06-19 | 1 | -0/+1 |
| | | | | |||||
| * | | | Begin letting UI show suggested tokens | Dan Finlay | 2018-06-19 | 2 | -2/+13 |
| |/ / | |||||
| * / | notices - replace getLatestNotice with getNextNotice | kumavis | 2018-06-14 | 2 | -10/+10 |
| |/ | |||||
| * | Merge pull request #4418 from MetaMask/handle-import-account-failure-in-ui | kumavis | 2018-06-07 | 2 | -13/+36 |
| |\ | | | | | Handle errors for null selected address after Importing account (json or private key) | ||||
| | * | Merge branch 'develop' into handle-import-account-failure-in-ui | Dan | 2018-06-03 | 9 | -16/+16 |
| | |\ | |||||
| | * | | Fix then-catch + error handling in import-account | Dan | 2018-05-31 | 2 | -4/+2 |
| | | | | |||||
| | * | | Importing account by json and private key shows error and does not change ↵ | Dan | 2018-05-31 | 2 | -10/+35 |
| | | | | | | | | | | | | | account if no selectedAddress comes after import. | ||||
| * | | | i18n - ja improvements | 03-26 | 2018-06-07 | 4 | -9/+23 |
| | |/ |/| | |||||
| * | | update helpscout links to zenhub | Bobby Dresser | 2018-06-01 | 2 | -2/+2 |
| | | | |||||
| * | | Change btn-secondary styles to btn-default. Make btn-secondary red warning ↵ | Alexander Tseung | 2018-06-01 | 7 | -16/+16 |
| |/ | | | | style buttons | ||||
| * | Fix error handling on incorrect password (#4401) | Alexander Tseung | 2018-05-31 | 1 | -11/+9 |
| | | |||||
| * | Fix add-token token list placeholder width (#4365) | Alexander Tseung | 2018-05-30 | 1 | -0/+4 |
| | | |||||
| * | newui - unlock - dont catch errors unrelated to tryUnlockMetamask | kumavis | 2018-05-29 | 1 | -2/+2 |
| | | |||||
| * | Merge pull request #4308 from MetaMask/i4232-addtoken | kumavis | 2018-05-23 | 25 | -432/+933 |
| |\ | | | | | Update designs for Add Token screen | ||||
| | * | Fix tests | Alexander Tseung | 2018-05-21 | 1 | -11/+6 |
| | | | |||||
| | * | Update designs for Add Token screen | Alexander Tseung | 2018-05-20 | 25 | -432/+938 |
| | | | |||||
| * | | Move setAccountLabel into PreferencesController | Whymarrh Whitby | 2018-05-17 | 2 | -2/+2 |
| |/ | |||||
| * | ui - unlock - remove setNetworkEndpoints calls from new unlock screen | kumavis | 2018-05-17 | 2 | -3/+0 |
| | | |||||
| * | ui - remove files accidently added by bad merge | kumavis | 2018-05-17 | 1 | -189/+0 |
| | | |||||
| * | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-05-17 | 4 | -0/+267 |
| |\ | | | | | | | network-controller-remove-setNetworkEndpoints | ||||
| | * | Add TextField component to storybook | Alexander Tseung | 2018-05-12 | 2 | -2/+1 |
| | | | |||||
| | * | Add new unlock screen design | Alexander Tseung | 2018-05-12 | 5 | -194/+268 |
| | | | |||||
| * | | lint - cleanup some unused variables | kumavis | 2018-05-03 | 2 | -2/+0 |
| | | | |||||
| * | | network - remove setNetworkEndpoints | kumavis | 2018-05-01 | 2 | -5/+0 |
| |/ | |||||
| * | Handle Promise rejections when importing accounts (#4142) | Paul Bouchon | 2018-05-01 | 2 | -0/+4 |
| | | | | | * Silently catch import failures since errors exist in Redux state * Add comment about no-op catch statement | ||||
| * | Merge pull request #4059 from MetaMask/i-4033-seed-words | kumavis | 2018-05-01 | 2 | -147/+116 |
| |\ | | | | | Use new design for Reveal Seed screen. Persist seed words only in the first time flow. | ||||
| | * | Redirect to correct seed phrase screen | Alexander Tseung | 2018-04-27 | 1 | -2/+2 |
| | | | |||||
| | * | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ↵ | Alexander Tseung | 2018-04-23 | 1 | -1/+9 |
| | |\ | | | | | | | | | | i-4033-seed-words | ||||
| | * | | Use new design for reveal seed screen. Persist seed words only in first time ↵ | Alexander Tseung | 2018-04-23 | 1 | -145/+114 |
| | | | | | | | | | | | | | flow | ||||
| * | | | Convert decimals to string in getSymbolAndDecimals; return null for symbol ↵ | Dan | 2018-04-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | or decimals. | ||||
| * | | | Clean up network config | Alexander Tseung | 2018-04-24 | 2 | -2/+2 |
| | |/ |/| | |||||
| * | | Show correct MetaMask version number in the Info page | Alexander Tseung | 2018-04-19 | 1 | -1/+9 |
| |/ | |||||
| * | Fix confirmation popup not always opening | Alexander Tseung | 2018-04-17 | 1 | -2/+3 |
| | | |||||
| * | Require loglevel singleton in each module that uses it | bitpshr | 2018-04-14 | 2 | -0/+2 |
| | | |||||
| * | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ↵ | Alexander Tseung | 2018-04-06 | 1 | -1/+2 |
| | | | | | cb-254 | ||||
| * | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ↵ | Alexander Tseung | 2018-04-06 | 1 | -0/+1 |
| | | | | | cb-254 | ||||
| * | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ↵ | Alexander Tseung | 2018-04-04 | 1 | -9/+12 |
| | | | | | cb-254 | ||||
| * | Fix transaction confirmations | Alexander Tseung | 2018-04-04 | 1 | -14/+16 |
| | | |||||
| * | Fix merge conflicts. Modify send workflow | Alexander Tseung | 2018-04-03 | 1 | -15/+14 |
| | | |||||
| * | Fix lint errors | Alexander Tseung | 2018-04-03 | 3 | -4/+0 |
| | | |||||
| * | Refactor onboarding flow | Alexander Tseung | 2018-04-02 | 4 | -15/+15 |
| | | |||||
| * | Fix merge conflicts | Alexander Tseung | 2018-03-31 | 8 | -94/+135 |
| | | |||||
| * | Fix merge conflicts. Refactor renderPrimary into Home component | Alexander Tseung | 2018-03-31 | 5 | -358/+434 |
| | | |||||
| * | Fix i18n merge conflicts | Alexander Tseung | 2018-03-30 | 8 | -115/+153 |
| | | |||||
| * | Fix merge conflicts. Refactor onboarding flow. | Alexander Tseung | 2018-03-29 | 9 | -17/+36 |
| | | |||||
| * | Fix merge conflicts | Alexander Tseung | 2018-03-27 | 8 | -286/+360 |
| | | |||||
| * | Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension ↵ | Alexander Tseung | 2018-02-09 | 2 | -4/+15 |
| | | | | | into cb-254 | ||||
| * | Fix merge conflicts from uat-next | Alexander Tseung | 2018-02-01 | 4 | -14/+20 |
| | | |||||
| * | Add create new account routes, fix conflicts from uat updates | Alexander Tseung | 2018-02-01 | 11 | -112/+284 |
| | | |||||
| * | Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254 | Alexander Tseung | 2018-01-30 | 5 | -65/+85 |
| | | |||||
| * | Add route for signature request | Alexander Tseung | 2017-12-15 | 1 | -0/+321 |
| | | |||||
| * | Add initialized checks for first time flow routes | Alexander Tseung | 2017-12-15 | 4 | -71/+48 |
| | | |||||
| * | Add routes for mascara | Alexander Tseung | 2017-12-15 | 5 | -25/+78 |
| | | |||||
| * | Add react-router to allow use of the browser back button | Alexander Tseung | 2017-12-15 | 13 | -0/+1897 |
 |
index : tangerine-wallet-browser | |
| Tangerine fork of MetaMask browser extension (https://github.com/tangerine-network/tangerine-wallet-browser) | LAN-TW |
| aboutsummaryrefslogtreecommitdiffstats |