Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove unused confirm transaction files | Alexander Tseung | 2018-07-18 | 1 | -113/+23 |
| | |||||
* | Refactor data flow, signature request routing | Alexander Tseung | 2018-07-07 | 1 | -2/+1 |
| | |||||
* | Add notification for dropped retry transactions (#4363) | Alexander Tseung | 2018-05-30 | 1 | -13/+50 |
| | |||||
* | Fix styling of the app spinner | Alexander Tseung | 2018-05-01 | 1 | -1/+1 |
| | |||||
* | Require loglevel singleton in each module that uses it | bitpshr | 2018-04-14 | 1 | -0/+1 |
| | |||||
* | Fix transaction confirmations | Alexander Tseung | 2018-04-04 | 1 | -3/+16 |
| | |||||
* | Fix merge conflicts. Modify send workflow | Alexander Tseung | 2018-04-03 | 1 | -9/+16 |
|\ | |||||
* | | Fix lint errors | Alexander Tseung | 2018-04-03 | 1 | -4/+0 |
| | | |||||
* | | Fix merge conflicts | Alexander Tseung | 2018-03-31 | 1 | -1/+1 |
|\| | |||||
| * | Removes t from props via metamask-connect and instead places it on context ↵ | Dan | 2018-03-29 | 1 | -1/+1 |
| | | | | | | | | via a provider. | ||||
* | | Fix merge conflicts. Refactor renderPrimary into Home component | Alexander Tseung | 2018-03-31 | 1 | -9/+35 |
| | | |||||
* | | Fix i18n merge conflicts | Alexander Tseung | 2018-03-30 | 1 | -1/+1 |
|\| | |||||
| * | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-03-21 | 1 | -0/+18 |
| |\ | | | | | | | | | | i18n-translator-redux | ||||
| * | | Handle i18n with redux. | Dan | 2018-03-16 | 1 | -1/+1 |
| | | | |||||
* | | | Fix merge conflicts | Alexander Tseung | 2018-03-27 | 1 | -13/+14 |
|\ \ \ | | |/ | |/| | |||||
| * | | Take user home if an unapproved tx is dropped while they are viewing. | Dan | 2018-03-21 | 1 | -0/+18 |
| |/ | |||||
* | | Checks if there is currently a send in progress before redirecting to ↵ | Dan | 2018-02-01 | 1 | -3/+7 |
| | | | | | | | | default in conf-tx | ||||
* | | Fix merge conflicts from uat-next | Alexander Tseung | 2018-02-01 | 1 | -1/+0 |
|\| | |||||
| * | Merge branch 'master' into uat | Thomas Huang | 2018-01-24 | 1 | -1/+0 |
| |\ | |||||
| | * | add a `x` close button to gas calc loding screen on conf-tx | frankiebee | 2018-01-18 | 1 | -1/+5 |
| | | | |||||
| | * | add a loading spinner to conf-tx view | frankiebee | 2018-01-15 | 1 | -0/+6 |
| | | | |||||
* | | | Add route for signature request | Alexander Tseung | 2017-12-15 | 1 | -17/+10 |
| | | | |||||
* | | | Add react-router to allow use of the browser back button | Alexander Tseung | 2017-12-15 | 1 | -10/+22 |
|/ / | |||||
* | | More lint fixes | Dan | 2017-11-02 | 1 | -1/+1 |
| | | |||||
* | | Lint fixes for NewUI-flat. | Dan | 2017-11-02 | 1 | -1/+1 |
| | | |||||
* | | Signature request fixes. | Dan | 2017-10-26 | 1 | -1/+1 |
| | | |||||
* | | Signature Request | Dan | 2017-10-26 | 1 | -13/+18 |
| | | |||||
* | | Fix loading animation not showing on network change | Alexander Tseung | 2017-10-20 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'NewUI-flat' into merge | Chi Kei Chan | 2017-10-19 | 1 | -83/+69 |
|\ \ | |/ |/| | |||||
| * | Merge branch 'master' into mmn | Chi Kei Chan | 2017-09-28 | 1 | -10/+36 |
| |\ | |||||
| * \ | Merge branch 'master' into nm | Chi Kei Chan | 2017-09-19 | 1 | -0/+7 |
| |\ \ | |||||
| * | | | Show loading on conf-tx until the pending tx is available. | Dan | 2017-09-15 | 1 | -0/+1 |
| | | | | |||||
| * | | | Touch up transaction list item styles, remove main-content scroll bars, ↵ | Dan | 2017-09-05 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | align buttons with main-content.. | ||||
| * | | | Lint fixes | Dan | 2017-08-31 | 1 | -17/+13 |
| | | | | |||||
| * | | | Cleanup unnecessary pending tx-switching logic | sdtsui | 2017-07-30 | 1 | -60/+19 |
| | | | | |||||
* | | | | Respect code style | Sergey Ukustov | 2017-09-30 | 1 | -1/+1 |
| | | | | |||||
* | | | | Add eth_signTypedData handler | Sergey Ukustov | 2017-09-30 | 1 | -2/+23 |
| |_|/ |/| | | |||||
* | | | Add computed balance to account detail view | Dan Finlay | 2017-09-14 | 1 | -1/+0 |
| | | | |||||
* | | | Use computed balance for tx confirmation | Dan Finlay | 2017-09-14 | 1 | -1/+3 |
| |/ |/| | |||||
* | | Show reject all only when tx count is > 1 | Kevin Serrano | 2017-09-12 | 1 | -0/+3 |
| | | |||||
* | | Convert icon to button. | Kevin Serrano | 2017-09-08 | 1 | -12/+7 |
| | | |||||
* | | cancel all txs | DavidNinja | 2017-08-15 | 1 | -0/+12 |
|/ | |||||
* | Lots of flex rearrangement on account detail view | Dan Finlay | 2017-07-26 | 1 | -29/+19 |
| | | | | Includes removal of ReactCssTransitionGroup for a simpler UI refactor. | ||||
* | Fix reference | Dan Finlay | 2017-07-21 | 1 | -1/+1 |
| | |||||
* | Move responsive ui into its own folder for easier merges | Dan Finlay | 2017-07-21 | 1 | -0/+213 |
| | |||||
* | Make folder for responsive UI | Dan Finlay | 2017-07-04 | 1 | -213/+0 |
| | |||||
* | Merge branch 'master' into gasupdater | Dan Finlay | 2017-06-13 | 1 | -0/+1 |
|\ | |||||
| * | Dissallow transactions to be sent to 0x0000000000000000000000000000000000000000 | frankiebee | 2017-06-06 | 1 | -0/+1 |
| | | |||||
* | | Update gasblocklimit params with every block. | Kevin Serrano | 2017-06-03 | 1 | -1/+3 |
|/ | |||||
* | Fix bug where edited gas parameters did not take effect | Dan Finlay | 2017-05-17 | 1 | -1/+1 |
| | | | | Fixes #1407 | ||||
* | Fix fiat rendering | Dan Finlay | 2017-05-17 | 1 | -1/+3 |
| | | | | | | | | Fixes #1439. When reorganizing fiat-value component to not use global state, had missed its necessary `currentCurrency` parameter. This now passes it in wherever it's used. | ||||
* | Remove redux dependency from eth-balance and its dependent tree | Dan Finlay | 2017-05-13 | 1 | -1/+3 |
| | | | | For better unit testability of the conf-tx view. | ||||
* | Fix linting warnings | Thomas Huang | 2017-04-27 | 1 | -2/+0 |
| | |||||
* | Fix issue where stopPropagation didnt stop submitting the tx when clicking ↵ | frankiebee | 2017-04-24 | 1 | -1/+1 |
| | | | | buy button | ||||
* | Improve UI gas calculation logic | Dan Finlay | 2017-03-29 | 1 | -29/+1 |
| | | | | | | | | - Now striping hex prefixed gas values, which may have been causing mis-estimation. - Unified calculation logic to be entirely functional. - Greatly simplified how the pending-tx form keeps updated form state. Still needs a commit from @kumavis to ensure the background passes in a txMeta.txParams.gasPrice value. | ||||
* | Fix tx selecting bug | Dan Finlay | 2017-03-25 | 1 | -2/+2 |
| | |||||
* | Prevent default for reset and reject buttons | Dan Finlay | 2017-03-24 | 1 | -0/+1 |
| | |||||
* | Got basic validations working | Dan Finlay | 2017-03-23 | 1 | -8/+14 |
| | |||||
* | Fix loading indication for conf-tx view | Dan Finlay | 2017-03-01 | 1 | -1/+1 |
| | |||||
* | Use correct action to update and submit tx | Dan Finlay | 2017-03-01 | 1 | -1/+1 |
| | |||||
* | Fixed bug that made send screen sometimes transition to account detail | Dan Finlay | 2017-03-01 | 1 | -1/+2 |
| | |||||
* | Fix infinite loop bug | Dan Finlay | 2017-03-01 | 1 | -0/+1 |
| | |||||
* | Fix reference | Dan Finlay | 2017-03-01 | 1 | -1/+1 |
| | |||||
* | Emit updated tx values on accept click | Dan Finlay | 2017-02-28 | 1 | -1/+13 |
| | |||||
* | Merge branch 'master' into i765-gaslimits | Dan Finlay | 2017-02-28 | 1 | -13/+37 |
|\ | |||||
| * | Fix cancel msg signing behavior. | Dan Finlay | 2017-02-24 | 1 | -1/+7 |
| | | |||||
| * | Got personal_sign working | Dan Finlay | 2017-02-24 | 1 | -1/+13 |
| | | | | | | | | Also fixed bug where signing would not close popup. | ||||
| * | Add alternate UI for pending personal_sign messages | Dan Finlay | 2017-02-24 | 1 | -5/+12 |
| | | |||||
| * | Add personal sign actions and template | Dan Finlay | 2017-02-23 | 1 | -21/+20 |
| | | |||||
* | | Merge github.com:MetaMask/metamask-plugin into i765-gaslimits | Kevin Serrano | 2017-02-24 | 1 | -0/+5 |
|\| | |||||
| * | Fix UI Dev Mode for Tx Approval | Dan Finlay | 2017-02-21 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | The state object had been changed, but our mock states for tx approval were using the old keys. Rather than try to muck about and figure out each and every change, I've re-generated a UI dev state for tx approval, which should help @zanibas on his current project. We can continue adding new dev states as needed from here. If anyone catches a state that doesn't render correctly, it's worth checking if a new snapshot doesn't solve things. Debugged by adding new debugging loggers, and I've left them in place for easier future debugging. | ||||
* | | Broke hex decimal input into its own component | Dan Finlay | 2017-02-18 | 1 | -1/+0 |
| | | | | | | | | Also added a new state to try to make UI dev mode work again, but it has other issues, like #1128, that need to be addressed before UI dev mode can be used again. | ||||
* | | Change state to props, add modifiable fields. | Kevin Serrano | 2017-02-18 | 1 | -19/+21 |
|/ | |||||
* | Merge branch 'dev' into messageManagerCleanUp | Frankie | 2017-02-02 | 1 | -4/+4 |
|\ | |||||
| * | rename selectedAccount to selectedAddress | kumavis | 2017-01-31 | 1 | -4/+4 |
| | | |||||
* | | Clean up message manger includes: | Frankie | 2017-01-29 | 1 | -5/+5 |
|/ | | | | | | | | | Provider egine bump Remove presence of message manger in keyring controller Change the status wording fom conf to approved make Message manager a class fix messages not being apart of the badge re write message manger to better reflect controller pattern | ||||
* | fix base | Frankie | 2017-01-25 | 1 | -2/+2 |
| | |||||
* | Fix issue where ConfTx view lets you approve txs when the account has ↵ | Frankie | 2017-01-25 | 1 | -1/+1 |
| | | | | insufficient balance | ||||
* | Fix message signing UI rendering | Dan Finlay | 2017-01-17 | 1 | -5/+10 |
| | | | | | | [A recent PR](https://github.com/MetaMask/metamask-plugin/pull/1004) removed logic that rendered pending messages for approval. This commit fixes that. | ||||
* | Dont render conf-tx if their are no txParams to show | Frankie | 2017-01-15 | 1 | -2/+4 |
| | |||||
* | lint | Frankie | 2017-01-14 | 1 | -1/+1 |
| | |||||
* | Fix sorting and instances where something could be undefined | Frankie | 2017-01-12 | 1 | -1/+1 |
| | |||||
* | Take some of the tx Logic out of the UI and create a visble state for ↵ | Frankie | 2017-01-12 | 1 | -10/+2 |
| | | | | pending and unaproved transactions | ||||
* | quick typo fix. | Kevin Serrano | 2017-01-07 | 1 | -2/+2 |
| | |||||
* | Switch order of header and indicator. | Kevin Serrano | 2017-01-06 | 1 | -1/+1 |
| | |||||
* | Make network somewhat more modular, add new network indicator. | Kevin Serrano | 2017-01-05 | 1 | -0/+7 |
| | |||||
* | change all instances of selectedAddress to selectedAccount. | Kevin Serrano | 2016-11-22 | 1 | -4/+4 |
| | |||||
* | lint fix | Frankie | 2016-11-11 | 1 | -1/+2 |
| | |||||
* | Fix funny looking errors in conf-tx | Frankie | 2016-11-11 | 1 | -1/+4 |
| | |||||
* | Clean up some of the code | Frankie | 2016-09-16 | 1 | -7/+14 |
| | |||||
* | Merge branch 'master' into i#519buyButtonTxConf | Frankie | 2016-09-16 | 1 | -1/+3 |
|\ | |||||
| * | Do not show user rejection errors within our UI. | Dan Finlay | 2016-09-15 | 1 | -1/+3 |
| | | |||||
* | | Drop the buy button in the confTx view if account does not have enough eth | Frankie | 2016-09-16 | 1 | -1/+21 |
|/ | |||||
* | Add network checks for unconfirmed Txs | Frankie | 2016-09-09 | 1 | -1/+3 |
| | |||||
* | Merge branch 'master' into PopupNotifications | Dan Finlay | 2016-08-25 | 1 | -1/+1 |
|\ | |||||
| * | Fix empty sign message bug | Dan Finlay | 2016-08-25 | 1 | -1/+1 |
| | | |||||
* | | Fix back button hiding on popup | Dan Finlay | 2016-08-23 | 1 | -1/+2 |
| | | |||||
* | | MVP Popup Notifications Working | Dan Finlay | 2016-08-17 | 1 | -2/+3 |
|/ | | | | | | | | | I'm unsure which will be more performant: A notification using a trimmed down version of the UI, or using them both, letting the browser cache them both. In any case, here I've modified the normal UI to recognize when it's a popup, and change the UX accordingly in a few ways: - Hide the menu bar - Hide the back button from the notifications view. - When confirming the last tx, close the window. | ||||
* | Implement tx confirmation style refinements | Dan Finlay | 2016-07-08 | 1 | -2/+2 |
| | |||||
* | breakout pending-tx-details | kumavis | 2016-06-25 | 1 | -2/+2 |
| | |||||
* | Manually linted | Dan Finlay | 2016-06-22 | 1 | -3/+0 |
| | |||||
* | Auto linted | Dan Finlay | 2016-06-22 | 1 | -11/+9 |
| | |||||
* | ui - redesign - trans group + + account detail + tx list fixes | kumavis | 2016-05-14 | 1 | -1/+2 |
| | |||||
* | Show any pending txs when unlocking | Dan Finlay | 2016-05-04 | 1 | -1/+2 |
| | | | | Before the unlock action hard-routed to the home route, now it has a condition where it will show pending transactions instead. | ||||
* | Improve tx UI | Dan Finlay | 2016-05-04 | 1 | -2/+2 |
| | |||||
* | Add UI for Signing Messages | Dan Finlay | 2016-05-04 | 1 | -53/+58 |
| | | | | | | | | | | Calls to `eth.sign` are now transiently persisted in memory, and displayed in a chronological stack with pending transactions (which are still persisted to disk). This allows the user a method to sign/cancel transactions even if they miss the Chrome notification. Improved a lot of the view routing, to avoid cases where routes would show an empty account view, or transition to the accounts list when it shouldn't. Broke the transaction approval view into a couple components so messages and transactions could have their own templates. | ||||
* | Moved UI into repo with its own dependency stack | Dan Finlay | 2016-04-14 | 1 | -0/+140 |