Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix merge conflicts | Bruno | 2018-06-13 | 2 | -2/+2 |
|\ | |||||
| * | Access correct property from state in confirm screen components gatherTxMeta() | Dan | 2018-06-08 | 2 | -2/+2 |
| | | |||||
* | | 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 | 7 | -6/+413 |
|/ | |||||
* | Merge branch 'develop' into i3725-refactor-send-component- | Dan | 2018-06-07 | 13 | -63/+90 |
|\ | |||||
| * | Merge pull request #4418 from MetaMask/handle-import-account-failure-in-ui | kumavis | 2018-06-07 | 4 | -19/+47 |
| |\ | | | | | | | 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-05 | 13 | -28/+143 |
| | |\ | |||||
| | * \ | Merge branch 'develop' into handle-import-account-failure-in-ui | Dan | 2018-06-03 | 34 | -227/+366 |
| | |\ \ | |||||
| | * | | | 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 | 4 | -16/+46 |
| | | | | | | | | | | | | | | | | | | | | account if no selectedAddress comes after import. | ||||
| * | | | | i18n - ja improvements | 03-26 | 2018-06-07 | 6 | -16/+34 |
| | | | | | |||||
| * | | | | Render the accounts in keyring order | Whymarrh Whitby | 2018-06-06 | 1 | -3/+4 |
| | | | | | |||||
| * | | | | Remove unused identities reducer from UI | Whymarrh Whitby | 2018-06-06 | 2 | -22/+0 |
| | | | | | |||||
| * | | | | Remove selectedIdentity prop from wallet view | Whymarrh Whitby | 2018-06-06 | 1 | -5/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The selectedIdentity property is computed based on the selectedAddress which means that using both the selectedAddress and the selectedIdentity is redundant. In the case of the Array#find call on the set of keyrings, we wouldn't have a situation where one is included and the other isn't. This changeset removes the selectedIdentity from the wallet view because it isn't needed. | ||||
| * | | | | Ensure selectedAddress exists when render wallet | Whymarrh Whitby | 2018-06-06 | 1 | -0/+4 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'develop' into i3725-refactor-send-component- | Dan | 2018-06-05 | 15 | -30/+145 |
|\| | | | |||||
| * | | | Update hide-token-confirmation-modal.js to use new modalState schema (#4482) | Dan J Miller | 2018-06-05 | 3 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Update hide-token-confirmation-modal.js to use new modalState schema (added in 41e38fe55). * Fix modalState props | ||||
| * | | | Merge pull request #4428 from MetaMask/fix-tokenlist-balance-overflow | Dan J Miller | 2018-06-05 | 2 | -4/+13 |
| |\ \ \ | | | | | | | | | | | Token name is not hidden in wallet if balance is exceptionally long. | ||||
| | * | | | Fix ellipses | Alexander Tseung | 2018-06-01 | 1 | -5/+6 |
| | | | | | |||||
| | * | | | Token name is not hidden in wallet if balance is exceptionally long. | Dan | 2018-06-01 | 2 | -3/+11 |
| | |/ / | |||||
| * | / | Indicate the current selected account on the popup account view (#4445) | Alexander Tseung | 2018-06-05 | 8 | -21/+127 |
| | |/ | |/| | |||||
| * | | update helpscout links to zenhub | Bobby Dresser | 2018-06-01 | 2 | -2/+2 |
| | | | |||||
* | | | Simplify recipient code check in send.utils estimateGas | Dan | 2018-06-05 | 1 | -4/+5 |
| | | | |||||
* | | | Default currency-display valueToRender to empty string when not readOnly ↵ | Dan | 2018-06-02 | 1 | -2/+2 |
| | | | | | | | | | | | | ('0' if readOnly). | ||||
* | | | Fix calculation of data property for gas estimation on token transfers. | Dan | 2018-06-02 | 7 | -47/+41 |
| | | | |||||
* | | | Merge branch 'i3725-refactor-send-component-' into ↵ | Dan | 2018-06-01 | 52 | -421/+758 |
|\ \ \ | | | | | | | | | | | | | i3914-fix-newui-send-gas-estimation | ||||
| * | | | Remove .only | Dan | 2018-06-01 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'i3725-refactor-send-component-' of ↵ | Dan | 2018-06-01 | 6 | -153/+92 |
| |\ \ \ | | | | | | | | | | | | | | | | github.com:MetaMask/metamask-extension into i3725-refactor-send-component- | ||||
| | * \ \ | Merge pull request #4386 from ↵ | Dan J Miller | 2018-06-01 | 6 | -153/+92 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | MetaMask/i4077-replace-currency-input-with-numeric-input Replace currency-input.js with NumericInput | ||||
| | | * | | | Improve input width calculation in currency-display.js | Dan | 2018-06-01 | 1 | -3/+2 |
| | | | | | | |||||
| | | * | | | Fix currency display send integration tests. | Dan | 2018-05-31 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | Delete currency-input.js | Dan | 2018-05-30 | 2 | -114/+0 |
| | | | | | | |||||
| | | * | | | Remove currency input from input-number | Dan | 2018-05-30 | 1 | -4/+4 |
| | | | | | | |||||
| | | * | | | Stop using external NumericInput component. | Dan | 2018-05-30 | 1 | -8/+15 |
| | | | | | | |||||
| | | * | | | Replaces currency-input.js with NumericInput | Dan | 2018-05-29 | 4 | -38/+85 |
| | | | | | | |||||
| * | | | | | Merge branch 'develop' into i3725-refactor-send-component- | Dan | 2018-06-01 | 45 | -268/+665 |
| |\ \ \ \ \ | | |/ / / / | |/| | / / | | | |/ / | | |/| | | |||||
| | * | | | Add new alert modals | Alexander Tseung | 2018-06-01 | 16 | -165/+287 |
| | | | | | |||||
| | * | | | Change btn-secondary styles to btn-default. Make btn-secondary red warning ↵ | Alexander Tseung | 2018-06-01 | 16 | -62/+79 |
| | | |/ | | |/| | | | | | | | | | style buttons | ||||
| | * | | Prevent loading screen from overlaying the app bar (#4417) | Alexander Tseung | 2018-05-31 | 4 | -12/+4 |
| | | | | |||||
| | * | | Fix error handling on incorrect password (#4401) | Alexander Tseung | 2018-05-31 | 1 | -11/+9 |
| | | | | |||||
| | * | | Add notification for dropped retry transactions (#4363) | Alexander Tseung | 2018-05-30 | 14 | -68/+294 |
| | | | | |||||
| | * | | Fix add-token token list placeholder width (#4365) | Alexander Tseung | 2018-05-30 | 1 | -0/+4 |
| | | | | |||||
| | * | | Fix text field labels of first time flow. Add text fields to storybook (#4389) | Alexander Tseung | 2018-05-29 | 2 | -44/+80 |
| | | | | |||||
| | * | | newui - unlock - dont catch errors unrelated to tryUnlockMetamask | kumavis | 2018-05-29 | 1 | -2/+2 |
| | | | | |||||
| | * | | Fix scrolling in Deposit Ether modal (#4336) | Alexander Tseung | 2018-05-24 | 1 | -2/+4 |
| | | | | |||||
* | | | | Improve efficiency of estimateGasPriceFromRecentBlocks | Dan | 2018-05-31 | 1 | -10/+5 |
| | | | | |||||
* | | | | test - send-utils.test - lint fix | kumavis | 2018-05-31 | 1 | -1/+1 |
| | | | | |||||
* | | | | Gas estimation uses block gas limit as fallback if query.estimateGas returns ↵ | Dan | 2018-05-31 | 2 | -5/+39 |
| | | | | | | | | | | | | | | | | an expected error. | ||||
* | | | | Auto update gas estimate when to changes. | Dan | 2018-05-31 | 14 | -64/+109 |
| | | | | |||||
* | | | | Support smaller decimals in currency-display | Dan | 2018-05-31 | 1 | -1/+1 |
| | | | | |||||
* | | | | Estimate gas using same algorithm as backend. | Dan | 2018-05-31 | 12 | -98/+153 |
| | | | | |||||
* | | | | Simplify gas estimate actions and add local estimateGasPriceFromRecentBlocks ↵ | Dan | 2018-05-31 | 13 | -55/+203 |
| | | | | | | | | | | | | | | | | method. | ||||
* | | | | getParamsForGasEstimate extracts symbol from token instead of just accepting ↵ | Dan | 2018-05-31 | 3 | -6/+6 |
| | | | | | | | | | | | | | | | | symbol. | ||||
* | | | | Rename gas change actions. | Dan | 2018-05-31 | 4 | -22/+22 |
| | | | | |||||
* | | | | Split out getGasEstimate logic from updateGasTotal | Dan | 2018-05-31 | 1 | -3/+12 |
|/ / / | |||||
* | | | Update amount error on update of send screen. | Dan | 2018-05-31 | 3 | -23/+30 |
| | | | |||||
* | | | Fix setting of token balance on account switch in send screen from field. | Dan | 2018-05-31 | 3 | -3/+3 |
| |/ |/| | |||||
* | | Send refactor: fix error handling and form disabling in send form. | Dan | 2018-05-26 | 8 | -47/+37 |
| | | |||||
* | | Clean up for send refactor PR. | Dan | 2018-05-25 | 5 | -15/+7 |
| | | |||||
* | | Move formShouldBeDisabled from send-footer util to component. | Dan | 2018-05-25 | 4 | -40/+72 |
| | | |||||
* | | Fix order of button text in page-container-footer. | Dan | 2018-05-25 | 2 | -10/+4 |
| | | |||||
* | | Display correct titles and subtitles on send token and editing send ↵ | Dan | 2018-05-25 | 8 | -14/+105 |
| | | | | | | | | transaction screens. | ||||
* | | Fix display of primary currency symbol in send amount row | Dan | 2018-05-25 | 2 | -2/+8 |
| | | |||||
* | | Send refactor: fix amount max button for tokens. | Dan | 2018-05-24 | 2 | -2/+13 |
| | | |||||
* | | Merge branch 'develop' into i3725-refactor-send-component- | Dan | 2018-05-24 | 63 | -1052/+1358 |
|\| | |||||
| * | Merge pull request #4308 from MetaMask/i4232-addtoken | kumavis | 2018-05-23 | 45 | -971/+1280 |
| |\ | | | | | | | Update designs for Add Token screen | ||||
| | * | Update input field border on focus | Alexander Tseung | 2018-05-22 | 1 | -1/+3 |
| | | | |||||
| | * | Fix tests | Alexander Tseung | 2018-05-21 | 1 | -11/+6 |
| | | | |||||
| | * | Update designs for Add Token screen | Alexander Tseung | 2018-05-20 | 45 | -971/+1283 |
| | | | |||||
| * | | Merge pull request #4295 from MetaMask/kumavis-patch-3 | Frankie | 2018-05-22 | 1 | -1/+2 |
| |\ \ | | | | | | | | | ui - token-util - warn via loglevel on token lookup failure | ||||
| | * | | token-util - warn via loglevel on token lookup failure | kumavis | 2018-05-19 | 1 | -1/+2 |
| | |/ | |||||
| * | | Merge pull request #4316 from MetaMask/fix-signature-request | kumavis | 2018-05-22 | 1 | -2/+0 |
| |\ \ | | | | | | | | | Fix signature request header text | ||||
| | * | | Fix signature request header text | Alexander Tseung | 2018-05-21 | 1 | -2/+0 |
| | |/ | |||||
| * | | Merge pull request #4273 from brunobar79/fix-new-ui-popup-header | kumavis | 2018-05-22 | 1 | -2/+0 |
| |\ \ | | | | | | | | | Remove fix modal header height | ||||
| | * | | remove fix header height | Bruno | 2018-05-17 | 1 | -2/+0 |
| | |/ | |||||
| * / | Move setAccountLabel into PreferencesController | Whymarrh Whitby | 2018-05-17 | 8 | -18/+18 |
| |/ | |||||
| * | Merge pull request #4255 from MetaMask/i4233-dropdowns | kumavis | 2018-05-17 | 5 | -21/+58 |
| |\ | | | | | | | Fix account and network dropdowns in confirm screen | ||||
| | * | Fix account and network dropdowns in confirm screen | Alexander Tseung | 2018-05-15 | 5 | -21/+58 |
| | | | |||||
| * | | 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 | 2 | -328/+0 |
| | | | |||||
| * | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-05-17 | 45 | -317/+850 |
| |\ \ | | | | | | | | | | | | | network-controller-remove-setNetworkEndpoints | ||||
| | * | | Add error message when passwords don't match in first time flow. Change ↵ | Alexander Tseung | 2018-05-14 | 2 | -48/+54 |
| | |/ | | | | | | | | | | input field styling in first time flow | ||||
| | * | Add TextField component to storybook | Alexander Tseung | 2018-05-12 | 3 | -2/+25 |
| | | | |||||
| | * | Add new unlock screen design | Alexander Tseung | 2018-05-12 | 22 | -569/+559 |
| | | | |||||
| | * | Merge pull request #4196 from MetaMask/i3457-fontweight | Thomas Huang | 2018-05-09 | 11 | -22/+2 |
| | |\ | | | | | | | | | Change font weight from 300 to 400 | ||||
| | | * | Change font weight from 300 to 400 | Alexander Tseung | 2018-05-06 | 11 | -22/+2 |
| | | | | |||||
| | * | | Add storybook integration | Alexander Tseung | 2018-05-04 | 5 | -2/+96 |
| | |/ | |||||
| | * | Merge pull request #4156 from MetaMask/i4010-spinner | kumavis | 2018-05-03 | 9 | -10/+115 |
| | |\ | | | | | | | | | Fix styling of the app spinner | ||||
| | | * | Fix styling of the app spinner | Alexander Tseung | 2018-05-01 | 9 | -10/+115 |
| | | | | |||||
| | * | | Merge pull request #4162 from MetaMask/ui-actions-pify-importNewAccount | kumavis | 2018-05-02 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | | | ui - actions - importNewAccount - rethrow err on failure | ||||
| | | * | | ui - actions - importNewAccount - rethrow err on failure | kumavis | 2018-05-02 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | lint - cleanup some unused variables | kumavis | 2018-05-03 | 6 | -13/+0 |
| | | | | | |||||
| * | | | | network - remove setNetworkEndpoints | kumavis | 2018-05-01 | 7 | -29/+1 |
| |/ / / | |||||
| * / / | 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 | ||||
| * | | ui - actions - importNewAccount - use async and pify for cleaner syntax | kumavis | 2018-05-01 | 1 | -24/+20 |
| | | | |||||
| * | | Merge pull request #4059 from MetaMask/i-4033-seed-words | kumavis | 2018-05-01 | 13 | -329/+354 |
| |\ \ | | | | | | | | | 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 | 12 | -285/+346 |
| | | | | | | | | | | | | | | | | | | | | flow | ||||
| | * | | | Revert "Fix UI getting stuck in Reveal Seed screen" | Alexander Tseung | 2018-04-22 | 2 | -27/+3 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit 2c8156ebe91941309d49e8f8f1ed8e9d740bb9de. | ||||
| * | | | | Fix ShapeShift purchases on new UI | bitpshr | 2018-04-29 | 1 | -6/+7 |
| | | | | | |||||
| * | | | | Merge pull request #4113 from ↵ | kumavis | 2018-04-28 | 4 | -45/+43 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | MetaMask/i4107-send-tokens-without-symbols-decimal-methods Wraps calls to symbol() and decimals() in try catch (Fixes #4107) | ||||
| | * | | | | Simplify return of existing token in getSymbolAndDecimals | Dan | 2018-04-28 | 1 | -4/+1 |
| | | | | | | |||||
| | * | | | | Convert decimals to string in getSymbolAndDecimals; return null for symbol ↵ | Dan | 2018-04-28 | 3 | -20/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | or decimals. | ||||
| | * | | | | Wraps calls to symbol() and decimals() in try catch | Dan | 2018-04-28 | 3 | -30/+41 |
| | | |_|/ | | |/| | | |||||
| * / | | | Allow transactions with 0-gwei gas price (#4073) | Paul Bouchon | 2018-04-27 | 3 | -12/+11 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | * Allow transactions with 0-gwei gas price * Add tests to verify tx with 0 gas fee * Conditionally use CurrencyInput in CurrencyDisplay | ||||
| * | | | i18n-helper - wrap fallback in brackets to help indicate something is wrong | kumavis | 2018-04-26 | 1 | -1/+1 |
| | | | | |||||
| * | | | Return key instead of empty string on i18n fail | Dan Finlay | 2018-04-26 | 1 | -1/+1 |
| | | | | |||||
| * | | | i18n-helper - abort on i18n failure | kumavis | 2018-04-25 | 1 | -1/+2 |
| | | | | |||||
* | | | | Merge branch 'develop' into i3725-refactor-send-component- | Dan | 2018-05-15 | 2 | -48/+54 |
| | | | | |||||
* | | | | Import defaults in send_/ | Dan | 2018-05-15 | 10 | -17/+18 |
| | | | | |||||
* | | | | Fix Button component path in page-container footer. | Dan | 2018-05-15 | 1 | -1/+1 |
| | | | | |||||
* | | | | Add index.js files to send_ subdirectories | Dan | 2018-05-15 | 13 | -0/+13 |
| | | | | |||||
* | | | | Merge branch 'develop' into i3725-refactor-send-component- | Dan | 2018-05-14 | 63 | -1019/+1233 |
| | | | | |||||
* | | | | Tests for send.duck.js | Dan | 2018-05-14 | 4 | -20/+167 |
| | | | | |||||
* | | | | Rename ducks/send.js to ducks/send.duck.js | Dan | 2018-05-14 | 15 | -14/+14 |
| | | | | |||||
* | | | | Add missing unit tests in send_/: now 100% function test coverage in send_/ | Dan | 2018-05-14 | 4 | -112/+298 |
| | | | | |||||
* | | | | Lint fixes | Dan | 2018-05-14 | 10 | -31/+6 |
| | | | | |||||
* | | | | Unit tests for account-list-item, amount-max-button and send-amount-row ↵ | Dan | 2018-05-14 | 3 | -0/+381 |
| | | | | | | | | | | | | | | | | components. | ||||
* | | | | Unit tests for from-dropdown; split out send-dropdown-list from from-dropdown | Dan | 2018-05-12 | 4 | -39/+260 |
| | | | | |||||
* | | | | SendRowErrorMessage component test. | Dan | 2018-05-11 | 1 | -0/+28 |
| | | | | |||||
* | | | | Unit tests for send from, gas, to and wrapper row components. | Dan | 2018-05-11 | 4 | -0/+403 |
| | | | | |||||
* | | | | Fix test descriptions and remove unnecessary proptypes. | Dan | 2018-05-10 | 5 | -14/+10 |
| | | | | |||||
* | | | | Adds test for send, send-content, send-footer and send-header components. | Dan | 2018-05-07 | 6 | -16/+516 |
| | | | | |||||
* | | | | Unit tests for containers, utils and selectors in send_/ | Dan | 2018-05-05 | 44 | -73/+2506 |
| | | | | |||||
* | | | | Merge branch 'i3725-refactor-send-component-' of ↵ | Dan | 2018-05-01 | 12 | -16/+137 |
|\ \ \ \ | | | | | | | | | | | | | | | | github.com:MetaMask/metamask-extension into i3725-refactor-send-component- | ||||
| * \ \ \ | Merge branch 'i3725-refactor-send-component-' into ↵ | Dan | 2018-05-01 | 118 | -1513/+4604 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | i3725-refactor-send-component-2 | ||||
| * | | | | | Refactor page-container component structure | Alexander Tseung | 2018-04-11 | 13 | -75/+173 |
| | | | | | | |||||
* | | | | | | Delete dead send code. | Dan | 2018-05-01 | 10 | -723/+2 |
| |/ / / / |/| | | | | |||||
* | | | | | Remove 'goHome' from send_ | Dan | 2018-05-01 | 2 | -4/+1 |
| | | | | | |||||
* | | | | | Move getMaxModeOn selector to amount-max-button container. | Dan | 2018-05-01 | 3 | -6/+10 |
| | | | | | |||||
* | | | | | Use constants for send screen errors messages. | Dan | 2018-05-01 | 4 | -9/+29 |
| | | | | | |||||
* | | | | | Fix send-v2__form class in send-content.component | Dan | 2018-05-01 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Fix amount max button. | Dan | 2018-05-01 | 5 | -7/+7 |
| | | | | | |||||
* | | | | | Fix close button on send screen | Dan | 2018-04-30 | 2 | -4/+5 |
| | | | | | |||||
* | | | | | Further refactors; includes refactor of send-v2.js and associated container | Dan | 2018-04-30 | 24 | -155/+487 |
| | | | | | |||||
* | | | | | Fixes to get tests passing. | Dan | 2018-04-27 | 5 | -11/+11 |
| | | | | | |||||
* | | | | | Lint fixes and alphabetization for i3725-refactor-send-component | Dan | 2018-04-27 | 35 | -365/+330 |
| | | | | | |||||
* | | | | | Core of the refactor complete | Dan | 2018-04-27 | 34 | -489/+757 |
| | | | | | |||||
* | | | | | Merge branch 'master' into i3725-refactor-send-component | Dan | 2018-04-25 | 49 | -200/+300 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge pull request #3940 from nyatla/master | Dan Finlay | 2018-04-24 | 3 | -1/+3 |
| |\ \ \ \ | | | | | | | | | | | | | Small layout and cursor problem fix. | ||||
| | * | | | | Reduced button padding. | nyatla | 2018-04-10 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Title overflowed in Japanese. | ||||
| | * | | | | Expanded dropdown menu width of title. | nyatla | 2018-04-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Title overflowed in Japanese. | ||||
| | * | | | | Changed mouse cursor to "pointer" on the cancel text at the top left of the ↵ | nyatla | 2018-04-10 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | page. | ||||
| * | | | | | Merge pull request #3968 from MetaMask/gh-3653 | Dan Finlay | 2018-04-24 | 10 | -13/+17 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Clean up network config | ||||
| | * | | | | | Clean up network config | Alexander Tseung | 2018-04-24 | 10 | -13/+17 |
| | | |_|_|/ | | |/| | | | |||||
| * | | | | | Merge pull request #4028 from MetaMask/i4016-customrpc | Dan Finlay | 2018-04-24 | 1 | -6/+8 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | Fix custom RPC not redirecting to Settings page | ||||
| | * | | | | Fix custom RPC not redirecting to Settings page | Alexander Tseung | 2018-04-19 | 1 | -6/+8 |
| | | |_|/ | | |/| | | |||||
| * | | | | Merge pull request #4030 from MetaMask/i4014-metamask-version | Thomas Huang | 2018-04-20 | 1 | -1/+9 |
| |\ \ \ \ | | | | | | | | | | | | | Show correct MetaMask version number in the Info page | ||||
| | * | | | | Show correct MetaMask version number in the Info page | Alexander Tseung | 2018-04-19 | 1 | -1/+9 |
| | |/ / / | |||||
| * / / / | Fix exception thrown when revealing seed words | Alexander Tseung | 2018-04-19 | 1 | -6/+18 |
| |/ / / | |||||
| * | | | Merge pull request #3977 from MetaMask/i-3913-big-number | Dan Finlay | 2018-04-19 | 4 | -25/+49 |
| |\ \ \ | | | | | | | | | | | Fix BigNumber exception in confirm-send-ether | ||||
| | * | | | Fix spinner layout | Alexander Tseung | 2018-04-18 | 4 | -24/+26 |
| | | | | | |||||
| | * | | | Fix BigNumber exception in confirm-send-ether | Alexander Tseung | 2018-04-18 | 1 | -3/+25 |
| | | | | | |||||
| * | | | | Merge pull request #4004 from MetaMask/i3955-reveal-seed | Dan Finlay | 2018-04-19 | 2 | -3/+27 |
| |\ \ \ \ | | | | | | | | | | | | | Fix UI getting stuck in Reveal Seed screen | ||||
| | * | | | | Fix UI getting stuck in Reveal Seed screen | Alexander Tseung | 2018-04-19 | 2 | -3/+27 |
| | | | | | | |||||
| * | | | | | Merge pull request #3998 from MetaMask/i3988-checksummed-address | Dan Finlay | 2018-04-19 | 10 | -26/+44 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | Show checksum addresses on UI | ||||
| | * | | | | Show checksummed addresses throughout the UI | bitpshr | 2018-04-18 | 10 | -26/+44 |
| | |/ / / | |||||
| * | | | | Merge branch 'master' into i3580-InternationalizeCurrency | Dan Finlay | 2018-04-18 | 24 | -107/+52 |
| |\| | | | |||||
| | * | | | Fix confirmation popup not always opening | Alexander Tseung | 2018-04-17 | 5 | -13/+18 |
| | | | | | |||||
| | * | | | Merge branch 'master' into i3981-contract-rates | Dan Finlay | 2018-04-17 | 14 | -3/+14 |
| | |\ \ \ | |||||
| | | * \ \ | Merge pull request #3970 from MetaMask/i3651-removeGlobalLog | Dan Finlay | 2018-04-17 | 13 | -2/+13 |
| | | |\ \ \ | | | | | | | | | | | | | | | Remove reliance on window.log | ||||
| | | | * | | | Require loglevel singleton in each module that uses it | bitpshr | 2018-04-14 | 13 | -2/+13 |
| | | | | | | | |||||
| | | * | | | | Fix action for setting locale | Dan Finlay | 2018-04-14 | 1 | -1/+1 |
| | | |/ / / | |||||
| | * | | | | Maintain token prices using a background service | bitpshr | 2018-04-16 | 4 | -81/+6 |
| | | | | | | |||||
| | * | | | | Fetch token prices based on contract address | bitpshr | 2018-04-16 | 8 | -81/+85 |
| | |/ / / | |||||
| * | | | | Lint fix. | Dan | 2018-04-10 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | Merge branch 'master' into i3580-InternationalizeCurrency | Dan | 2018-04-10 | 49 | -1081/+2630 |
| |\| | | | |||||
| * | | | | Internationalize converted value in confirm screens | Dan | 2018-04-10 | 2 | -4/+36 |
| | | | | | |||||
| * | | | | Internationalize converted value in currency-input.js | Dan | 2018-04-10 | 1 | -10/+25 |
| | | | | | |||||
| * | | | | Improve display of crypto currencies when selected as the 'Current Conversion' | Dan | 2018-04-10 | 1 | -4/+13 |
| | | | | | |||||
| * | | | | Linted | Dan Finlay | 2018-04-04 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Internationalize currency | Dan Finlay | 2018-04-04 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | Fixes #3580 | ||||
* | | | | | second commit | Dan | 2018-04-11 | 18 | -50/+461 |
| | | | | | |||||
* | | | | | Merge branch 'master' into i3725-refactor-send-component | Dan | 2018-04-10 | 45 | -1044/+2589 |
|\ \ \ \ \ | | |/ / / | |/| | / | |_|_|/ |/| | | | |||||
| * | | | Fix integration tests | Alexander Tseung | 2018-04-07 | 3 | -4/+6 |
| | | | | |||||
| * | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ↵ | Alexander Tseung | 2018-04-06 | 2 | -2/+8 |
| |\ \ \ | | | |/ | | |/| | | | | | cb-254 | ||||
| * | | | Fix editing transaction | Alexander Tseung | 2018-04-06 | 1 | -2/+1 |
| | | | | |||||
| * | | | Revert "commit" | Alexander Tseung | 2018-04-06 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | This reverts commit fa8500e09ad599837f6ad1b2dfc3530195a03b33. | ||||
| * | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ↵ | Alexander Tseung | 2018-04-06 | 3 | -3/+2 |
| |\ \ \ | | | | | | | | | | | | | | | | cb-254 | ||||
| * | | | | commit | Alexander Tseung | 2018-04-06 | 1 | -2/+1 |
| | | | | | |||||
| * | | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ↵ | Alexander Tseung | 2018-04-05 | 2 | -3/+4 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | cb-254 | ||||
| * | | | | | Use new design for showing seed words | Alexander Tseung | 2018-04-04 | 1 | -1/+13 |
| | | | | | | |||||
| * | | | | | commit | Alexander Tseung | 2018-04-04 | 1 | -8/+2 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ↵ | Alexander Tseung | 2018-04-04 | 4 | -28/+45 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | cb-254 | ||||
| * | | | | | | Fix transaction confirmations | Alexander Tseung | 2018-04-04 | 2 | -17/+32 |
| | | | | | | | |||||
| * | | | | | | Fix merge conflicts. Modify send workflow | Alexander Tseung | 2018-04-03 | 15 | -67/+331 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Fix lint errors | Alexander Tseung | 2018-04-03 | 7 | -229/+2 |
| | | | | | | | | |||||
| * | | | | | | | Add withRouter to I18nProvider component | Alexander Tseung | 2018-04-03 | 1 | -1/+6 |
| | | | | | | | | |||||
| * | | | | | | | Refactor onboarding flow | Alexander Tseung | 2018-04-02 | 9 | -47/+60 |
| | | | | | | | | |||||
| * | | | | | | | Fix conf-tx render | Alexander Tseung | 2018-03-31 | 2 | -2/+8 |
| | | | | | | | | |||||
| * | | | | | | | Fix merge conflicts | Alexander Tseung | 2018-03-31 | 75 | -471/+829 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix merge conflicts. Refactor renderPrimary into Home component | Alexander Tseung | 2018-03-31 | 9 | -606/+693 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix i18n merge conflicts | Alexander Tseung | 2018-03-30 | 82 | -567/+815 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix merge conflicts. Refactor onboarding flow. | Alexander Tseung | 2018-03-29 | 13 | -33/+65 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fix merge conflicts | Alexander Tseung | 2018-03-27 | 129 | -4073/+3914 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix react-router related exceptions | Alexander Tseung | 2018-02-10 | 2 | -2/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension ↵ | Alexander Tseung | 2018-02-09 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into cb-254 | ||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension ↵ | Alexander Tseung | 2018-02-09 | 2 | -36/+28 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into cb-254 | ||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension ↵ | Alexander Tseung | 2018-02-09 | 17 | -102/+432 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into cb-254 | ||||
| * | | | | | | | | | | | | | Fix lint errors | Alexander Tseung | 2018-02-02 | 4 | -10/+3 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Checks if there is currently a send in progress before redirecting to ↵ | Dan | 2018-02-01 | 1 | -3/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default in conf-tx | ||||
| * | | | | | | | | | | | | | Fix merge conflicts from uat-next | Alexander Tseung | 2018-02-01 | 16 | -153/+214 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Add create new account routes, fix conflicts from uat updates | Alexander Tseung | 2018-02-01 | 18 | -225/+156 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254 | Alexander Tseung | 2018-01-30 | 61 | -956/+2059 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Add route for signature request | Alexander Tseung | 2017-12-15 | 6 | -305/+454 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Add initialized checks for first time flow routes | Alexander Tseung | 2017-12-15 | 5 | -79/+56 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Add route for Mascara confirm seed | Alexander Tseung | 2017-12-15 | 2 | -3/+12 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fix lint errors | Alexander Tseung | 2017-12-15 | 4 | -14/+44 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Add routes for mascara | Alexander Tseung | 2017-12-15 | 9 | -56/+123 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Add react-router to allow use of the browser back button | Alexander Tseung | 2017-12-15 | 40 | -1464/+1976 |
| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | first commit | Dan | 2018-04-07 | 94 | -37/+845 |
| |_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge pull request #3883 from danjm/i3685-define-event-privatekey-import | kumavis | 2018-04-06 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | event object actually passed to this.createKeyringOnEnter in private-key.js | ||||
| * | | | | | | | | | | | | | | | event object actually passed to this.createKeyringOnEnter in private-key.js | Dan | 2018-04-05 | 1 | -1/+2 |
| | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge pull request #3892 from alextsg/gh-3891 | kumavis | 2018-04-06 | 1 | -1/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | Fix populating txParams with undefined data | ||||
| * | | | | | | | | | | | | | | Fix populating txParams with undefined data | Alexander Tseung | 2018-04-06 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge pull request #3865 from MetaMask/openlinkinnewwindow | Thomas Huang | 2018-04-06 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make token helpscout link open in new tab. | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵ | Kevin Serrano | 2018-04-05 | 2 | -3/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | openlinkinnewwindow | ||||
| * | | | | | | | | | | | | | | | Make token helpscout link open in new tab. | Kevin Serrano | 2018-04-04 | 1 | -0/+1 |
| | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge pull request #3882 from MetaMask/i#3791 | Kevin Serrano | 2018-04-05 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | Fixes download file buttons | ||||
| * | | | | | | | | | | | | | | Change double-quotes to single-quotes | Thomas | 2018-04-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Add target=_blank exportAsFile | Thomas | 2018-04-05 | 1 | -0/+1 |
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
* / | | | | | | | | | | | | | Allow from and to address to be the same in new-ui. | Dan | 2018-04-05 | 1 | -3/+0 |
|/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | hot-fix new-ui - default to an object if identities is undefined | frankiebee | 2018-04-05 | 1 | -1/+2 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Don't prevent user from setting an eth address in to field if there is no ↵ | Dan | 2018-04-05 | 1 | -2/+2 |
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ens support. | ||||
* | | | | | | | | | | | | Merge pull request #3834 from MetaMask/3734 | kumavis | 2018-04-04 | 2 | -15/+35 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Address Add Token design feedback | ||||
| * | | | | | | | | | | | | Address feedback | David Yoo | 2018-04-04 | 2 | -8/+24 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Address Add Token design feedback | David Yoo | 2018-04-03 | 2 | -7/+11 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | app - warn on fetch errors instead of spamming sentry | kumavis | 2018-04-04 | 1 | -12/+9 |
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | build - correctly set METAMASK_ENV via envify | kumavis | 2018-04-04 | 1 | -1/+1 |
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens | kumavis | 2018-04-03 | 3 | -16/+100 |
|\| | | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #3825 from danjm/i3668-warnusertxsimulationfails | Thomas Huang | 2018-04-03 | 3 | -16/+100 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add simulation failure errors while improve send error handling on confirm screen | ||||
| | * | | | | | | | | | | Adds simulation failure error messages to confirm screen. | Dan | 2018-04-03 | 3 | -0/+41 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | UpdateSendErrors only called when balance defined, recalled if balance updates. | Dan | 2018-04-03 | 2 | -16/+59 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens | kumavis | 2018-04-03 | 9 | -33/+198 |
|\| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Ensure txParams are prefixed with 0x when sending. | Dan | 2018-04-03 | 1 | -0/+4 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | identicon - set blockies height and width to identicon diameter | kumavis | 2018-03-31 | 1 | -3/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #3774 from danjm/i3686-txparamundefined-sigrequestsintxlist | kumavis | 2018-03-31 | 2 | -9/+17 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix display of unapprovedMgs in txList; fix txParams undefined errors | ||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into i3686-txparamundefined-sigrequestsintxlist | Dan | 2018-03-30 | 72 | -452/+818 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Ensure correct address used when rendering transfer transactions. | Dan | 2018-03-29 | 1 | -1/+2 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Fix display of unapprovedMessages in txList (old and new ui); includes fix ↵ | Dan | 2018-03-28 | 2 | -9/+16 |
| | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of undefined txParams. | ||||
| * | | | | | | | | | | | Merge pull request #3762 from danjm/i3471-checkbalanceonconfirmscreen | kumavis | 2018-03-31 | 6 | -21/+175 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | Checking for sufficient balance in tx confirmation screen | ||||
| | * | | | | | | | | | | Fix lint and tests | Dan | 2018-03-30 | 2 | -4/+4 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Merge branch 'master' into i3471-checkbalanceonconfirmscreen | Dan | 2018-03-30 | 72 | -451/+817 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | |||||
| | * | | | | | | | | | | Show insufficient funds on confirm screen on first render. | Dan | 2018-03-30 | 2 | -1/+21 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Confirm send token detects if balance is sufficient for gas. | Dan | 2018-03-28 | 1 | -0/+3 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Merge branch 'master' into i3471-checkbalanceonconfirmscreen | kumavis | 2018-03-28 | 81 | -572/+722 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | |||||
| | * | | | | | | | | | | Confirm send token detects if balance is sufficient for gas. | Dan | 2018-03-28 | 2 | -7/+56 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Checking for sufficient balance in confirm ether screen; includes error ↵ | Dan | 2018-03-28 | 4 | -15/+97 |
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | messages for user. |