aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components/pending-tx
Commit message (Collapse)AuthorAgeFilesLines
* Adds simulation failure error messages to confirm screen.Dan2018-04-032-0/+30
|
* UpdateSendErrors only called when balance defined, recalled if balance updates.Dan2018-04-032-16/+59
|
* Fix lint and testsDan2018-03-302-4/+4
|
* Merge branch 'master' into i3471-checkbalanceonconfirmscreenDan2018-03-304-43/+59
|\
| * Removes t from props via metamask-connect and instead places it on context ↵Dan2018-03-294-43/+59
| | | | | | | | via a provider.
* | Show insufficient funds on confirm screen on first render.Dan2018-03-302-1/+21
| |
* | Merge branch 'master' into i3471-checkbalanceonconfirmscreenkumavis2018-03-284-52/+52
|\|
| * Remove comments and console.logsDan2018-03-271-1/+1
| |
| * Correct reprice title and subtitle key names.Dan2018-03-221-2/+2
| |
| * Correct connect reference in confirm-send-ether, confirm-deploy-contract, ↵Dan2018-03-222-2/+2
| | | | | | | | network-display.
| * Lint fixesDan2018-03-222-3/+4
| |
| * Missed modifications of t() in merge resolution.Dan2018-03-222-2/+0
| |
| * Merge branch 'master' into i18n-translator-reduxDan2018-03-224-188/+190
| |\
| * | i18n redux solution doesn't require importing t() and passing state to each ↵Dan2018-03-223-41/+38
| | | | | | | | | | | | t() call; t is just available on props.
| * | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵kumavis2018-03-212-23/+158
| |\ \ | | | | | | | | | | | | i18n-translator-redux
| * | | Lint fixes.Dan2018-03-202-2/+4
| | | |
| * | | Fixed t() calls where localeMessages is missing; and fix incorrect connect ↵Dan2018-03-204-4/+4
| | | | | | | | | | | | | | | | reference.
| * | | Merge branch 'master' into i18n-translator-reduxDan2018-03-203-517/+523
| |\ \ \
| * | | | Handle i18n with redux.Dan2018-03-163-36/+36
| | | | |
| * | | | i18n - load locales manuallykumavis2018-03-153-3/+3
| | | | |
* | | | | Confirm send token detects if balance is sufficient for gas.Dan2018-03-282-7/+56
| | | | |
* | | | | Checking for sufficient balance in confirm ether screen; includes error ↵Dan2018-03-281-4/+58
| |_|_|/ |/| | | | | | | | | | | messages for user.
* | | | ui - tx conf - only show special token tx conf screen for token sendkumavis2018-03-221-4/+8
| | | |
* | | | Merge branch 'i3554-fix-editing-dapp-token-txs' of ↵kumavis2018-03-222-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 ↵Dan2018-03-202-4/+11
| | |/ / | |/| | | | | | | | | | they've been add via metamask.
* | | | Update confirm transaction screenAlexander Tseung2018-03-212-178/+168
| |_|/ |/| |
* | | Merge branch 'master' into retry-tx-refractorDan2018-03-203-522/+528
|\| |
| * | Fix styling on confirm-send-ether and confirm-send-token (#3600)Alexander Tseung2018-03-173-225/+231
| | |
| * | Update Confirm Contract screen (#3597)Alexander Tseung2018-03-171-293/+294
| |/
* | Set retry gasPrice to forceGasMin on confirm screen in cases where gas is ↵Dan2018-03-152-4/+34
| | | | | | | | not edited.
* | Force gas min has correct precision and is set when editing gas if max.Dan2018-03-152-6/+2
| |
* | Ensure changes from customize gas modal opened from confirm screen are ↵Dan2018-03-152-12/+8
| | | | | | | | captured for non-tx transactions.
* | Revert 'Set txMeta.time to reflect time of tx approval.'Dan2018-03-151-3/+3
| |
* | Merge branch 'master' into retry-tx-refractorDan2018-03-143-43/+46
|\|
| * Merge branch 'master' into i18nThomas Huang2018-03-121-2/+2
| |\
| | * Add empty object default value for tokenData (#3493)Alexander Tseung2018-03-091-2/+2
| | |
| * | Merge branch 'master' into i18nDan2018-03-072-17/+13
| |\|
| * | complete i18n across new UINick Doiron2018-01-303-16/+16
| | |
| * | separate out cross-browser i18n for extensionsNick Doiron2018-01-253-0/+3
| | |
| * | better organization of locale file; i18n in more view filesNick Doiron2018-01-243-32/+32
| | |
* | | Fix more lint errors.Dan2018-03-142-9/+1
| | |
* | | Remove unnecessary addition of nonce to state.Dan2018-03-141-3/+0
| | |
* | | Make token confirmations compatible.Dan2018-03-141-11/+74
| | |
* | | Use new submittedTime field to correctly show retry button in old and new ui.Dan2018-03-141-1/+1
| | |
* | | Set txMeta.time to reflect time of tx approval.Dan2018-03-131-3/+3
| | |
* | | Improve phrasing of copy.Dan2018-03-131-1/+1
| | |
* | | Fix gas calculation and nonce / forceGasMin state setting errors; retry ↵Dan2018-03-131-20/+32
| | | | | | | | | | | | button shows on correct tx.
* | | Lint fixes.Dan2018-03-091-2/+0
| | |
* | | Adds inline opening of gas customization to confirm-send-ether screen.Dan2018-03-091-8/+40
| | |
* | | Retry transaction logic added to tx-list-item, confirm-send-ether, ↵Dan2018-03-091-1/+19
| |/ |/| | | | | customize-gas-modal, and dependents.
* | Updates the styling of confirm send ether and token screens. (#3235)Dan J Miller2018-02-132-18/+14
|/
* Update styling for buttons, font weightsAlexander Tseung2018-01-122-4/+4
|
* Lint fixes.Dan2017-12-211-2/+1
|
* Adds updateTransaction to background and used it to update after editing in ↵Dan2017-12-212-67/+4
| | | | send-v2.
* Canceled, edited transactions show edited amount.Dan2017-12-212-2/+16
|
* Fix edit to field bug. (#2738)Dan J Miller2017-12-131-6/+7
|
* Create single action for updating all of send in redux state.Dan2017-11-152-12/+18
|
* Allow editing of token transactions.Dan2017-11-151-8/+87
|
* Fix lint errors.Dan2017-11-151-10/+9
|
* Allow editing of send ether.Dan2017-11-151-6/+48
|
* Token balance in send state; validating sufficient tokens, validation ↵Dan2017-11-071-2/+4
| | | | updates on 'from' switching.
* More lint fixesDan2017-11-021-1/+1
|
* Lint fixes for NewUI-flat.Dan2017-11-021-4/+0
|
* Change min gas price to 0.1 GWEIDan2017-10-273-12/+6
|
* Fix alignment on right arrow of confirm tx screensChi Kei Chan2017-10-252-2/+2
|
* Improve customize gas modal error handlingDan2017-10-241-1/+1
|
* Improve precision in send and confirm.Dan2017-10-241-1/+1
|
* Fix Conversions bugs; Fiat value bugsChi Kei Chan2017-10-212-2/+4
|
* Add resiliency to confirm-send-tokenChi Kei Chan2017-10-211-5/+5
|
* Fixes regression in confirm-send-tokenDan2017-10-211-2/+4
|
* Merge branch 'NewUI-flat' into MM-128-get-currentCurrency-from-stateChi Kei Chan2017-10-201-17/+34
|\
| * Identicon in send token show who you are sending to, not the token's identicon.Dan2017-10-201-3/+3
| |
| * Fix handling of arithmetic on token gas in confirm-send-token.Dan2017-10-201-16/+33
| |
* | Get currency from state in account details, send and confirm screens.Dan2017-10-204-50/+53
|/
* Fix recipient on send tokenChi Kei Chan2017-10-111-2/+4
|
* Confirm Token and Confirm Contract v2Chi Kei Chan2017-10-112-36/+39
|
* Confirm eth v2Chi Kei Chan2017-10-111-19/+19
|
* Always set currency to USD on app mountChi Kei Chan2017-09-293-3/+1
|
* Implement Confirm Deploy Contract screenChi Kei Chan2017-09-272-0/+350
|
* Add Confirm Send token screenChi Kei Chan2017-09-233-18/+451
|
* Refactor Confirmation Tx to render different screenChi Kei Chan2017-09-222-0/+549