aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/conf-tx.js
Commit message (Expand)AuthorAgeFilesLines
* Fix styling of the app spinnerAlexander Tseung2018-05-011-1/+1
* Require loglevel singleton in each module that uses itbitpshr2018-04-141-0/+1
* Fix transaction confirmationsAlexander Tseung2018-04-041-3/+16
* Fix merge conflicts. Modify send workflowAlexander Tseung2018-04-031-9/+16
|\
* | Fix lint errorsAlexander Tseung2018-04-031-4/+0
* | Fix merge conflictsAlexander Tseung2018-03-311-1/+1
|\|
| * Removes t from props via metamask-connect and instead places it on context vi...Dan2018-03-291-1/+1
* | Fix merge conflicts. Refactor renderPrimary into Home componentAlexander Tseung2018-03-311-9/+35
* | Fix i18n merge conflictsAlexander Tseung2018-03-301-1/+1
|\|
| * Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-tra...kumavis2018-03-211-0/+18
| |\
| * | Handle i18n with redux.Dan2018-03-161-1/+1
* | | Fix merge conflictsAlexander Tseung2018-03-271-13/+14
|\ \ \ | | |/ | |/|
| * | Take user home if an unapproved tx is dropped while they are viewing.Dan2018-03-211-0/+18
| |/
* | Checks if there is currently a send in progress before redirecting to default...Dan2018-02-011-3/+7
* | Fix merge conflicts from uat-nextAlexander Tseung2018-02-011-1/+0
|\|
| * Merge branch 'master' into uatThomas Huang2018-01-241-1/+0
| |\
| | * add a `x` close button to gas calc loding screen on conf-txfrankiebee2018-01-181-1/+5
| | * add a loading spinner to conf-tx viewfrankiebee2018-01-151-0/+6
* | | Add route for signature requestAlexander Tseung2017-12-151-17/+10
* | | Add react-router to allow use of the browser back buttonAlexander Tseung2017-12-151-10/+22
|/ /
* | More lint fixesDan2017-11-021-1/+1
* | Lint fixes for NewUI-flat.Dan2017-11-021-1/+1
* | Signature request fixes.Dan2017-10-261-1/+1
* | Signature RequestDan2017-10-261-13/+18
* | Fix loading animation not showing on network changeAlexander Tseung2017-10-201-2/+2
* | Merge branch 'NewUI-flat' into mergeChi Kei Chan2017-10-191-83/+69
|\ \ | |/ |/|
| * Merge branch 'master' into mmnChi Kei Chan2017-09-281-10/+36
| |\
| * \ Merge branch 'master' into nmChi Kei Chan2017-09-191-0/+7
| |\ \
| * | | Show loading on conf-tx until the pending tx is available.Dan2017-09-151-0/+1
| * | | Touch up transaction list item styles, remove main-content scroll bars, align...Dan2017-09-051-0/+9
| * | | Lint fixesDan2017-08-311-17/+13
| * | | Cleanup unnecessary pending tx-switching logicsdtsui2017-07-301-60/+19
* | | | Respect code styleSergey Ukustov2017-09-301-1/+1
* | | | Add eth_signTypedData handlerSergey Ukustov2017-09-301-2/+23
| |_|/ |/| |
* | | Add computed balance to account detail viewDan Finlay2017-09-141-1/+0
* | | Use computed balance for tx confirmationDan Finlay2017-09-141-1/+3
| |/ |/|
* | Show reject all only when tx count is > 1Kevin Serrano2017-09-121-0/+3
* | Convert icon to button.Kevin Serrano2017-09-081-12/+7
* | cancel all txsDavidNinja2017-08-151-0/+12
|/
* Lots of flex rearrangement on account detail viewDan Finlay2017-07-261-29/+19
* Fix referenceDan Finlay2017-07-211-1/+1
* Move responsive ui into its own folder for easier mergesDan Finlay2017-07-211-0/+213
* Make folder for responsive UIDan Finlay2017-07-041-213/+0
* Merge branch 'master' into gasupdaterDan Finlay2017-06-131-0/+1
|\
| * Dissallow transactions to be sent to 0x0000000000000000000000000000000000000000frankiebee2017-06-061-0/+1
* | Update gasblocklimit params with every block.Kevin Serrano2017-06-031-1/+3
|/
* Fix bug where edited gas parameters did not take effectDan Finlay2017-05-171-1/+1
* Fix fiat renderingDan Finlay2017-05-171-1/+3
* Remove redux dependency from eth-balance and its dependent treeDan Finlay2017-05-131-1/+3
* Fix linting warningsThomas Huang2017-04-271-2/+0
* Fix issue where stopPropagation didnt stop submitting the tx when clicking bu...frankiebee2017-04-241-1/+1
* Improve UI gas calculation logicDan Finlay2017-03-291-29/+1
* Fix tx selecting bugDan Finlay2017-03-251-2/+2
* Prevent default for reset and reject buttonsDan Finlay2017-03-241-0/+1
* Got basic validations workingDan Finlay2017-03-231-8/+14
* Fix loading indication for conf-tx viewDan Finlay2017-03-011-1/+1
* Use correct action to update and submit txDan Finlay2017-03-011-1/+1
* Fixed bug that made send screen sometimes transition to account detailDan Finlay2017-03-011-1/+2
* Fix infinite loop bugDan Finlay2017-03-011-0/+1
* Fix referenceDan Finlay2017-03-011-1/+1
* Emit updated tx values on accept clickDan Finlay2017-02-281-1/+13
* Merge branch 'master' into i765-gaslimitsDan Finlay2017-02-281-13/+37
|\
| * Fix cancel msg signing behavior.Dan Finlay2017-02-241-1/+7
| * Got personal_sign workingDan Finlay2017-02-241-1/+13
| * Add alternate UI for pending personal_sign messagesDan Finlay2017-02-241-5/+12
| * Add personal sign actions and templateDan Finlay2017-02-231-21/+20
* | Merge github.com:MetaMask/metamask-plugin into i765-gaslimitsKevin Serrano2017-02-241-0/+5
|\|
| * Fix UI Dev Mode for Tx ApprovalDan Finlay2017-02-211-0/+5
* | Broke hex decimal input into its own componentDan Finlay2017-02-181-1/+0
* | Change state to props, add modifiable fields.Kevin Serrano2017-02-181-19/+21
|/
* Merge branch 'dev' into messageManagerCleanUpFrankie2017-02-021-4/+4
|\
| * rename selectedAccount to selectedAddresskumavis2017-01-311-4/+4
* | Clean up message manger includes:Frankie2017-01-291-5/+5
|/
* fix baseFrankie2017-01-251-2/+2
* Fix issue where ConfTx view lets you approve txs when the account has insuffi...Frankie2017-01-251-1/+1
* Fix message signing UI renderingDan Finlay2017-01-171-5/+10
* Dont render conf-tx if their are no txParams to showFrankie2017-01-151-2/+4
* lintFrankie2017-01-141-1/+1
* Fix sorting and instances where something could be undefinedFrankie2017-01-121-1/+1
* Take some of the tx Logic out of the UI and create a visble state for pending...Frankie2017-01-121-10/+2
* quick typo fix.Kevin Serrano2017-01-071-2/+2
* Switch order of header and indicator.Kevin Serrano2017-01-061-1/+1
* Make network somewhat more modular, add new network indicator.Kevin Serrano2017-01-051-0/+7
* change all instances of selectedAddress to selectedAccount.Kevin Serrano2016-11-221-4/+4
* lint fixFrankie2016-11-111-1/+2
* Fix funny looking errors in conf-txFrankie2016-11-111-1/+4
* Clean up some of the codeFrankie2016-09-161-7/+14
* Merge branch 'master' into i#519buyButtonTxConfFrankie2016-09-161-1/+3
|\
| * Do not show user rejection errors within our UI.Dan Finlay2016-09-151-1/+3
* | Drop the buy button in the confTx view if account does not have enough ethFrankie2016-09-161-1/+21
|/
* Add network checks for unconfirmed TxsFrankie2016-09-091-1/+3
* Merge branch 'master' into PopupNotificationsDan Finlay2016-08-251-1/+1
|\
| * Fix empty sign message bugDan Finlay2016-08-251-1/+1
* | Fix back button hiding on popupDan Finlay2016-08-231-1/+2
* | MVP Popup Notifications WorkingDan Finlay2016-08-171-2/+3
|/
* Implement tx confirmation style refinementsDan Finlay2016-07-081-2/+2
* breakout pending-tx-detailskumavis2016-06-251-2/+2
* Manually lintedDan Finlay2016-06-221-3/+0
* Auto lintedDan Finlay2016-06-221-11/+9
* ui - redesign - trans group + + account detail + tx list fixeskumavis2016-05-141-1/+2
* Show any pending txs when unlockingDan Finlay2016-05-041-1/+2
* Improve tx UIDan Finlay2016-05-041-2/+2
* Add UI for Signing MessagesDan Finlay2016-05-041-53/+58
* Moved UI into repo with its own dependency stackDan Finlay2016-04-141-0/+140