Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into i3580-InternationalizeCurrency | Dan | 2018-04-10 | 1 | -7/+21 |
|\ | |||||
| * | Fix integration tests | Alexander Tseung | 2018-04-07 | 1 | -1/+3 |
| | | |||||
| * | 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. | ||||
| * | 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 | 1 | -1/+2 |
| |\ | | | | | | | | | | cb-254 | ||||
| | * | hot-fix new-ui - default to an object if identities is undefined | frankiebee | 2018-04-05 | 1 | -1/+2 |
| | | | |||||
| * | | Fix merge conflicts. Modify send workflow | Alexander Tseung | 2018-04-03 | 1 | -4/+106 |
| |\| | |||||
| * | | Fix merge conflicts | Alexander Tseung | 2018-03-31 | 1 | -10/+16 |
| |\ \ | |||||
| * \ \ | Fix i18n merge conflicts | Alexander Tseung | 2018-03-30 | 1 | -11/+10 |
| |\ \ \ | |||||
| * \ \ \ | Fix merge conflicts | Alexander Tseung | 2018-03-27 | 1 | -64/+118 |
| |\ \ \ \ | |||||
| * | | | | | Fix lint errors | Alexander Tseung | 2018-02-02 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254 | Alexander Tseung | 2018-01-30 | 1 | -23/+5 |
| |\ \ \ \ \ | |||||
| * | | | | | | Add react-router to allow use of the browser back button | Alexander Tseung | 2017-12-15 | 1 | -4/+17 |
| | | | | | | | |||||
* | | | | | | | Internationalize converted value in confirm screens | Dan | 2018-04-10 | 1 | -2/+17 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Adds simulation failure error messages to confirm screen. | Dan | 2018-04-03 | 1 | -0/+15 |
| | | | | | | |||||
* | | | | | | UpdateSendErrors only called when balance defined, recalled if balance updates. | Dan | 2018-04-03 | 1 | -8/+29 |
| | | | | | | |||||
* | | | | | | Fix lint and tests | Dan | 2018-03-30 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | Merge branch 'master' into i3471-checkbalanceonconfirmscreen | Dan | 2018-03-30 | 1 | -10/+16 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Removes t from props via metamask-connect and instead places it on context ↵ | Dan | 2018-03-29 | 1 | -10/+16 |
| | |_|_|/ | |/| | | | | | | | | | | | | | via a provider. | ||||
* | | | | | Show insufficient funds on confirm screen on first render. | Dan | 2018-03-30 | 1 | -0/+12 |
| | | | | | |||||
* | | | | | Merge branch 'master' into i3471-checkbalanceonconfirmscreen | kumavis | 2018-03-28 | 1 | -13/+12 |
|\| | | | | |||||
| * | | | | Correct connect reference in confirm-send-ether, confirm-deploy-contract, ↵ | Dan | 2018-03-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | network-display. | ||||
| * | | | | Missed modifications of t() in merge resolution. | Dan | 2018-03-22 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Merge branch 'master' into i18n-translator-redux | Dan | 2018-03-22 | 1 | -177/+164 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| * | | | | i18n redux solution doesn't require importing t() and passing state to each ↵ | Dan | 2018-03-22 | 1 | -10/+9 |
| | | | | | | | | | | | | | | | | | | | | t() call; t is just available on props. | ||||
| * | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-03-21 | 1 | -11/+78 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | i18n-translator-redux | ||||
| * | | | | | Fixed t() calls where localeMessages is missing; and fix incorrect connect ↵ | Dan | 2018-03-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | reference. | ||||
| * | | | | | Merge branch 'master' into i18n-translator-redux | Dan | 2018-03-20 | 1 | -159/+162 |
| |\ \ \ \ \ | |||||
| * | | | | | | Handle i18n with redux. | Dan | 2018-03-16 | 1 | -9/+9 |
| | | | | | | | |||||
| * | | | | | | i18n - load locales manually | kumavis | 2018-03-15 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Confirm send token detects if balance is sufficient for gas. | Dan | 2018-03-28 | 1 | -2/+2 |
| | | | | | | | |||||
* | | | | | | | Checking for sufficient balance in confirm ether screen; includes error ↵ | Dan | 2018-03-28 | 1 | -4/+58 |
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | | messages for user. | ||||
* | | | | | | Update confirm transaction screen | Alexander Tseung | 2018-03-21 | 1 | -175/+161 |
| |_|/ / / |/| | | | | |||||
* | | | | | Merge branch 'master' into retry-tx-refractor | Dan | 2018-03-20 | 1 | -163/+166 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Fix styling on confirm-send-ether and confirm-send-token (#3600) | Alexander Tseung | 2018-03-17 | 1 | -158/+162 |
| |/ / / | |||||
* | | | | Set retry gasPrice to forceGasMin on confirm screen in cases where gas is ↵ | Dan | 2018-03-15 | 1 | -2/+17 |
| | | | | | | | | | | | | | | | | not edited. | ||||
* | | | | Force gas min has correct precision and is set when editing gas if max. | Dan | 2018-03-15 | 1 | -3/+1 |
| | | | | |||||
* | | | | Ensure changes from customize gas modal opened from confirm screen are ↵ | Dan | 2018-03-15 | 1 | -6/+4 |
| | | | | | | | | | | | | | | | | captured for non-tx transactions. | ||||
* | | | | Revert 'Set txMeta.time to reflect time of tx approval.' | Dan | 2018-03-15 | 1 | -3/+3 |
| | | | | |||||
* | | | | Merge branch 'master' into retry-tx-refractor | Dan | 2018-03-14 | 1 | -10/+11 |
|\| | | | |||||
| * | | | Merge branch 'master' into i18n | Dan | 2018-03-07 | 1 | -9/+7 |
| |\ \ \ | |||||
| * | | | | complete i18n across new UI | Nick Doiron | 2018-01-30 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | separate out cross-browser i18n for extensions | Nick Doiron | 2018-01-25 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | better organization of locale file; i18n in more view files | Nick Doiron | 2018-01-24 | 1 | -9/+9 |
| | |_|/ | |/| | | |||||
* | | | | Fix more lint errors. | Dan | 2018-03-14 | 1 | -1/+0 |
| | | | | |||||
* | | | | Remove unnecessary addition of nonce to state. | Dan | 2018-03-14 | 1 | -3/+0 |
| | | | | |||||
* | | | | Use new submittedTime field to correctly show retry button in old and new ui. | Dan | 2018-03-14 | 1 | -1/+1 |
| | | | | |||||
* | | | | Set txMeta.time to reflect time of tx approval. | Dan | 2018-03-13 | 1 | -3/+3 |
| | | | | |||||
* | | | | Improve phrasing of copy. | Dan | 2018-03-13 | 1 | -1/+1 |
| | | | | |||||
* | | | | Fix gas calculation and nonce / forceGasMin state setting errors; retry ↵ | Dan | 2018-03-13 | 1 | -20/+32 |
| | | | | | | | | | | | | | | | | button shows on correct tx. | ||||
* | | | | Lint fixes. | Dan | 2018-03-09 | 1 | -2/+0 |
| | | | | |||||
* | | | | Adds inline opening of gas customization to confirm-send-ether screen. | Dan | 2018-03-09 | 1 | -8/+40 |
| | | | | |||||
* | | | | Retry transaction logic added to tx-list-item, confirm-send-ether, ↵ | Dan | 2018-03-09 | 1 | -1/+19 |
| |/ / |/| | | | | | | | | customize-gas-modal, and dependents. | ||||
* | | | Updates the styling of confirm send ether and token screens. (#3235) | Dan J Miller | 2018-02-13 | 1 | -9/+7 |
|/ / | |||||
* | | Update styling for buttons, font weights | Alexander Tseung | 2018-01-12 | 1 | -2/+2 |
| | | |||||
* | | Adds updateTransaction to background and used it to update after editing in ↵ | Dan | 2017-12-21 | 1 | -27/+2 |
| | | | | | | | | send-v2. | ||||
* | | Canceled, edited transactions show edited amount. | Dan | 2017-12-21 | 1 | -1/+8 |
|/ | |||||
* | Create single action for updating all of send in redux state. | Dan | 2017-11-15 | 1 | -6/+9 |
| | |||||
* | Fix lint errors. | Dan | 2017-11-15 | 1 | -10/+9 |
| | |||||
* | Allow editing of send ether. | Dan | 2017-11-15 | 1 | -6/+48 |
| | |||||
* | Change min gas price to 0.1 GWEI | Dan | 2017-10-27 | 1 | -4/+2 |
| | |||||
* | Fix alignment on right arrow of confirm tx screens | Chi Kei Chan | 2017-10-25 | 1 | -1/+1 |
| | |||||
* | Improve customize gas modal error handling | Dan | 2017-10-24 | 1 | -1/+1 |
| | |||||
* | Fix Conversions bugs; Fiat value bugs | Chi Kei Chan | 2017-10-21 | 1 | -1/+1 |
| | |||||
* | Get currency from state in account details, send and confirm screens. | Dan | 2017-10-20 | 1 | -23/+25 |
| | |||||
* | Confirm eth v2 | Chi Kei Chan | 2017-10-11 | 1 | -19/+19 |
| | |||||
* | Always set currency to USD on app mount | Chi Kei Chan | 2017-09-29 | 1 | -1/+0 |
| | |||||
* | Add Confirm Send token screen | Chi Kei Chan | 2017-09-23 | 1 | -1/+1 |
| | |||||
* | Refactor Confirmation Tx to render different screen | Chi Kei Chan | 2017-09-22 | 1 | -0/+446 |