Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Prevent loading screen from overlaying the app bar (#4417) | Alexander Tseung | 2018-05-31 | 1 | -4/+1 |
| | |||||
* | Add notification for dropped retry transactions (#4363) | Alexander Tseung | 2018-05-30 | 2 | -36/+81 |
| | |||||
* | Fix account and network dropdowns in confirm screen | Alexander Tseung | 2018-05-15 | 1 | -1/+13 |
| | |||||
* | Merge pull request #4156 from MetaMask/i4010-spinner | kumavis | 2018-05-03 | 1 | -1/+1 |
|\ | | | | | Fix styling of the app spinner | ||||
| * | Fix styling of the app spinner | Alexander Tseung | 2018-05-01 | 1 | -1/+1 |
| | | |||||
* | | Convert decimals to string in getSymbolAndDecimals; return null for symbol ↵ | Dan | 2018-04-28 | 1 | -17/+7 |
| | | | | | | | | or decimals. | ||||
* | | Wraps calls to symbol() and decimals() in try catch | Dan | 2018-04-28 | 1 | -11/+9 |
|/ | |||||
* | Fix spinner layout | Alexander Tseung | 2018-04-18 | 1 | -2/+5 |
| | |||||
* | Fix BigNumber exception in confirm-send-ether | Alexander Tseung | 2018-04-18 | 1 | -3/+25 |
| | |||||
* | Merge branch 'master' into i3580-InternationalizeCurrency | Dan Finlay | 2018-04-18 | 1 | -6/+2 |
|\ | |||||
| * | Fetch token prices based on contract address | bitpshr | 2018-04-16 | 1 | -6/+2 |
| | | |||||
* | | Merge branch 'master' into i3580-InternationalizeCurrency | Dan | 2018-04-10 | 2 | -11/+39 |
|\| | |||||
| * | Fix integration tests | Alexander Tseung | 2018-04-07 | 2 | -2/+6 |
| | | |||||
| * | 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 | 2 | -11/+206 |
| |\| | |||||
| * | | Fix merge conflicts | Alexander Tseung | 2018-03-31 | 4 | -43/+59 |
| |\ \ | |||||
| * \ \ | Fix i18n merge conflicts | Alexander Tseung | 2018-03-30 | 4 | -48/+48 |
| |\ \ \ | |||||
| * \ \ \ | Fix merge conflicts | Alexander Tseung | 2018-03-27 | 4 | -459/+598 |
| |\ \ \ \ | |||||
| * | | | | | Fix react-router related exceptions | Alexander Tseung | 2018-02-10 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | 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 | 2 | -60/+11 |
| |\ \ \ \ \ | |||||
| * | | | | | | Add react-router to allow use of the browser back button | Alexander Tseung | 2017-12-15 | 2 | -7/+32 |
| | | | | | | | |||||
* | | | | | | | Internationalize converted value in confirm screens | Dan | 2018-04-10 | 2 | -4/+36 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Adds simulation failure error messages to confirm screen. | Dan | 2018-04-03 | 2 | -0/+30 |
| | | | | | | |||||
* | | | | | | UpdateSendErrors only called when balance defined, recalled if balance updates. | Dan | 2018-04-03 | 2 | -16/+59 |
| | | | | | | |||||
* | | | | | | Fix lint and tests | Dan | 2018-03-30 | 2 | -4/+4 |
| | | | | | | |||||
* | | | | | | Merge branch 'master' into i3471-checkbalanceonconfirmscreen | Dan | 2018-03-30 | 4 | -43/+59 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Removes t from props via metamask-connect and instead places it on context ↵ | Dan | 2018-03-29 | 4 | -43/+59 |
| | |_|_|/ | |/| | | | | | | | | | | | | | via a provider. | ||||
* | | | | | Show insufficient funds on confirm screen on first render. | Dan | 2018-03-30 | 2 | -1/+21 |
| | | | | | |||||
* | | | | | Merge branch 'master' into i3471-checkbalanceonconfirmscreen | kumavis | 2018-03-28 | 4 | -52/+52 |
|\| | | | | |||||
| * | | | | Remove comments and console.logs | Dan | 2018-03-27 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Correct reprice title and subtitle key names. | Dan | 2018-03-22 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Correct connect reference in confirm-send-ether, confirm-deploy-contract, ↵ | Dan | 2018-03-22 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | network-display. | ||||
| * | | | | Lint fixes | Dan | 2018-03-22 | 2 | -3/+4 |
| | | | | | |||||
| * | | | | Missed modifications of t() in merge resolution. | Dan | 2018-03-22 | 2 | -2/+0 |
| | | | | | |||||
| * | | | | Merge branch 'master' into i18n-translator-redux | Dan | 2018-03-22 | 4 | -188/+190 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| * | | | | i18n redux solution doesn't require importing t() and passing state to each ↵ | Dan | 2018-03-22 | 3 | -41/+38 |
| | | | | | | | | | | | | | | | | | | | | t() call; t is just available on props. | ||||
| * | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-03-21 | 2 | -23/+158 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | i18n-translator-redux | ||||
| * | | | | | Lint fixes. | Dan | 2018-03-20 | 2 | -2/+4 |
| | | | | | | |||||
| * | | | | | Fixed t() calls where localeMessages is missing; and fix incorrect connect ↵ | Dan | 2018-03-20 | 4 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | reference. | ||||
| * | | | | | Merge branch 'master' into i18n-translator-redux | Dan | 2018-03-20 | 3 | -517/+523 |
| |\ \ \ \ \ | |||||
| * | | | | | | Handle i18n with redux. | Dan | 2018-03-16 | 3 | -36/+36 |
| | | | | | | | |||||
| * | | | | | | i18n - load locales manually | kumavis | 2018-03-15 | 3 | -3/+3 |
| | | | | | | | |||||
* | | | | | | | 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 | 1 | -4/+58 |
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | | messages for user. | ||||
* | | | | | | ui - tx conf - only show special token tx conf screen for token send | kumavis | 2018-03-22 | 1 | -4/+8 |
| | | | | | | |||||
* | | | | | | Merge branch 'i3554-fix-editing-dapp-token-txs' of ↵ | kumavis | 2018-03-22 | 2 | -4/+11 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | https://github.com/danjm/metamask-extension into danjm-i3554-fix-editing-dapp-token-txs | ||||
| * | | | | | | Identify token transactions by method names token data, and not just whether ↵ | Dan | 2018-03-20 | 2 | -4/+11 |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | they've been add via metamask. | ||||
* | | | | | | Update confirm transaction screen | Alexander Tseung | 2018-03-21 | 2 | -178/+168 |
| |_|/ / / |/| | | | | |||||
* | | | | | Merge branch 'master' into retry-tx-refractor | Dan | 2018-03-20 | 3 | -522/+528 |
|\| | | | | |||||
| * | | | | Fix styling on confirm-send-ether and confirm-send-token (#3600) | Alexander Tseung | 2018-03-17 | 3 | -225/+231 |
| | | | | | |||||
| * | | | | Update Confirm Contract screen (#3597) | Alexander Tseung | 2018-03-17 | 1 | -293/+294 |
| |/ / / | |||||
* | | | | Set retry gasPrice to forceGasMin on confirm screen in cases where gas is ↵ | Dan | 2018-03-15 | 2 | -4/+34 |
| | | | | | | | | | | | | | | | | not edited. | ||||
* | | | | Force gas min has correct precision and is set when editing gas if max. | Dan | 2018-03-15 | 2 | -6/+2 |
| | | | | |||||
* | | | | Ensure changes from customize gas modal opened from confirm screen are ↵ | Dan | 2018-03-15 | 2 | -12/+8 |
| | | | | | | | | | | | | | | | | 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 | 3 | -43/+46 |
|\| | | | |||||
| * | | | Merge branch 'master' into i18n | Thomas Huang | 2018-03-12 | 1 | -2/+2 |
| |\ \ \ | |||||
| | * | | | Add empty object default value for tokenData (#3493) | Alexander Tseung | 2018-03-09 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge branch 'master' into i18n | Dan | 2018-03-07 | 2 | -17/+13 |
| |\| | | | |||||
| * | | | | complete i18n across new UI | Nick Doiron | 2018-01-30 | 3 | -16/+16 |
| | | | | | |||||
| * | | | | separate out cross-browser i18n for extensions | Nick Doiron | 2018-01-25 | 3 | -0/+3 |
| | | | | | |||||
| * | | | | better organization of locale file; i18n in more view files | Nick Doiron | 2018-01-24 | 3 | -32/+32 |
| | |_|/ | |/| | | |||||
* | | | | Fix more lint errors. | Dan | 2018-03-14 | 2 | -9/+1 |
| | | | | |||||
* | | | | Remove unnecessary addition of nonce to state. | Dan | 2018-03-14 | 1 | -3/+0 |
| | | | | |||||
* | | | | Make token confirmations compatible. | Dan | 2018-03-14 | 1 | -11/+74 |
| | | | | |||||
* | | | | 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 | 2 | -18/+14 |
|/ / | |||||
* | | Update styling for buttons, font weights | Alexander Tseung | 2018-01-12 | 2 | -4/+4 |
| | | |||||
* | | Lint fixes. | Dan | 2017-12-21 | 1 | -2/+1 |
| | | |||||
* | | Adds updateTransaction to background and used it to update after editing in ↵ | Dan | 2017-12-21 | 2 | -67/+4 |
| | | | | | | | | send-v2. | ||||
* | | Canceled, edited transactions show edited amount. | Dan | 2017-12-21 | 2 | -2/+16 |
|/ | |||||
* | Fix edit to field bug. (#2738) | Dan J Miller | 2017-12-13 | 1 | -6/+7 |
| | |||||
* | Create single action for updating all of send in redux state. | Dan | 2017-11-15 | 2 | -12/+18 |
| | |||||
* | Allow editing of token transactions. | Dan | 2017-11-15 | 1 | -8/+87 |
| | |||||
* | Fix lint errors. | Dan | 2017-11-15 | 1 | -10/+9 |
| | |||||
* | Allow editing of send ether. | Dan | 2017-11-15 | 1 | -6/+48 |
| | |||||
* | Token balance in send state; validating sufficient tokens, validation ↵ | Dan | 2017-11-07 | 1 | -2/+4 |
| | | | | updates on 'from' switching. | ||||
* | More lint fixes | Dan | 2017-11-02 | 1 | -1/+1 |
| | |||||
* | Lint fixes for NewUI-flat. | Dan | 2017-11-02 | 1 | -4/+0 |
| | |||||
* | Change min gas price to 0.1 GWEI | Dan | 2017-10-27 | 3 | -12/+6 |
| | |||||
* | Fix alignment on right arrow of confirm tx screens | Chi Kei Chan | 2017-10-25 | 2 | -2/+2 |
| | |||||
* | Improve customize gas modal error handling | Dan | 2017-10-24 | 1 | -1/+1 |
| | |||||
* | Improve precision in send and confirm. | Dan | 2017-10-24 | 1 | -1/+1 |
| | |||||
* | Fix Conversions bugs; Fiat value bugs | Chi Kei Chan | 2017-10-21 | 2 | -2/+4 |
| | |||||
* | Add resiliency to confirm-send-token | Chi Kei Chan | 2017-10-21 | 1 | -5/+5 |
| | |||||
* | Fixes regression in confirm-send-token | Dan | 2017-10-21 | 1 | -2/+4 |
| | |||||
* | Merge branch 'NewUI-flat' into MM-128-get-currentCurrency-from-state | Chi Kei Chan | 2017-10-20 | 1 | -17/+34 |
|\ | |||||
| * | Identicon in send token show who you are sending to, not the token's identicon. | Dan | 2017-10-20 | 1 | -3/+3 |
| | | |||||
| * | Fix handling of arithmetic on token gas in confirm-send-token. | Dan | 2017-10-20 | 1 | -16/+33 |
| | | |||||
* | | Get currency from state in account details, send and confirm screens. | Dan | 2017-10-20 | 4 | -50/+53 |
|/ | |||||
* | Fix recipient on send token | Chi Kei Chan | 2017-10-11 | 1 | -2/+4 |
| | |||||
* | Confirm Token and Confirm Contract v2 | Chi Kei Chan | 2017-10-11 | 2 | -36/+39 |
| | |||||
* | 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 | 3 | -3/+1 |
| | |||||
* | Implement Confirm Deploy Contract screen | Chi Kei Chan | 2017-09-27 | 2 | -0/+350 |
| | |||||
* | Add Confirm Send token screen | Chi Kei Chan | 2017-09-23 | 3 | -18/+451 |
| | |||||
* | Refactor Confirmation Tx to render different screen | Chi Kei Chan | 2017-09-22 | 2 | -0/+549 |