Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Delete dead send code. | Dan | 2018-05-01 | 1 | -231/+0 |
| | |||||
* | Further refactors; includes refactor of send-v2.js and associated container | Dan | 2018-04-30 | 1 | -3/+3 |
| | |||||
* | Fixes to get tests passing. | Dan | 2018-04-27 | 1 | -3/+3 |
| | |||||
* | Lint fixes and alphabetization for i3725-refactor-send-component | Dan | 2018-04-27 | 1 | -17/+0 |
| | |||||
* | Core of the refactor complete | Dan | 2018-04-27 | 1 | -395/+6 |
| | |||||
* | Merge branch 'master' into i3725-refactor-send-component | Dan | 2018-04-25 | 1 | -11/+0 |
|\ | |||||
| * | Maintain token prices using a background service | bitpshr | 2018-04-16 | 1 | -11/+0 |
| | | |||||
| * | Fetch token prices based on contract address | bitpshr | 2018-04-16 | 1 | -4/+4 |
| | | |||||
* | | Merge branch 'master' into i3725-refactor-send-component | Dan | 2018-04-10 | 1 | -3/+24 |
|\| | |||||
| * | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ↵ | Alexander Tseung | 2018-04-06 | 1 | -1/+6 |
| |\ | | | | | | | | | | cb-254 | ||||
| * \ | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ↵ | Alexander Tseung | 2018-04-06 | 1 | -3/+0 |
| |\ \ | | | | | | | | | | | | | cb-254 | ||||
| * \ \ | Fix merge conflicts. Modify send workflow | Alexander Tseung | 2018-04-03 | 1 | -10/+7 |
| |\ \ \ | |||||
| * | | | | Refactor onboarding flow | Alexander Tseung | 2018-04-02 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Fix merge conflicts | Alexander Tseung | 2018-03-31 | 1 | -14/+19 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Fix i18n merge conflicts | Alexander Tseung | 2018-03-30 | 1 | -16/+17 |
| |\ \ \ \ \ | |||||
| * | | | | | | Fix merge conflicts. Refactor onboarding flow. | Alexander Tseung | 2018-03-29 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Fix merge conflicts | Alexander Tseung | 2018-03-27 | 1 | -42/+64 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension ↵ | Alexander Tseung | 2018-02-09 | 1 | -54/+12 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into cb-254 | ||||
| * | | | | | | | | Fix lint errors | Alexander Tseung | 2018-02-02 | 1 | -2/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254 | Alexander Tseung | 2018-01-30 | 1 | -65/+127 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add react-router to allow use of the browser back button | Alexander Tseung | 2017-12-15 | 1 | -3/+7 |
| | | | | | | | | | | |||||
* | | | | | | | | | | first commit | Dan | 2018-04-07 | 1 | -37/+16 |
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
* | | | | | | | | | Fix populating txParams with undefined data | Alexander Tseung | 2018-04-06 | 1 | -1/+6 |
| |_|_|_|_|_|_|/ |/| | | | | | | | |||||
* | | | | | | | | Allow from and to address to be the same in new-ui. | Dan | 2018-04-05 | 1 | -3/+0 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Ensure txParams are prefixed with 0x when sending. | Dan | 2018-04-03 | 1 | -0/+4 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'master' into i3471-checkbalanceonconfirmscreen | Dan | 2018-03-30 | 1 | -14/+19 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Removes t from props via metamask-connect and instead places it on context ↵ | Dan | 2018-03-29 | 1 | -14/+19 |
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | via a provider. | ||||
* | | | | | | Merge branch 'master' into i3471-checkbalanceonconfirmscreen | kumavis | 2018-03-28 | 1 | -15/+16 |
|\| | | | | | |||||
| * | | | | | Merge pull request #3742 from danjm/i3705-prefix-to-address-with-0x | kumavis | 2018-03-28 | 1 | -1/+3 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Prefixes to addresses with 0x before sending. | ||||
| | * | | | | | Prefixes to addresses with 0x before sending. | Dan | 2018-03-27 | 1 | -1/+3 |
| | | |_|_|/ | | |/| | | | |||||
| * | | | | | Merge branch 'master' into i18n-translator-redux | Dan | 2018-03-27 | 1 | -10/+14 |
| |\| | | | | |||||
| * | | | | | Merge branch 'master' into i18n-translator-redux | Dan | 2018-03-22 | 1 | -7/+8 |
| |\ \ \ \ \ | |||||
| * | | | | | | i18n redux solution doesn't require importing t() and passing state to each ↵ | Dan | 2018-03-22 | 1 | -14/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | t() call; t is just available on props. | ||||
* | | | | | | | Checking for sufficient balance in confirm ether screen; includes error ↵ | Dan | 2018-03-28 | 1 | -10/+3 |
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | messages for user. | ||||
* | | | | | | Merge pull request #3721 from alextsg/cb-944 | Dan Finlay | 2018-03-27 | 1 | -2/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Update button styles | ||||
| * | | | | | | Update button styles | Alexander Tseung | 2018-03-26 | 1 | -2/+2 |
| | |/ / / / | |/| | | | | |||||
* / | | | | | Use ens-input component in send-v2 to allow sending to ens names. | Dan | 2018-03-26 | 1 | -8/+12 |
|/ / / / / | |||||
* | | | | | Merge pull request #3624 from alextsg/cb-941 | kumavis | 2018-03-21 | 1 | -7/+8 |
|\ \ \ \ \ | |/ / / / |/| | | | | Update confirm transaction screen | ||||
| * | | | | Update confirm transaction screen | Alexander Tseung | 2018-03-21 | 1 | -7/+8 |
| | | | | | |||||
* | | | | | Merge branch 'master' into i3571-CompleteI18nTemplates | Thomas | 2018-03-21 | 1 | -0/+9 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge pull request #3623 from MetaMask/i#3554 | kumavis | 2018-03-21 | 1 | -0/+2 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | new-ui - dont exclude `txParams.data` when editing and updating txParams | ||||
| | * | | | | new-ui - dont exclude `txParams.data` when editing and updating txParams | frankiebee | 2018-03-20 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | Don't block user from setting gas if estimating gas returns errors. (#3627) | Dan J Miller | 2018-03-20 | 1 | -0/+7 |
| |/ / / / | |||||
* / / / / | Add send screen template | Dan Finlay | 2018-03-20 | 1 | -15/+15 |
|/ / / / | |||||
* | | | | Merge pull request #3446 from danjm/NewUI-handle-token-balance-on-edit | Dan Finlay | 2018-03-07 | 1 | -3/+7 |
|\ \ \ \ | | | | | | | | | | | Gracefully handle null token balance in new ui send. | ||||
| * | | | | Gracefully handle null token balance in new ui send. | Dan | 2018-03-06 | 1 | -3/+7 |
| | | | | | |||||
* | | | | | Prevent user from selecting max amount until there is an estimated gas total. | Dan | 2018-03-06 | 1 | -2/+3 |
|/ / / / | |||||
* | | / | Send screen style updates. (#3234) | Dan J Miller | 2018-02-13 | 1 | -5/+8 |
| |_|/ |/| | | |||||
* | | | Update modal header design on send screen (#3196) | Alexander Tseung | 2018-02-07 | 1 | -54/+12 |
| |/ |/| | |||||
* | | [NewUI] Send screen gas loading fixes (#3027) | Dan J Miller | 2018-01-18 | 1 | -25/+22 |
| | | | | | | | | | | | | * Allow entering amount, but disable validation of amount, opening of gas customizer or clicking of next, when gas loading in send. * Fix variable name. | ||||
* | | Readjust gas fees when switching networks on the send screen | Alexander Tseung | 2018-01-17 | 1 | -22/+43 |
| | | |||||
* | | Fix lint errors | Alexander Tseung | 2018-01-12 | 1 | -1/+0 |
| | | |||||
* | | Update styling for buttons, font weights | Alexander Tseung | 2018-01-12 | 1 | -2/+3 |
| | | |||||
* | | [NewUI] Fixes tests and sends user to NewUI after registering. (#2788) | Dan J Miller | 2017-12-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | * Fixes tests and sends user to NewUI after registering. * Karma config? * Empty commit * Remove unneeded json state mock file. | ||||
* | | Clone transaction while editing instead of mutating object from state. | Dan | 2017-12-21 | 1 | -6/+7 |
| | | |||||
* | | Add constanst for token transfer function signature. | Dan | 2017-12-21 | 1 | -1/+2 |
| | | |||||
* | | Lint fixes. | Dan | 2017-12-21 | 1 | -2/+0 |
| | | |||||
* | | Adds updateTransaction to background and used it to update after editing in ↵ | Dan | 2017-12-21 | 1 | -16/+62 |
|/ | | | | send-v2. | ||||
* | Update max amount behaviour to meet new specs. | Dan | 2017-12-07 | 1 | -14/+10 |
| | |||||
* | Allow editing of token transactions. | Dan | 2017-11-15 | 1 | -3/+4 |
| | |||||
* | Fix lint errors. | Dan | 2017-11-15 | 1 | -3/+1 |
| | |||||
* | Allow editing of send ether. | Dan | 2017-11-15 | 1 | -17/+37 |
| | |||||
* | Linting | Thomas Huang | 2017-11-11 | 1 | -3/+3 |
| | |||||
* | Calculate max amount for send ether based on minimum gas total. | Dan | 2017-11-08 | 1 | -2/+1 |
| | |||||
* | Fix amount max for sending token. | Dan | 2017-11-08 | 1 | -3/+5 |
| | |||||
* | Add currency-input component to correct send amount behaviour and move ↵ | Dan | 2017-11-08 | 1 | -4/+2 |
| | | | | currency display value state to parent component. | ||||
* | Lint fixes. | Dan | 2017-11-07 | 1 | -10/+1 |
| | |||||
* | Allow sending 0 eth or tokens | Dan | 2017-11-07 | 1 | -3/+3 |
| | |||||
* | Adds max amount feature for send token | Dan | 2017-11-07 | 1 | -5/+12 |
| | |||||
* | Adds max amount feature for send-ether | Dan | 2017-11-07 | 1 | -1/+38 |
| | |||||
* | Token balance in send state; validating sufficient tokens, validation ↵ | Dan | 2017-11-07 | 1 | -23/+108 |
| | | | | updates on 'from' switching. | ||||
* | More lint fixes | Dan | 2017-11-02 | 1 | -4/+4 |
| | |||||
* | Lint fixes for NewUI-flat. | Dan | 2017-11-02 | 1 | -8/+0 |
| | |||||
* | From and To field cannot be the same | Chi Kei Chan | 2017-10-25 | 1 | -2/+8 |
| | |||||
* | Remove memo input | Chi Kei Chan | 2017-10-25 | 1 | -3/+11 |
| | |||||
* | Merge pull request #2435 from danjm/NewUI-flat-disable-send-next-in-error | Chi Kei Chan | 2017-10-25 | 1 | -8/+3 |
|\ | | | | | [NewUI] Disable Send-v2 next button when form is in error | ||||
| * | Merge branch 'NewUI-flat' into NewUI-flat-disable-send-next-in-error | Daniel Tsui | 2017-10-24 | 1 | -21/+12 |
| |\ | |||||
| * | | Disable send-v2 next button if in error | Dan | 2017-10-24 | 1 | -3/+10 |
| | | | |||||
* | | | Style dropdown of to-autocomplete. | Dan | 2017-10-25 | 1 | -10/+14 |
| |/ |/| | |||||
* | | Use classnames library and disabled attribute on 'Next' button in send-v2 | Dan | 2017-10-24 | 1 | -3/+8 |
| | | |||||
* | | Improve customize gas modal error handling | Dan | 2017-10-24 | 1 | -21/+12 |
| | | |||||
* | | Disable send-v2 next button if in error | Dan | 2017-10-24 | 1 | -3/+10 |
|/ | |||||
* | Clear send state on cancelling and signing. | Dan | 2017-10-24 | 1 | -2/+8 |
| | |||||
* | Fix Conversions bugs; Fiat value bugs | Chi Kei Chan | 2017-10-21 | 1 | -3/+4 |
| | |||||
* | Get currency from state in account details, send and confirm screens. | Dan | 2017-10-20 | 1 | -2/+4 |
| | |||||
* | Min and default gas price, limit, total; comments out code for gas slider. | Dan | 2017-10-20 | 1 | -3/+4 |
| | |||||
* | Amount field shows insufficient funds error based on amoutn + gas total. | Dan | 2017-10-20 | 1 | -3/+14 |
| | |||||
* | Fixes mobile styling. | Dan | 2017-10-20 | 1 | -44/+61 |
| | |||||
* | Handling to and amount errors. | Dan | 2017-10-19 | 1 | -8/+89 |
| | |||||
* | Move all of send state to metamask state. | Dan | 2017-10-19 | 1 | -42/+34 |
| | |||||
* | Get from and update addressBook in send-v2 | Dan | 2017-10-19 | 1 | -4/+15 |
| | |||||
* | Breaks send-v2 down into renderable functions. | Dan | 2017-10-19 | 1 | -102/+159 |
| | |||||
* | Enable send-v2 functionality. | Dan | 2017-10-18 | 1 | -2/+37 |
| | |||||
* | Customize Gas connected to state | Dan | 2017-10-16 | 1 | -8/+4 |
| | |||||
* | [NewUI] SendV2-#8: Send container handles tokens; gas info dynamic from ↵ | Dan J Miller | 2017-10-14 | 1 | -57/+146 |
| | | | | | | | | | | | | | | | | | | state (#2364) * Adds memo field to send-v2. * Vertical align transaction with flexbox. * Customize Gas UI * Remove internal state from InputNumber and fix use in gastooltip. * Move customize-gas-modal to its own folder and minor cleanup * Create send container, get account info from state, and make currency display more reusable * Adjusts send-v2 and container for send-token. Dynamically getting suggested gas prices. | ||||
* | Adds amount and gas field to sendV2. | Dan | 2017-10-13 | 1 | -7/+48 |
| | |||||
* | Send v2 to autocomplete. | Dan | 2017-10-11 | 1 | -2/+23 |
| | |||||
* | Refactor 'rendersingleidentity' to a stand alone account-list-item component. | Dan | 2017-10-10 | 1 | -6/+5 |
| | |||||
* | UI for readonly from component. From dropdown opening and closing. Mockdata. | Dan | 2017-10-10 | 1 | -1/+37 |
| | |||||
* | UI for send screen container without form rows. | Dan | 2017-10-09 | 1 | -0/+61 |