Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix ledger affiliate link | brunobar79 | 2018-08-17 | 1 | -1/+1 |
| | |||||
* | ui ready | brunobar79 | 2018-08-17 | 2 | -6/+22 |
| | |||||
* | connect screen ready | brunobar79 | 2018-08-17 | 1 | -25/+63 |
| | |||||
* | more ui | brunobar79 | 2018-08-15 | 1 | -1/+2 |
| | |||||
* | fix | brunobar79 | 2018-08-15 | 1 | -1/+1 |
| | |||||
* | ui fixes | brunobar79 | 2018-08-15 | 3 | -20/+35 |
| | |||||
* | fix tx tests | brunobar79 | 2018-08-14 | 1 | -1/+2 |
| | |||||
* | legacy and new hd path working | brunobar79 | 2018-08-14 | 2 | -23/+44 |
| | |||||
* | good progress adding paths | brunobar79 | 2018-08-14 | 2 | -13/+71 |
| | |||||
* | rename keyring | brunobar79 | 2018-08-11 | 1 | -0/+1 |
| | |||||
* | able to add accounts | brunobar79 | 2018-08-11 | 2 | -3/+3 |
| | |||||
* | iframe communication working | brunobar79 | 2018-08-11 | 1 | -1/+0 |
| | |||||
* | refactor to support multiple hw wallets | brunobar79 | 2018-08-11 | 3 | -23/+39 |
| | |||||
* | Merge pull request #4897 from MetaMask/qr-code-scan | Bruno Barbieri | 2018-08-11 | 14 | -4/+410 |
|\ | | | | | QR Code Scanner | ||||
| * | add submit button type | brunobar79 | 2018-08-09 | 1 | -0/+1 |
| | | |||||
| * | lint | brunobar79 | 2018-08-08 | 1 | -1/+1 |
| | | |||||
| * | code review changes | brunobar79 | 2018-08-08 | 1 | -8/+17 |
| | | |||||
| * | fix merge conflicts | brunobar79 | 2018-08-08 | 5 | -14/+25 |
| |\ | |||||
| * | | lint | brunobar79 | 2018-08-04 | 1 | -1/+1 |
| | | | |||||
| * | | fixed issue with input | brunobar79 | 2018-08-04 | 3 | -2/+6 |
| | | | |||||
| * | | clear qr code data before scanning | brunobar79 | 2018-08-04 | 1 | -0/+3 |
| | | | |||||
| * | | design complete | brunobar79 | 2018-08-04 | 4 | -18/+108 |
| | | | |||||
| * | | fix | brunobar79 | 2018-08-01 | 1 | -1/+6 |
| | | | |||||
| * | | lint | brunobar79 | 2018-08-01 | 1 | -2/+0 |
| | | | |||||
| * | | added crossbrowser support and error handling | brunobar79 | 2018-08-01 | 5 | -48/+87 |
| | | | |||||
| * | | send to fullscreen if no permission from popup | brunobar79 | 2018-07-31 | 2 | -11/+32 |
| | | | |||||
| * | | kill camera stream when unmouting | brunobar79 | 2018-07-31 | 1 | -1/+4 |
| | | | |||||
| * | | copy | brunobar79 | 2018-07-31 | 1 | -1/+1 |
| | | | |||||
| * | | clean up css | brunobar79 | 2018-07-31 | 3 | -30/+58 |
| | | | |||||
| * | | use existing modals | brunobar79 | 2018-07-31 | 7 | -190/+163 |
| | | | |||||
| * | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | brunobar79 | 2018-07-31 | 2 | -2/+12 |
| |\ \ | | | | | | | | | | | | | qr-code-scan | ||||
| * | | | fix unit tests | brunobar79 | 2018-07-27 | 1 | -0/+2 |
| | | | | |||||
| * | | | fix dependencies | brunobar79 | 2018-07-27 | 1 | -1/+1 |
| | | | | |||||
| * | | | fix linting errors | brunobar79 | 2018-07-27 | 2 | -2/+2 |
| | | | | |||||
| * | | | fix merge conflicts | brunobar79 | 2018-07-27 | 9 | -7/+328 |
| |\ \ \ | |||||
| * | | | | added webrtc-adapter for browser compat | brunobar79 | 2018-07-27 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | fully working without tweaking ext. permission | brunobar79 | 2018-07-27 | 4 | -3/+4 |
| | | | | | |||||
| * | | | | working without permission issues | brunobar79 | 2018-07-27 | 1 | -36/+44 |
| | | | | | |||||
| * | | | | fix spinner and qr icon | brunobar79 | 2018-07-25 | 1 | -2/+5 |
| | | | | | |||||
| * | | | | decent UI | brunobar79 | 2018-07-25 | 1 | -21/+43 |
| | | | | | |||||
| * | | | | working without injection | brunobar79 | 2018-07-25 | 5 | -5/+176 |
| | | | | | |||||
| * | | | | added qr code scanner icon in send transaction | brunobar79 | 2018-07-24 | 6 | -5/+15 |
| | | | | | |||||
| * | | | | camera working back and forth | brunobar79 | 2018-07-24 | 3 | -1/+15 |
| | | | | | |||||
* | | | | | Merge pull request #5000 from MetaMask/contract-method-conf-sim-failure | Dan J Miller | 2018-08-09 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Show error while allowing confirmation of tx where simulation fails | ||||
| * | | | | | Show error while allowing confirmation of transaction where simulation fails | Dan Miller | 2018-08-09 | 1 | -1/+1 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Fix lint error in tx-list | Whymarrh Whitby | 2018-08-09 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Get nonce for showing retry button using ethQuery transaction count. | Dan Miller | 2018-08-09 | 2 | -6/+20 |
|/ / / / | |||||
* | | | | Merge pull request #4948 from MetaMask/i4638-update-font | Alexander Tseung | 2018-08-04 | 2 | -4/+0 |
|\ \ \ \ | | | | | | | | | | | Update Font in Account Selector | ||||
| * | | | | Update Font in Account Selector | Alexander Tseung | 2018-08-04 | 2 | -4/+0 |
| | | | | | |||||
* | | | | | Disable Confirm button on subsequent clicks to prevent confirming multiple times | Alexander Tseung | 2018-08-04 | 2 | -6/+21 |
|/ / / / | |||||
* | | / | Show the retry button on latest tx of earliest nonce. | Dan Miller | 2018-08-01 | 1 | -4/+4 |
| |_|/ |/| | | |||||
* | | | Round large exponential numbers | Alexander Tseung | 2018-07-28 | 1 | -2/+5 |
| | | | |||||
* | | | Fix overflow for long total strings in confirm string | Alexander Tseung | 2018-07-26 | 1 | -0/+7 |
| |/ |/| | |||||
* | | Merge pull request #4885 from MetaMask/RetryOnEarliestPendingTx | Dan J Miller | 2018-07-26 | 1 | -1/+10 |
|\ \ | | | | | | | Only show retry button on the earliest pending tx | ||||
| * | | earliest tx by submittedTime | Esteban MIno | 2018-07-26 | 1 | -5/+8 |
| | | | |||||
| * | | only show retry button on earliest pending tx | Esteban MIno | 2018-07-26 | 1 | -1/+7 |
| | | | |||||
* | | | lint fix | Sara Reynolds | 2018-07-26 | 1 | -2/+2 |
| | | | |||||
* | | | Update prop names | Sara Reynolds | 2018-07-26 | 1 | -7/+7 |
| | | | |||||
* | | | Add tests for Confirm Detail Row | Sara Reynolds | 2018-07-26 | 1 | -0/+64 |
| | | | |||||
* | | | Merge pull request #4845 from MetaMask/button-group | Dan J Miller | 2018-07-25 | 6 | -0/+248 |
|\ \ \ | |/ / |/| | | Add ButtonGroup component | ||||
| * | | Adds tests for button group component. | Dan Miller | 2018-07-24 | 1 | -0/+97 |
| | | | |||||
| * | | Add ButtonGroup component | Alexander Tseung | 2018-07-24 | 5 | -0/+151 |
| | | | |||||
* | | | Add close window support to signature requests. Move logic to actions | Alexander Tseung | 2018-07-24 | 2 | -21/+10 |
| | | | |||||
* | | | UI confirm screen closes confirmation window on submit or cancel of a tx | Dan Miller | 2018-07-24 | 1 | -4/+15 |
| |/ |/| | |||||
* | | Merge pull request #4851 from MetaMask/fix-trezor-alert | Dan Finlay | 2018-07-24 | 1 | -4/+11 |
|\ \ | | | | | | | Fix trezor "Hardware wallet connected" alert | ||||
| * | | show alert ONLY when device is connected | brunobar79 | 2018-07-23 | 1 | -4/+11 |
| | | | |||||
* | | | refactor Alert component to work properly | brunobar79 | 2018-07-22 | 1 | -6/+46 |
|/ / | |||||
* | | Add fallback options for displaying recipient name in the Confirm screen | Alexander Tseung | 2018-07-21 | 2 | -10/+15 |
| | | |||||
* | | Merge pull request #4625 from MetaMask/initial-trezor-support | Bruno Barbieri | 2018-07-20 | 12 | -6/+819 |
|\ \ | |/ |/| | Initial trezor support | ||||
| * | last css fixes | brunobar79 | 2018-07-19 | 2 | -4/+23 |
| | | |||||
| * | added new global alert | brunobar79 | 2018-07-19 | 1 | -0/+22 |
| | | |||||
| * | fix support link | brunobar79 | 2018-07-19 | 1 | -1/+1 |
| | | |||||
| * | fix unsupported browser view | brunobar79 | 2018-07-19 | 1 | -1/+1 |
| | | |||||
| * | lint | brunobar79 | 2018-07-19 | 1 | -1/+1 |
| | | |||||
| * | scroll smooth | brunobar79 | 2018-07-19 | 1 | -3/+11 |
| | | |||||
| * | design done | brunobar79 | 2018-07-19 | 2 | -24/+87 |
| | | |||||
| * | fix browser not supported screen | brunobar79 | 2018-07-18 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | brunobar79 | 2018-07-18 | 2 | -25/+38 |
| |\ | | | | | | | | | | initial-trezor-support | ||||
| * | | updated account list based on new designs | brunobar79 | 2018-07-18 | 3 | -14/+28 |
| | | | |||||
| * | | Merge branch 'develop' into initial-trezor-support | brunobar79 | 2018-07-17 | 127 | -113/+249 |
| |\ \ | |||||
| * \ \ | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | brunobar79 | 2018-07-14 | 2 | -14/+25 |
| |\ \ \ | | | | | | | | | | | | | | | | initial-trezor-support | ||||
| * | | | | fix account selection | brunobar79 | 2018-07-14 | 1 | -2/+6 |
| | | | | | |||||
| * | | | | added affiliate link to trezor | brunobar79 | 2018-07-14 | 1 | -0/+6 |
| | | | | | |||||
| * | | | | detect ability to open popup instead of browser | brunobar79 | 2018-07-13 | 2 | -6/+13 |
| | | | | | |||||
| * | | | | fix account balance bug | brunobar79 | 2018-07-13 | 2 | -10/+16 |
| | | | | | |||||
| * | | | | remove account modal updated | brunobar79 | 2018-07-13 | 2 | -15/+55 |
| | | | | | |||||
| * | | | | catching up with develop | brunobar79 | 2018-07-13 | 3 | -13/+48 |
| | | | | | |||||
| * | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | brunobar79 | 2018-07-13 | 85 | -337/+2919 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | initial-trezor-support | ||||
| * | | | | | added tooltip | brunobar79 | 2018-07-12 | 2 | -2/+13 |
| | | | | | | |||||
| * | | | | | forget device and autiload account features added | brunobar79 | 2018-07-12 | 2 | -1/+40 |
| | | | | | | |||||
| * | | | | | clean up | brunobar79 | 2018-07-11 | 2 | -4/+4 |
| | | | | | | |||||
| * | | | | | account removal is working | brunobar79 | 2018-07-11 | 3 | -14/+19 |
| | | | | | | |||||
| * | | | | | finish warning modal UI | brunobar79 | 2018-07-11 | 6 | -2/+108 |
| | | | | | | |||||
| * | | | | | added ui to remove accounts | brunobar79 | 2018-07-10 | 1 | -4/+30 |
| | | | | | | |||||
| * | | | | | fix account duplication | brunobar79 | 2018-07-10 | 1 | -6/+0 |
| | | | | | | |||||
| * | | | | | fix all the account related bugs | brunobar79 | 2018-07-10 | 2 | -13/+27 |
| | | | | | | |||||
| * | | | | | copy updated | brunobar79 | 2018-07-07 | 1 | -1/+4 |
| | | | | | | |||||
| * | | | | | update connect harwdware screen | brunobar79 | 2018-07-07 | 1 | -8/+20 |
| | | | | | | |||||
| * | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | brunobar79 | 2018-07-07 | 21 | -170/+490 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | initial-trezor-support | ||||
| * | | | | | | UI refactor | brunobar79 | 2018-07-06 | 3 | -97/+106 |
| | | | | | | | |||||
| * | | | | | | Refactor UI | brunobar79 | 2018-07-06 | 4 | -266/+328 |
| | | | | | | | |||||
| * | | | | | | move strings to localization file | brunobar79 | 2018-07-06 | 1 | -11/+12 |
| | | | | | | | |||||
| * | | | | | | added message for non-chrome browsers | brunobar79 | 2018-07-06 | 1 | -1/+26 |
| | | | | | | | |||||
| * | | | | | | lint fix | brunobar79 | 2018-07-04 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | fix merge conflicts | brunobar79 | 2018-07-04 | 5 | -6/+40 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | fix merge conflicts | brunobar79 | 2018-07-04 | 18 | -20/+20 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | move hardcoded strings to localization file | brunobar79 | 2018-07-03 | 1 | -17/+7 |
| | | | | | | | | | |||||
| * | | | | | | | | always open connect hardware in full screen mode | brunobar79 | 2018-07-03 | 1 | -1/+9 |
| | | | | | | | | | |||||
| * | | | | | | | | fix merge conflicts | brunobar79 | 2018-07-02 | 41 | -180/+450 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | fix merge conflicts | Bruno | 2018-06-13 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | move TrezorKeyring to its own package | Bruno | 2018-06-13 | 1 | -3/+3 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | balances working | Bruno | 2018-06-11 | 1 | -2/+18 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | initial trezor support | Bruno | 2018-06-10 | 4 | -1/+269 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #4822 from whymarrh/show-more-address | Whymarrh Whitby | 2018-07-19 | 2 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Show first four characters of account after 0x | ||||
| * | | | | | | | | | | | Show first four characters of account after 0x in wallet | Whymarrh Whitby | 2018-07-18 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Show first four characters of account after 0x in tx list | Whymarrh Whitby | 2018-07-18 | 1 | -2/+2 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Don't set txData to an empty string | Whymarrh Whitby | 2018-07-18 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Inline single-use vars in send-footer.utils | Whymarrh Whitby | 2018-07-18 | 1 | -3/+1 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Send data along with other tx params | Whymarrh Whitby | 2018-07-18 | 7 | -16/+66 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Hook up send component w/ UPDATE_SEND_HEX_DATA action | Whymarrh Whitby | 2018-07-18 | 3 | -5/+28 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Add hex data row to send screen | Whymarrh Whitby | 2018-07-18 | 4 | -0/+41 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Use Number constructor for number conversion. Use existing ↵ | Alexander Tseung | 2018-07-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | noConversionRateAvailable message | ||||
* | | | | | | | | | | | Merge develop | Alexander Tseung | 2018-07-18 | 3 | -1746/+0 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Fix tests | Alexander Tseung | 2018-07-18 | 2 | -1/+5 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Add fallback when no function found, fix network colors, add fiat values for ↵ | Alexander Tseung | 2018-07-18 | 13 | -104/+195 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tokens with contract exchange rates | ||||
* | | | | | | | | | | | Remove unused confirm transaction files | Alexander Tseung | 2018-07-18 | 3 | -186/+0 |
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #4815 from MetaMask/i4783-retry | Alexander Tseung | 2018-07-18 | 1 | -14/+10 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Increase clickable area and padding of Retry Transaction bar | ||||
| * | | | | | | | | | | Increase clickable area and padding of Retry Transaction bar | Alexander Tseung | 2018-07-17 | 1 | -14/+10 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
* | | | | | | | | | | lint fix | Sara Reynolds | 2018-07-17 | 1 | -6/+4 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Fix edge cases and add translation compatibility | Sara Reynolds | 2018-07-17 | 1 | -6/+12 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Update onlyRenderConversions function to method and account for edge cases | Sara Reynolds | 2018-07-17 | 1 | -26/+24 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Fixes conversion status for tokens without conversion rates | Sara Reynolds | 2018-07-17 | 1 | -14/+29 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Fix send import paths in confirm tx components | Whymarrh Whitby | 2018-07-16 | 2 | -3/+3 |
| | | | | | | | | | |||||
* | | | | | | | | | Fix send import path in customize gas modal | Whymarrh Whitby | 2018-07-16 | 1 | -1/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Fix send import path in ToAutoComplete | Whymarrh Whitby | 2018-07-16 | 1 | -1/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Fix lint warnings in the send/ directory. | Dan | 2018-07-16 | 4 | -32/+28 |
| | | | | | | | | | |||||
* | | | | | | | | | Remove send_ directory, revert to just having send | Dan | 2018-07-16 | 122 | -18/+140 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert accidentally changed constants. Require defaults in ens-input, gas-fee-display and confirm screens. | ||||
* | | | | | | | | | Merge pull request #4715 from BitGuildPlatform/to-autocomplete | Dan J Miller | 2018-07-14 | 3 | -121/+142 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | fixes #4664 | ||||
| * | | | | | | | | | fix classname | TrejGun | 2018-07-05 | 1 | -1/+4 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'develop' into to-autocomplete | Анна | 2018-07-05 | 24 | -28/+65 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | fixes #4664 | trejgun | 2018-07-03 | 3 | -121/+139 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #4702 from BitGuildPlatform/contextTypes | Dan J Miller | 2018-07-14 | 14 | -60/+57 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | convert contextType to static prop for refactored components | ||||
| * | | | | | | | | | Merge branch 'develop' into contextTypes | TrejGun | 2018-07-05 | 24 | -28/+65 |
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js | ||||
| * | | | | | | | | | convert contextType to static prop for refactored components | trejgun | 2018-07-05 | 14 | -60/+57 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #4766 from whymarrh/null-translations | Whymarrh Whitby | 2018-07-13 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Rework i18n-helper getMessage function | ||||
| * | | | | | | | | | Remove unneeded MetaMaskConnect connect wrapper | Whymarrh Whitby | 2018-07-12 | 1 | -1/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Add tooltip to new tab icon in tx-view | Whymarrh Whitby | 2018-07-12 | 1 | -4/+8 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Add tooltip to menu icon in tx-view | Whymarrh Whitby | 2018-07-12 | 1 | -9/+16 |
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
* | | | | | | | | | Merge pull request #4691 from MetaMask/i4404-confirm-refactor | Alexander Tseung | 2018-07-12 | 84 | -301/+2883 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | Refactor and redesign confirm transaction views | ||||
| * | | | | | | | | Fix font sizes, colors. Include data tab for send-eth transaction ↵ | Alexander Tseung | 2018-07-12 | 4 | -4/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | confirmations that have data | ||||
| * | | | | | | | | Fix multiple signature requests showing an infinite spinner | Alexander Tseung | 2018-07-11 | 1 | -2/+11 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix existing unit tests | Alexander Tseung | 2018-07-08 | 1 | -4/+7 |
| | | | | | | | | | |||||
| * | | | | | | | | Various fixes from PR comments | Alexander Tseung | 2018-07-07 | 11 | -149/+206 |
| | | | | | | | | | |||||
| * | | | | | | | | Use eth-method-registry to get method data | Alexander Tseung | 2018-07-07 | 6 | -34/+38 |
| | | | | | | | | | |||||
| * | | | | | | | | Display newest transaction | Alexander Tseung | 2018-07-07 | 2 | -4/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | Refactor data flow, signature request routing | Alexander Tseung | 2018-07-07 | 6 | -79/+145 |
| | | | | | | | | | |||||
| * | | | | | | | | Refactor and redesign confirm transaction views | Alexander Tseung | 2018-07-07 | 82 | -295/+2722 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* / | | | | | | | Prevent users from submitting password multiple times on the unlock screen | Alexander Tseung | 2018-07-11 | 1 | -36/+36 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #4648 from MetaMask/update-import-from-seed-screen | Dan J Miller | 2018-07-06 | 1 | -151/+162 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Update import from seed screen on new ui. | ||||
| * | | | | | | | Delete old restore vault file. | Dan | 2018-07-06 | 2 | -340/+162 |
| | | | | | | | | |||||
| * | | | | | | | Update import from seed screen on new ui. | Dan | 2018-07-05 | 1 | -0/+189 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #4694 from MetaMask/i4660-improve-send-token-error-ui | Dan J Miller | 2018-07-06 | 16 | -17/+303 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Improve send token error ux. | ||||
| * | | | | | | | | Improve send token error ux. | Dan | 2018-07-05 | 16 | -17/+303 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #4733 from whymarrh/fix-setstate-warnings | Whymarrh Whitby | 2018-07-06 | 2 | -0/+11 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix setState warnings in components using TokenTracker | ||||
| * | | | | | | | | Don't update token balances after tracker is stopped | Whymarrh Whitby | 2018-07-05 | 2 | -0/+7 |
| | | | | | | | | | |||||
| * | | | | | | | | Remove TokenTracker listeners when unmounting component | Whymarrh Whitby | 2018-07-05 | 2 | -0/+4 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* / | | | | | | | Prevent calling setState in TxListItem after unmount | Whymarrh Whitby | 2018-07-05 | 1 | -0/+9 |
|/ / / / / / / | |||||
* / / / / / / | fixes 4666 | Sara Reynolds | 2018-07-04 | 1 | -2/+5 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #4716 from MetaMask/i4663-clearErrorMessages | Dan J Miller | 2018-07-04 | 2 | -0/+2 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | fixes #4663 - Clear Error Messages when Importing Accounts are Successful | ||||
| * | | | | | fixes 4663 | Sara Reynolds | 2018-07-04 | 2 | -0/+2 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #4633 from MetaMask/i4580-import-account-errors | Alexander Tseung | 2018-07-04 | 2 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Show all errors on account creation screen. | ||||
| * | | | | | Check that error is defined in import-account error catch. | Dan | 2018-06-29 | 2 | -2/+2 |
| | | | | | | |||||
| * | | | | | Show all errors on account creation screen. | Dan | 2018-06-29 | 2 | -2/+2 |
| | | | | | | |||||
* | | | | | | Merge pull request #4699 from TrejGun/removeLeadingZeroes | Dan J Miller | 2018-07-04 | 3 | -4/+36 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | move removeLeadingZeroes to utils, add test | ||||
| * | | | | | move removeLeadingZeroes to utils, add test | trejgun | 2018-07-02 | 3 | -4/+36 |
| | | | | | | |||||
* | | | | | | eslint --fix . | brunobar79 | 2018-07-03 | 18 | -20/+20 |
| |_|/ / / |/| | | | | |||||
* | | | | | Merge pull request #4687 from snreynolds/i4623-getConvertedCurrency | Dan J Miller | 2018-06-30 | 8 | -24/+9 |
|\ \ \ \ \ | | | | | | | | | | | | | fixes #4623 | ||||
| * | | | | | fixes #4623 | Sara Reynolds | 2018-06-30 | 8 | -24/+9 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #4640 from weijiekoh/develop | Dan J Miller | 2018-06-30 | 1 | -0/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix for #4639: display values of EIP712 typed boolean fields in the signing prompt | ||||
| * | | | | | removed stray console.log | Koh Wei Jie | 2018-06-22 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | fixed blank boolean field for typed signing for new UI | Koh Wei Jie | 2018-06-22 | 1 | -0/+4 |
| | | | | | | |||||
* | | | | | | Merge pull request #4647 from MetaMask/fix-overflow-currency-display | Dan J Miller | 2018-06-30 | 2 | -1/+4 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix issues with scrollbar in currency display. | ||||
| * | | | | | | Improve attribute syntax in send-amount-row.component.js | Dan J Miller | 2018-06-30 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Remove input arrows for send screen amount row on firefox. | Dan | 2018-06-29 | 2 | -0/+3 |
| | | | | | | | |||||
| * | | | | | | Fix issues with scrollbar in currency display. | Dan | 2018-06-29 | 1 | -1/+1 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #4690 from MetaMask/i4662-token-gas-estimate-ux | Dan Finlay | 2018-06-29 | 3 | -0/+11 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Set base estimate for token sends to be updated once recipient address specified | ||||
| * | | | | | | Set based estimate for token sends to be updated once recipient address ↵ | Dan | 2018-06-29 | 3 | -0/+11 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | specified. | ||||
* | | | | | | Merge pull request #4634 from MetaMask/i4503-touch-up-shpshft-button-style | Thomas Huang | 2018-06-29 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Fix style of shapeshift screen in deposit modal. | ||||
| * | | | | | Fix style of shapeshift screen in deposit modal. | Dan | 2018-06-22 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge pull request #4678 from MetaMask/e2e-beta-tests-upgrade | Dan J Miller | 2018-06-29 | 1 | -4/+8 |
|\ \ \ \ \ | | | | | | | | | | | | | E2e beta tests upgrade | ||||
| * | | | | | Fix send token tests in beta ui e2e tests. | Dan | 2018-06-27 | 1 | -4/+8 |
| | | | | | | |||||
| * | | | | | Only show the customize gas modal if the estimateGas call is not currently ↵ | Dan | 2018-06-27 | 1 | -5/+43 |
| | | | | | | | | | | | | | | | | | | | | | | | | in flight. | ||||
* | | | | | | Merge pull request #4674 from MetaMask/removeOnlyTests | Thomas Huang | 2018-06-29 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Remove .only on test | ||||
| * | | | | | | Remove .only on test | tmashuang | 2018-06-27 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #4677 from MetaMask/customize-gas-loading-wait | Dan J Miller | 2018-06-28 | 1 | -5/+43 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Only show the customize gas modal if the estimateGas call is not currently in flight. | ||||
| * | | | | | | Only show the customize gas modal if the estimateGas call is not currently ↵ | Dan | 2018-06-19 | 1 | -5/+43 |
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | in flight. | ||||
* | | | | | | Merge pull request #4574 from MetaMask/i4409-i4410-ens-input-enhancements | Dan J Miller | 2018-06-28 | 5 | -41/+66 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | [new-ui] Improve ENS input errors and update ens validation on network change | ||||
| * | | | | | Remove commented out code in ens-input. | Dan | 2018-06-22 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | Merge branch 'develop' into i4409-i4410-ens-input-enhancements | Dan | 2018-06-20 | 14 | -47/+183 |
| |\| | | | | |||||
| * | | | | | ENS input in send form shows distinct errors for invalid addresses and ↵ | Dan | 2018-06-15 | 5 | -22/+38 |
| | | | | | | | | | | | | | | | | | | | | | | | | non-existent addresses. | ||||
| * | | | | | ENS name revalidates on network change. | Dan | 2018-06-13 | 1 | -23/+33 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #4627 from TrejGun/gas-fee-display | Dan J Miller | 2018-06-27 | 8 | -57/+121 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | refactor gas-fee-display component | ||||
| * | | | | fix default import | trejgun | 2018-06-23 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | lint | trejgun | 2018-06-21 | 2 | -3/+13 |
| | | | | | |||||
| * | | | | refactor gas-fee-display component | trejgun | 2018-06-21 | 8 | -57/+111 |
| | | | | | | | | | | | | | | | | | | | | #4622 | ||||
* | | | | | Scroll large amounts in the send component | Whymarrh Whitby | 2018-06-21 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Handle large token balances in tx list hero | Whymarrh Whitby | 2018-06-21 | 2 | -1/+2 |
| |_|/ / |/| | | | |||||
* | | | | Merge pull request #4584 from MetaMask/fix-send-token | kumavis | 2018-06-19 | 10 | -19/+129 |
|\ \ \ \ | | | | | | | | | | | Add hex-prefix to gas estimate result | ||||
| * | | | | On send screen amount change, updateGas call now includes current to address. | Dan | 2018-06-19 | 6 | -4/+37 |
| | | | | | |||||
| * | | | | Send screen returns simple gas cost if no to address specified when not ↵ | Dan | 2018-06-19 | 2 | -3/+8 |
| | | | | | | | | | | | | | | | | | | | | sending token. | ||||
| * | | | | Remove leading zeroes from send screen amount row input. | Dan | 2018-06-19 | 1 | -1/+5 |
| | | | | | |||||
| * | | | | Fix currency-display.js rendering of token amounts. | Dan | 2018-06-19 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Revert to updating amount on blur of input change; update gas on blur of ↵ | Dan | 2018-06-19 | 2 | -5/+11 |
| | | | | | | | | | | | | | | | | | | | | amount input change; validate onchange. | ||||
| * | | | | Fix unit tests | Alexander Tseung | 2018-06-16 | 1 | -3/+8 |
| | | | | | |||||
| * | | | | Estimate gas limit when the token amount changes. Fix amount input | Alexander Tseung | 2018-06-16 | 4 | -16/+18 |
| | | | | | |||||
| * | | | | Update send.utils.js estimateGas tests. | Dan | 2018-06-15 | 2 | -5/+20 |
| | | | | | |||||
| * | | | | Add a buffer to new ui gas estimates | Dan | 2018-06-15 | 1 | -2/+41 |
| | | | | | |||||
| * | | | | Add hex-prefix to gas estimate result | Alexander Tseung | 2018-06-15 | 2 | -4/+4 |
| |/ / / | |||||
* / / / | View address of an added token (#4591) | Csaba S | 2018-06-19 | 1 | -17/+36 |
|/ / / | | | | | | | | | | | | | | | | * adding menu actions for tokens * apply common style | ||||
* | | | Merge pull request #4566 from MetaMask/notice-phishing | Dan Finlay | 2018-06-15 | 2 | -10/+10 |
|\ \ \ | | | | | | | | | Push new notice on recent phishing incidents | ||||
| * | | | notices - replace getLatestNotice with getNextNotice | kumavis | 2018-06-14 | 2 | -10/+10 |
| |/ / | |||||
* / / | add help link to eth_sign warning | Bobby Dresser | 2018-06-12 | 1 | -1/+8 |
|/ / | |||||
* / | Access correct property from state in confirm screen components gatherTxMeta() | Dan | 2018-06-08 | 2 | -2/+2 |
|/ | |||||
* | Merge branch 'develop' into i3725-refactor-send-component- | Dan | 2018-06-07 | 8 | -30/+70 |
|\ | |||||
| * | Merge pull request #4418 from MetaMask/handle-import-account-failure-in-ui | kumavis | 2018-06-07 | 2 | -13/+36 |
| |\ | | | | | | | Handle errors for null selected address after Importing account (json or private key) | ||||
| | * | Merge branch 'develop' into handle-import-account-failure-in-ui | Dan | 2018-06-05 | 10 | -26/+127 |
| | |\ | |||||
| | * \ | Merge branch 'develop' into handle-import-account-failure-in-ui | Dan | 2018-06-03 | 31 | -192/+324 |
| | |\ \ | |||||
| | * | | | Fix then-catch + error handling in import-account | Dan | 2018-05-31 | 2 | -4/+2 |
| | | | | | |||||
| | * | | | Importing account by json and private key shows error and does not change ↵ | Dan | 2018-05-31 | 2 | -10/+35 |
| | | | | | | | | | | | | | | | | | | | | account if no selectedAddress comes after import. | ||||
| * | | | | i18n - ja improvements | 03-26 | 2018-06-07 | 4 | -9/+23 |
| | | | | | |||||
| * | | | | Render the accounts in keyring order | Whymarrh Whitby | 2018-06-06 | 1 | -3/+4 |
| | | | | | |||||
| * | | | | Remove selectedIdentity prop from wallet view | Whymarrh Whitby | 2018-06-06 | 1 | -5/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The selectedIdentity property is computed based on the selectedAddress which means that using both the selectedAddress and the selectedIdentity is redundant. In the case of the Array#find call on the set of keyrings, we wouldn't have a situation where one is included and the other isn't. This changeset removes the selectedIdentity from the wallet view because it isn't needed. | ||||
| * | | | | Ensure selectedAddress exists when render wallet | Whymarrh Whitby | 2018-06-06 | 1 | -0/+4 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'develop' into i3725-refactor-send-component- | Dan | 2018-06-05 | 12 | -28/+129 |
|\| | | | |||||
| * | | | Update hide-token-confirmation-modal.js to use new modalState schema (#4482) | Dan J Miller | 2018-06-05 | 3 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Update hide-token-confirmation-modal.js to use new modalState schema (added in 41e38fe55). * Fix modalState props | ||||
| * | | | Merge pull request #4428 from MetaMask/fix-tokenlist-balance-overflow | Dan J Miller | 2018-06-05 | 1 | -2/+2 |
| |\ \ \ | | | | | | | | | | | Token name is not hidden in wallet if balance is exceptionally long. | ||||
| | * | | | Token name is not hidden in wallet if balance is exceptionally long. | Dan | 2018-06-01 | 1 | -2/+2 |
| | |/ / | |||||
| * | / | Indicate the current selected account on the popup account view (#4445) | Alexander Tseung | 2018-06-05 | 6 | -21/+122 |
| | |/ | |/| | |||||
| * | | update helpscout links to zenhub | Bobby Dresser | 2018-06-01 | 2 | -2/+2 |
| | | | |||||
* | | | Simplify recipient code check in send.utils estimateGas | Dan | 2018-06-05 | 1 | -4/+5 |
| | | | |||||
* | | | Default currency-display valueToRender to empty string when not readOnly ↵ | Dan | 2018-06-02 | 1 | -2/+2 |
| | | | | | | | | | | | | ('0' if readOnly). | ||||
* | | | Fix calculation of data property for gas estimation on token transfers. | Dan | 2018-06-02 | 6 | -45/+41 |
| | | | |||||
* | | | Merge branch 'i3725-refactor-send-component-' into ↵ | Dan | 2018-06-01 | 44 | -353/+610 |
|\ \ \ | | | | | | | | | | | | | i3914-fix-newui-send-gas-estimation | ||||
| * | | | Remove .only | Dan | 2018-06-01 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'i3725-refactor-send-component-' of ↵ | Dan | 2018-06-01 | 5 | -153/+70 |
| |\ \ \ | | | | | | | | | | | | | | | | github.com:MetaMask/metamask-extension into i3725-refactor-send-component- | ||||
| | * \ \ | Merge pull request #4386 from ↵ | Dan J Miller | 2018-06-01 | 5 | -153/+70 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | MetaMask/i4077-replace-currency-input-with-numeric-input Replace currency-input.js with NumericInput | ||||
| | | * | | | Improve input width calculation in currency-display.js | Dan | 2018-06-01 | 1 | -3/+2 |
| | | | | | | |||||
| | | * | | | Fix currency display send integration tests. | Dan | 2018-05-31 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | Delete currency-input.js | Dan | 2018-05-30 | 2 | -114/+0 |
| | | | | | | |||||
| | | * | | | Remove currency input from input-number | Dan | 2018-05-30 | 1 | -4/+4 |
| | | | | | |