aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components/pending-tx
Commit message (Expand)AuthorAgeFilesLines
* fix default importtrejgun2018-06-232-2/+2
* refactor gas-fee-display componenttrejgun2018-06-212-2/+2
* Access correct property from state in confirm screen components gatherTxMeta()Dan2018-06-082-2/+2
* Merge branch 'develop' into i3725-refactor-send-component-Dan2018-06-013-40/+82
|\
| * Prevent loading screen from overlaying the app bar (#4417)Alexander Tseung2018-05-311-4/+1
| * Add notification for dropped retry transactions (#4363)Alexander Tseung2018-05-302-36/+81
* | Display correct titles and subtitles on send token and editing send transacti...Dan2018-05-251-1/+1
* | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-05-241-1/+13
|\|
| * Fix account and network dropdowns in confirm screenAlexander Tseung2018-05-151-1/+13
| * Merge pull request #4156 from MetaMask/i4010-spinnerkumavis2018-05-031-1/+1
| |\
| | * Fix styling of the app spinnerAlexander Tseung2018-05-011-1/+1
| * | Convert decimals to string in getSymbolAndDecimals; return null for symbol or...Dan2018-04-281-17/+7
| * | Wraps calls to symbol() and decimals() in try catchDan2018-04-281-11/+9
| |/
* | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-05-141-26/+14
* | Rename ducks/send.js to ducks/send.duck.jsDan2018-05-142-2/+2
* | Unit tests for containers, utils and selectors in send_/Dan2018-05-053-9/+9
* | Further refactors; includes refactor of send-v2.js and associated containerDan2018-04-302-2/+10
* | Fixes to get tests passing.Dan2018-04-272-6/+6
|/
* Fix spinner layoutAlexander Tseung2018-04-181-2/+5
* Fix BigNumber exception in confirm-send-etherAlexander Tseung2018-04-181-3/+25
* Merge branch 'master' into i3580-InternationalizeCurrencyDan Finlay2018-04-181-6/+2
|\
| * Fetch token prices based on contract addressbitpshr2018-04-161-6/+2
* | Merge branch 'master' into i3580-InternationalizeCurrencyDan2018-04-102-11/+39
|\|
| * Fix integration testsAlexander Tseung2018-04-072-2/+6
| * Fix editing transactionAlexander Tseung2018-04-061-2/+1
| * Revert "commit"Alexander Tseung2018-04-061-1/+2
| * commitAlexander Tseung2018-04-061-2/+1
| * Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-051-1/+2
| |\
| | * hot-fix new-ui - default to an object if identities is undefinedfrankiebee2018-04-051-1/+2
| * | Fix merge conflicts. Modify send workflowAlexander Tseung2018-04-032-11/+206
| |\|
| * | Fix merge conflictsAlexander Tseung2018-03-314-43/+59
| |\ \
| * \ \ Fix i18n merge conflictsAlexander Tseung2018-03-304-48/+48
| |\ \ \
| * \ \ \ Fix merge conflictsAlexander Tseung2018-03-274-459/+598
| |\ \ \ \
| * | | | | Fix react-router related exceptionsAlexander Tseung2018-02-101-1/+1
| * | | | | Fix lint errorsAlexander Tseung2018-02-021-1/+1
| * | | | | Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254Alexander Tseung2018-01-302-60/+11
| |\ \ \ \ \
| * | | | | | Add react-router to allow use of the browser back buttonAlexander Tseung2017-12-152-7/+32
* | | | | | | Internationalize converted value in confirm screensDan2018-04-102-4/+36
| |_|_|_|_|/ |/| | | | |
* | | | | | 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 vi...Dan2018-03-294-43/+59
| | |_|_|/ | |/| | |
* | | | | 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, net...Dan2018-03-222-2/+2
| * | | | 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 t...Dan2018-03-223-41/+38
| * | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-tra...kumavis2018-03-212-23/+158
| |\ \ \ \
| * | | | | Lint fixes.Dan2018-03-202-2/+4
| * | | | | Fixed t() calls where localeMessages is missing; and fix incorrect connect re...Dan2018-03-204-4/+4
| * | | | | 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 messa...Dan2018-03-281-4/+58
| |_|_|/ / / |/| | | | |
* | | | | | 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 https://github.com/danjm/m...kumavis2018-03-222-4/+11
|\ \ \ \ \ \
| * | | | | | Identify token transactions by method names token data, and not just whether ...Dan2018-03-202-4/+11
| | |/ / / / | |/| | | |
* | | | | | 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 not...Dan2018-03-152-4/+34
* | | | 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 captur...Dan2018-03-152-12/+8
* | | | 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 butto...Dan2018-03-131-20/+32
* | | | 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, customize-...Dan2018-03-091-1/+19
| |/ / |/| |
* | | 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 s...Dan2017-12-212-67/+4
* | 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 updates...Dan2017-11-071-2/+4
* 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 14:02:00 +0800