| Commit message (Expand) | Author | Age | Files | Lines |
* | Fix merge conflicts. Modify send workflow | Alexander Tseung | 2018-04-03 | 1 | -2/+3 |
|\ |
|
| * | Merge branch 'master' into i3686-txparamundefined-sigrequestsintxlist | Dan | 2018-03-30 | 1 | -4/+10 |
| |\ |
|
| * | | Fix display of unapprovedMessages in txList (old and new ui); includes fix of... | Dan | 2018-03-28 | 1 | -2/+3 |
* | | | Fix conf-tx render | Alexander Tseung | 2018-03-31 | 1 | -1/+4 |
* | | | Fix merge conflicts | Alexander Tseung | 2018-03-31 | 1 | -4/+9 |
|\ \ \
| | |/
| |/| |
|
| * | | Removes t from props via metamask-connect and instead places it on context vi... | Dan | 2018-03-29 | 1 | -4/+10 |
| |/ |
|
* | | Fix i18n merge conflicts | Alexander Tseung | 2018-03-30 | 1 | -5/+4 |
|\| |
|
| * | Fix sender-to-recipient export and non-existent translation key. | Dan | 2018-03-22 | 1 | -1/+1 |
| * | i18n redux solution doesn't require importing t() and passing state to each t... | Dan | 2018-03-22 | 1 | -4/+3 |
| * | Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-tra... | kumavis | 2018-03-21 | 1 | -6/+9 |
| |\ |
|
| * | | Handle i18n with redux. | Dan | 2018-03-16 | 1 | -4/+4 |
* | | | Fix merge conflicts | Alexander Tseung | 2018-03-27 | 1 | -7/+11 |
|\ \ \
| | |/
| |/| |
|
| * | | Merge branch 'master' into i3571-CompleteI18nTemplates | Thomas | 2018-03-21 | 1 | -5/+8 |
| |\ \ |
|
| | * | | Merge branch 'master' into retry-tx-refractor | Dan | 2018-03-14 | 1 | -2/+3 |
| | |\| |
|
| | * | | Use correct name for submittedTime field in tx-list.js | Dan | 2018-03-14 | 1 | -1/+1 |
| | * | | Use new submittedTime field to correctly show retry button in old and new ui. | Dan | 2018-03-14 | 1 | -3/+3 |
| | * | | Retry transaction logic added to tx-list-item, confirm-send-ether, customize-... | Dan | 2018-03-09 | 1 | -5/+8 |
| * | | | Started on Tx list i18n | Thomas | 2018-03-21 | 1 | -1/+1 |
| | |/
| |/| |
|
| * | | Merge branch 'master' into i18n | Dan | 2018-03-07 | 1 | -5/+2 |
| |\| |
|
| * | | get t imported in all files currently using i18n | Nick Doiron | 2018-01-25 | 1 | -0/+1 |
| * | | first steps to i18n | Nick Doiron | 2018-01-23 | 1 | -2/+2 |
* | | | Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension int... | Alexander Tseung | 2018-02-09 | 1 | -5/+2 |
|\ \ \
| | |/
| |/| |
|
| * | | Fixes shapeshift txs so that they render in tx list. (#3208) | Dan J Miller | 2018-02-09 | 1 | -5/+2 |
| |/ |
|
* | | Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254 | Alexander Tseung | 2018-01-30 | 1 | -8/+11 |
|\| |
|
| * | Fix tx-list, confirmation screen styling | Alexander Tseung | 2018-01-18 | 1 | -5/+4 |
| * | [NewUI-flat] New deposit ether modal UI. (#2642) | Dan J Miller | 2018-01-13 | 1 | -3/+7 |
* | | Fix lint errors | Alexander Tseung | 2017-12-15 | 1 | -1/+1 |
* | | Add react-router to allow use of the browser back button | Alexander Tseung | 2017-12-15 | 1 | -3/+9 |
|/ |
|
* | More lint fixes | Dan | 2017-11-02 | 1 | -2/+2 |
* | Lint fixes for NewUI-flat. | Dan | 2017-11-02 | 1 | -5/+1 |
* | Add utility for getting token data; get token data in tx-list even if token h... | Dan | 2017-10-28 | 1 | -0/+6 |
* | Fix cursor on unclickable transactions (#2356) | Alexander Tseung | 2017-10-14 | 1 | -3/+9 |
* | Add needed iterator in tx-list and path to account in selectors. | Dan | 2017-10-03 | 1 | -1/+6 |
* | Shapeshift deposit tx modal. | Dan | 2017-10-02 | 1 | -1/+1 |
* | Enables the old shapeshift UI within new ui. | Dan | 2017-10-02 | 1 | -1/+3 |
* | Return null if transaction.key is shapeshift | Chi Kei Chan | 2017-09-27 | 1 | -1/+6 |
* | Integrate Add Token | Chi Kei Chan | 2017-09-22 | 1 | -1/+1 |
* | Show token tx properly | Chi Kei Chan | 2017-09-14 | 1 | -2/+3 |
* | Fixes the saving of transactions in send and display in tx-list with conversi... | Dan | 2017-09-14 | 1 | -6/+7 |
* | Add buttons; handle back; add yarn.lock | Chi Kei Chan | 2017-09-12 | 1 | -3/+1 |
* | Re-enable Contract tx list item | Chi Kei Chan | 2017-09-08 | 1 | -18/+7 |
* | Fix css merge conflicts | Chi Kei Chan | 2017-09-08 | 1 | -1/+1 |
* | Modify status copy for status === 'unapproved' | Dan | 2017-09-08 | 1 | -0/+1 |
* | Link user from transaction list to etherscan if they have a transaction hash. | Dan | 2017-09-08 | 1 | -1/+26 |
* | Create tx-list-item component. | Dan | 2017-09-08 | 1 | -74/+15 |
* | Show confirm transaction screen when clicking a pending transaction in the list. | Dan | 2017-09-08 | 1 | -2/+14 |
* | Add Contract Tx List Item; Update Token Tx on select | Chi Kei Chan | 2017-09-07 | 1 | -17/+25 |
* | Show token balance and identicon | Chi Kei Chan | 2017-09-07 | 1 | -1/+0 |
* | Fix token list | Chi Kei Chan | 2017-09-06 | 1 | -1/+3 |
* | Implement tokens list UI | Chi Kei Chan | 2017-09-06 | 1 | -15/+22 |
* | Touch up transaction list item styles, remove main-content scroll bars, align... | Dan | 2017-09-05 | 1 | -40/+45 |
* | Capitalizations via text-transform for main screen transactions. | Dan | 2017-09-05 | 1 | -2/+2 |
* | Lint fixes | Dan | 2017-08-31 | 1 | -15/+13 |
* | Render TxListItem component from real data: address, identicon, status, ETH v... | sdtsui | 2017-08-23 | 1 | -9/+11 |
* | Remove fake transactions and balances from tx-list and wallet-view, respectively | sdtsui | 2017-08-23 | 1 | -38/+0 |
* | Add UI tweaks, including separation of overflow logic for mobile (full-height... | sdtsui | 2017-08-11 | 1 | -8/+3 |
* | Improve text positioning on mobile view | sdtsui | 2017-08-11 | 1 | -11/+13 |
* | Implement widescreen layout for tx list | sdtsui | 2017-08-11 | 1 | -30/+28 |
* | Move Txs list item styles into classes | sdtsui | 2017-08-11 | 1 | -37/+17 |
* | Cleanup txList and txView components | sdtsui | 2017-08-11 | 1 | -34/+85 |
* | moved the props initialization steps into mapStateToProps | Simon Liang | 2017-08-10 | 1 | -14/+13 |
* | extracted transaction list | Simon Liang | 2017-08-10 | 1 | -0/+141 |