aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components/pending-tx/confirm-send-token.js
Commit message (Expand)AuthorAgeFilesLines
* Merge developAlexander Tseung2018-07-181-696/+0
* Remove send_ directory, revert to just having sendDan2018-07-161-3/+3
* fix default importtrejgun2018-06-231-1/+1
* refactor gas-fee-display componenttrejgun2018-06-211-1/+1
* Access correct property from state in confirm screen components gatherTxMeta()Dan2018-06-081-1/+1
* Merge branch 'develop' into i3725-refactor-send-component-Dan2018-06-011-13/+44
|\
| * Add notification for dropped retry transactions (#4363)Alexander Tseung2018-05-301-13/+44
* | Display correct titles and subtitles on send token and editing send transacti...Dan2018-05-251-1/+1
* | Rename ducks/send.js to ducks/send.duck.jsDan2018-05-141-1/+1
* | Unit tests for containers, utils and selectors in send_/Dan2018-05-051-4/+4
* | Further refactors; includes refactor of send-v2.js and associated containerDan2018-04-301-1/+5
* | Fixes to get tests passing.Dan2018-04-271-2/+2
|/
* 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-101-4/+18
|\|
| * Fix integration testsAlexander Tseung2018-04-071-1/+3
| * Fix merge conflicts. Modify send workflowAlexander Tseung2018-04-031-7/+100
| |\
| * \ Fix merge conflictsAlexander Tseung2018-03-311-18/+24
| |\ \
| * \ \ Fix i18n merge conflictsAlexander Tseung2018-03-301-20/+21
| |\ \ \
| * \ \ \ Fix merge conflictsAlexander Tseung2018-03-271-95/+164
| |\ \ \ \
| * | | | | Fix react-router related exceptionsAlexander Tseung2018-02-101-1/+1
| * | | | | Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254Alexander Tseung2018-01-301-37/+6
| |\ \ \ \ \
| * | | | | | Add react-router to allow use of the browser back buttonAlexander Tseung2017-12-151-3/+15
* | | | | | | Internationalize converted value in confirm screensDan2018-04-101-2/+19
| |_|_|_|_|/ |/| | | | |
* | | | | | Adds simulation failure error messages to confirm screen.Dan2018-04-031-0/+15
* | | | | | UpdateSendErrors only called when balance defined, recalled if balance updates.Dan2018-04-031-8/+30
* | | | | | Fix lint and testsDan2018-03-301-2/+2
* | | | | | Merge branch 'master' into i3471-checkbalanceonconfirmscreenDan2018-03-301-18/+24
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Removes t from props via metamask-connect and instead places it on context vi...Dan2018-03-291-18/+24
| | |_|_|/ | |/| | |
* | | | | Show insufficient funds on confirm screen on first render.Dan2018-03-301-1/+9
* | | | | Merge branch 'master' into i3471-checkbalanceonconfirmscreenkumavis2018-03-281-22/+23
|\| | | |
| * | | | Remove comments and console.logsDan2018-03-271-1/+1
| * | | | Correct reprice title and subtitle key names.Dan2018-03-221-2/+2
| * | | | Lint fixesDan2018-03-221-1/+1
| * | | | Merge branch 'master' into i18n-translator-reduxDan2018-03-221-0/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | i18n redux solution doesn't require importing t() and passing state to each t...Dan2018-03-221-18/+17
| * | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-tra...kumavis2018-03-211-12/+80
| |\ \ \ \
| * | | | | Lint fixes.Dan2018-03-201-1/+2
| * | | | | Fixed t() calls where localeMessages is missing; and fix incorrect connect re...Dan2018-03-201-1/+1
| * | | | | Merge branch 'master' into i18n-translator-reduxDan2018-03-201-65/+67
| |\ \ \ \ \
| * | | | | | Handle i18n with redux.Dan2018-03-161-15/+15
| * | | | | | i18n - load locales manuallykumavis2018-03-151-1/+1
* | | | | | | Confirm send token detects if balance is sufficient for gas.Dan2018-03-281-5/+54
| |_|_|/ / / |/| | | | |
* | | | | | Merge branch 'i3554-fix-editing-dapp-token-txs' of https://github.com/danjm/m...kumavis2018-03-221-0/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Identify token transactions by method names token data, and not just whether ...Dan2018-03-201-0/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'master' into retry-tx-refractorDan2018-03-201-66/+68
|\| | | |
| * | | | Fix styling on confirm-send-ether and confirm-send-token (#3600)Alexander Tseung2018-03-171-66/+68
| |/ / /
* | | | Set retry gasPrice to forceGasMin on confirm screen in cases where gas is not...Dan2018-03-151-2/+17
* | | | Force gas min has correct precision and is set when editing gas if max.Dan2018-03-151-3/+1
* | | | Ensure changes from customize gas modal opened from confirm screen are captur...Dan2018-03-151-6/+4
* | | | Merge branch 'master' into retry-tx-refractorDan2018-03-141-19/+20
|\| | |
| * | | 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-071-8/+6
| |\| | |
| * | | | complete i18n across new UINick Doiron2018-01-301-7/+7
| * | | | separate out cross-browser i18n for extensionsNick Doiron2018-01-251-0/+1
| * | | | better organization of locale file; i18n in more view filesNick Doiron2018-01-241-13/+13
| | |_|/ | |/| |
* | | | Fix more lint errors.Dan2018-03-141-8/+1
* | | | Make token confirmations compatible.Dan2018-03-141-11/+74
| |/ / |/| |
* | | Updates the styling of confirm send ether and token screens. (#3235)Dan J Miller2018-02-131-9/+7
|/ /
* | Update styling for buttons, font weightsAlexander Tseung2018-01-121-2/+2
* | Lint fixes.Dan2017-12-211-2/+1
* | Adds updateTransaction to background and used it to update after editing in s...Dan2017-12-211-40/+2
* | Canceled, edited transactions show edited amount.Dan2017-12-211-1/+8
|/
* 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-151-6/+9
* Allow editing of token transactions.Dan2017-11-151-8/+87
* 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-271-4/+2
* Fix alignment on right arrow of confirm tx screensChi Kei Chan2017-10-251-1/+1
* Improve precision in send and confirm.Dan2017-10-241-1/+1
* 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-201-12/+12
|/
* Fix recipient on send tokenChi Kei Chan2017-10-111-2/+4
* Confirm Token and Confirm Contract v2Chi Kei Chan2017-10-111-20/+22
* Add Confirm Send token screenChi Kei Chan2017-09-231-0/+394