Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update logo wordmark | Alexander Tseung | 2018-08-19 | 6 | -56/+28 |
* | fix ledger affiliate link | brunobar79 | 2018-08-17 | 1 | -1/+1 |
* | ui ready | brunobar79 | 2018-08-17 | 3 | -9/+37 |
* | connect screen ready | brunobar79 | 2018-08-17 | 2 | -27/+124 |
* | Merge branch 'develop' into ledger-support | Bruno Barbieri | 2018-08-15 | 4 | -6/+6 |
|\ | |||||
| * | Merge pull request #5060 from MetaMask/bignumber-string | Dan Finlay | 2018-08-15 | 3 | -4/+4 |
| |\ | |||||
| | * | Cast arguments for new Bignumbers() to string. | Dan Miller | 2018-08-15 | 3 | -4/+4 |
| * | | Add exportAsFile optional type argument | Whymarrh Whitby | 2018-08-14 | 1 | -2/+2 |
| |/ | |||||
* | | remove console logs | brunobar79 | 2018-08-15 | 1 | -1/+1 |
* | | more ui | brunobar79 | 2018-08-15 | 1 | -1/+2 |
* | | fix | brunobar79 | 2018-08-15 | 1 | -1/+1 |
* | | ui fixes | brunobar79 | 2018-08-15 | 4 | -23/+38 |
* | | fix tx tests | brunobar79 | 2018-08-14 | 1 | -1/+2 |
* | | legacy and new hd path working | brunobar79 | 2018-08-14 | 3 | -24/+45 |
* | | good progress adding paths | brunobar79 | 2018-08-14 | 5 | -22/+121 |
* | | message signing works | brunobar79 | 2018-08-12 | 1 | -0/+1 |
* | | 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 | 4 | -27/+43 |
|/ | |||||
* | Merge pull request #4897 from MetaMask/qr-code-scan | Bruno Barbieri | 2018-08-11 | 17 | -6/+474 |
|\ | |||||
| * | add comment | brunobar79 | 2018-08-09 | 1 | -0/+5 |
| * | fix merge conflicts | brunobar79 | 2018-08-09 | 1 | -2/+8 |
| |\ | |||||
| * | | 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 | 8 | -17/+28 |
| |\ \ | |||||
| * | | | restore qr | brunobar79 | 2018-08-04 | 1 | -0/+2 |
| * | | | 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 | 5 | -21/+117 |
| * | | | 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 | 6 | -49/+112 |
| * | | | 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 | 10 | -234/+164 |
| * | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into qr-code... | brunobar79 | 2018-07-31 | 4 | -6/+30 |
| |\ \ \ | |||||
| * | | | | 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 |
| * | | | | clean up | brunobar79 | 2018-07-27 | 1 | -1/+0 |
| * | | | | fix merge conflicts | brunobar79 | 2018-07-27 | 12 | -17/+426 |
| |\ \ \ \ | |||||
| * | | | | | 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 | 2 | -2/+6 |
| * | | | | | decent UI | brunobar79 | 2018-07-25 | 1 | -21/+43 |
| * | | | | | working without injection | brunobar79 | 2018-07-25 | 9 | -21/+229 |
| * | | | | | added qr code scanner icon in send transaction | brunobar79 | 2018-07-24 | 7 | -5/+25 |
| * | | | | | camera working back and forth | brunobar79 | 2018-07-24 | 4 | -1/+36 |
* | | | | | | Merge pull request #5000 from MetaMask/contract-method-conf-sim-failure | Dan J Miller | 2018-08-09 | 2 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Show error while allowing confirmation of transaction where simulation fails | Dan Miller | 2018-08-09 | 2 | -2/+2 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | 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 | 4 | -6/+46 |
|/ / / / / | |||||
* | | | / | Use token decimals when calculating confirm screen amount for token approvals. | Dan Miller | 2018-08-08 | 1 | -2/+8 |
| |_|_|/ |/| | | | |||||
* | | | | Fixing translations in first-time init menu (#4969) | Justin Kat | 2018-08-08 | 1 | -1/+1 |
* | | | | Merge branch 'develop' into TokensPerAccountBasis | Esteban MIno | 2018-08-08 | 10 | -21/+55 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #4948 from MetaMask/i4638-update-font | Alexander Tseung | 2018-08-04 | 3 | -5/+0 |
| |\ \ \ \ | |||||
| | * | | | | Update Font in Account Selector | Alexander Tseung | 2018-08-04 | 3 | -5/+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 | 3 | -6/+23 |
| * | | | Fix overflow for long total strings in confirm string | Alexander Tseung | 2018-07-26 | 1 | -0/+7 |
| | |/ | |/| | |||||
* | | | Merge branch 'develop' into TokensPerAccountBasis | Esteban Miño | 2018-07-28 | 8 | -1/+322 |
|\| | | |||||
| * | | Merge pull request #4885 from MetaMask/RetryOnEarliestPendingTx | Dan J Miller | 2018-07-26 | 1 | -1/+10 |
| |\ \ | |||||
| | * | | 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 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | 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 & delete tokens per network | Esteban MIno | 2018-07-27 | 1 | -1/+2 |
|/ / / | |||||
* | | | Add close window support to signature requests. Move logic to actions | Alexander Tseung | 2018-07-24 | 5 | -31/+108 |
* | | | 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 |
|\ \ | |||||
| * | | show alert ONLY when device is connected | brunobar79 | 2018-07-23 | 1 | -4/+11 |
* | | | Merge pull request #4848 from MetaMask/fix-alert-flash | Dan Finlay | 2018-07-24 | 1 | -6/+46 |
|\ \ \ | |||||
| * | | | refactor Alert component to work properly | brunobar79 | 2018-07-22 | 1 | -6/+46 |
| |/ / | |||||
* | | | fix type | 板橋 清信 | 2018-07-23 | 1 | -1/+1 |
* | | | fix token amount | 板橋 清信 | 2018-07-23 | 1 | -3/+2 |
|/ / | |||||
* | | Add fallback options for displaying recipient name in the Confirm screen | Alexander Tseung | 2018-07-21 | 3 | -10/+24 |
* | | Merge pull request #4625 from MetaMask/initial-trezor-support | Bruno Barbieri | 2018-07-20 | 20 | -23/+1338 |
|\ \ | |/ |/| | |||||
| * | last css fixes | brunobar79 | 2018-07-19 | 3 | -10/+42 |
| * | added new global alert | brunobar79 | 2018-07-19 | 6 | -8/+126 |
| * | fix support link | brunobar79 | 2018-07-19 | 1 | -1/+1 |
| * | fix unsupported browser view | brunobar79 | 2018-07-19 | 2 | -2/+6 |
| * | lint | brunobar79 | 2018-07-19 | 1 | -1/+1 |
| * | scroll smooth | brunobar79 | 2018-07-19 | 2 | -3/+12 |
| * | design done | brunobar79 | 2018-07-19 | 3 | -44/+178 |
| * | fix browser not supported screen | brunobar79 | 2018-07-18 | 1 | -1/+1 |
| * | Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial... | brunobar79 | 2018-07-18 | 3 | -31/+42 |
| |\ | |||||
| * | | updated account list based on new designs | brunobar79 | 2018-07-18 | 4 | -25/+85 |
| * | | Merge branch 'develop' into initial-trezor-support | brunobar79 | 2018-07-17 | 129 | -115/+251 |
| |\ \ | |||||
| * \ \ | Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial... | brunobar79 | 2018-07-14 | 4 | -42/+29 |
| |\ \ \ | |||||
| * | | | | fix account selection | brunobar79 | 2018-07-14 | 2 | -3/+11 |
| * | | | | added affiliate link to trezor | brunobar79 | 2018-07-14 | 2 | -0/+22 |
| * | | | | 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 initial... | brunobar79 | 2018-07-13 | 104 | -591/+4351 |
| |\ \ \ \ | |||||
| * | | | | | added tooltip | brunobar79 | 2018-07-12 | 3 | -5/+16 |
| * | | | | | forget device and autiload account features added | brunobar79 | 2018-07-12 | 4 | -1/+95 |
| * | | | | | clean up | brunobar79 | 2018-07-11 | 3 | -6/+6 |
| * | | | | | account removal is working | brunobar79 | 2018-07-11 | 4 | -14/+40 |
| * | | | | | finish warning modal UI | brunobar79 | 2018-07-11 | 8 | -3/+111 |
| * | | | | | added ui to remove accounts | brunobar79 | 2018-07-10 | 2 | -4/+47 |
| * | | | | | 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 | 2 | -2/+5 |
| * | | | | | update connect harwdware screen | brunobar79 | 2018-07-07 | 2 | -9/+25 |
| * | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial... | brunobar79 | 2018-07-07 | 30 | -195/+542 |
| |\ \ \ \ \ | |||||
| * | | | | | | 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 | 2 | -1/+39 |
| * | | | | | | lint fix | brunobar79 | 2018-07-04 | 1 | -1/+1 |
| * | | | | | | fix merge conflicts | brunobar79 | 2018-07-04 | 7 | -7/+63 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | fix merge conflicts | brunobar79 | 2018-07-04 | 20 | -22/+22 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | 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 | 54 | -203/+569 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | 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 | 7 | -6/+413 |
* | | | | | | | | | | | 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 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 updateSendHexData action | Whymarrh Whitby | 2018-07-18 | 2 | -0/+17 |
* | | | | | | | | | | | | Add hex data row to send screen | Whymarrh Whitby | 2018-07-18 | 5 | -2/+43 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Use Number constructor for number conversion. Use existing noConversionRateAv... | Alexander Tseung | 2018-07-18 | 2 | -4/+4 |
* | | | | | | | | | | | 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 | 16 | -104/+313 |
* | | | | | | | | | | | Remove unused confirm transaction files | Alexander Tseung | 2018-07-18 | 4 | -299/+23 |
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #4815 from MetaMask/i4783-retry | Alexander Tseung | 2018-07-18 | 2 | -20/+14 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Increase clickable area and padding of Retry Transaction bar | Alexander Tseung | 2018-07-17 | 2 | -20/+14 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
* | | | | | | | | | | 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 | 124 | -20/+142 |
* | | | | | | | | | Merge pull request #4715 from BitGuildPlatform/to-autocomplete | Dan J Miller | 2018-07-14 | 3 | -121/+142 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | fix classname | TrejGun | 2018-07-05 | 1 | -1/+4 |
| * | | | | | | | | | Merge branch 'develop' into to-autocomplete | Анна | 2018-07-05 | 29 | -41/+90 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'develop' into contextTypes | TrejGun | 2018-07-05 | 29 | -41/+90 |
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | 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 | 3 | -29/+5 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Remove unneeded MetaMaskConnect connect wrapper | Whymarrh Whitby | 2018-07-12 | 2 | -28/+1 |
| * | | | | | | | | | Fallback to English and then the key for I18nProvider#t | Whymarrh Whitby | 2018-07-12 | 1 | -1/+4 |
* | | | | | | | | | | 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 | 102 | -553/+4311 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Fix font sizes, colors. Include data tab for send-eth transaction confirmatio... | Alexander Tseung | 2018-07-12 | 4 | -4/+20 |
| * | | | | | | | | Fix multiple signature requests showing an infinite spinner | Alexander Tseung | 2018-07-11 | 1 | -2/+11 |
| * | | | | | | | | Add unit tests for confirmTransaction duck and util | Alexander Tseung | 2018-07-10 | 2 | -0/+812 |
| * | | | | | | | | Fix existing unit tests | Alexander Tseung | 2018-07-08 | 1 | -4/+7 |
| * | | | | | | | | Various fixes from PR comments | Alexander Tseung | 2018-07-07 | 14 | -154/+216 |
| * | | | | | | | | Use eth-method-registry to get method data | Alexander Tseung | 2018-07-07 | 8 | -34/+112 |
| * | | | | | | | | Display newest transaction | Alexander Tseung | 2018-07-07 | 3 | -5/+5 |
| * | | | | | | | | Refactor data flow, signature request routing | Alexander Tseung | 2018-07-07 | 9 | -117/+185 |
| * | | | | | | | | Refactor and redesign confirm transaction views | Alexander Tseung | 2018-07-07 | 97 | -545/+3255 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* / | | | | | | | Prevent users from submitting password multiple times on the unlock screen | Alexander Tseung | 2018-07-11 | 3 | -38/+40 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #4648 from MetaMask/update-import-from-seed-screen | Dan J Miller | 2018-07-06 | 3 | -152/+172 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Delete old restore vault file. | Dan | 2018-07-06 | 3 | -341/+163 |
| * | | | | | | | Update import from seed screen on new ui. | Dan | 2018-07-05 | 3 | -1/+199 |
* | | | | | | | | Merge pull request #4694 from MetaMask/i4660-improve-send-token-error-ui | Dan J Miller | 2018-07-06 | 18 | -17/+320 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Improve send token error ux. | Dan | 2018-07-05 | 18 | -17/+320 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #4733 from whymarrh/fix-setstate-warnings | Whymarrh Whitby | 2018-07-06 | 3 | -0/+14 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Don't update token balances after tracker is stopped | Whymarrh Whitby | 2018-07-05 | 3 | -0/+10 |
| * | | | | | | | | Remove TokenTracker listeners when unmounting component | Whymarrh Whitby | 2018-07-05 | 2 | -0/+4 |
* | | | | | | | | | Merge pull request #4734 from whymarrh/txlistitem-setstate-warning | Whymarrh Whitby | 2018-07-06 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Prevent calling setState in TxListItem after unmount | Whymarrh Whitby | 2018-07-05 | 1 | -0/+9 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge pull request #4617 from TrejGun/fix-new-line | Dan J Miller | 2018-07-06 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | fix white spaces in signature | trejgun | 2018-06-20 | 1 | -0/+1 |
* | | | | | | | | | | Merge pull request #4686 from MetaMask/tweak-token-list-amount-style | Dan J Miller | 2018-07-05 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Ensures token list amount is in its own row. | Dan | 2018-07-05 | 1 | -0/+1 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #4685 from MetaMask/estimate-gasprice-background-newui | Dan J Miller | 2018-07-05 | 1 | -14/+20 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | Improve error and promise resolution handling in action.js updateGasData(). | Dan | 2018-07-05 | 1 | -13/+14 |
| * | | | | | | | | Remove unnecessary anonymous function call in actions.js gas estimation. | Dan | 2018-07-04 | 1 | -7/+6 |
| * | | | | | | | | Use background gas price estimation method in new ui. | Dan | 2018-06-29 | 1 | -8/+14 |
* | | | | | | | | | fixes 4666 | Sara Reynolds | 2018-07-04 | 1 | -2/+5 |
* | | | | | | | | | :qw | Sara Reynolds | 2018-07-04 | 1 | -10/+0 |
| |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #4716 from MetaMask/i4663-clearErrorMessages | Dan J Miller | 2018-07-04 | 2 | -0/+2 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | fixes 4663 | Sara Reynolds | 2018-07-04 | 2 | -0/+2 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge pull request #4654 from TrejGun/bignumber | Dan J Miller | 2018-07-04 | 2 | -1/+23 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | lint | trejgun | 2018-06-29 | 1 | -1/+1 |
| * | | | | | | | change numbers | trejgun | 2018-06-24 | 1 | -7/+6 |
| * | | | | | | | remove .only | trejgun | 2018-06-24 | 1 | -1/+1 |
| * | | | | | | | fixes #4307 BigNumber casting issue | trejgun | 2018-06-24 | 2 | -1/+24 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #4633 from MetaMask/i4580-import-account-errors | Alexander Tseung | 2018-07-04 | 2 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | 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 | trejgun | 2018-07-02 | 3 | -4/+36 |
* | | | | | | | eslint --fix . | brunobar79 | 2018-07-03 | 20 | -22/+22 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | Merge pull request #4687 from snreynolds/i4623-getConvertedCurrency | Dan J Miller | 2018-06-30 | 8 | -24/+9 |
|\ \ \ \ \ \ | |||||
| * | | | | | | 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 |
|\ \ \ \ \ \ | |||||
| * | | | | | | 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 | 3 | -2/+12 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | 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 | 3 | -0/+11 |
| * | | | | | | | Fix issues with scrollbar in currency display. | Dan | 2018-06-29 | 2 | -2/+1 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #4690 from MetaMask/i4662-token-gas-estimate-ux | Dan Finlay | 2018-06-29 | 3 | -0/+11 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Set based estimate for token sends to be updated once recipient address speci... | Dan | 2018-06-29 | 3 | -0/+11 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #4634 from MetaMask/i4503-touch-up-shpshft-button-style | Thomas Huang | 2018-06-29 | 2 | -7/+26 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Fix style of shapeshift screen in deposit modal. | Dan | 2018-06-22 | 2 | -7/+26 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #4678 from MetaMask/e2e-beta-tests-upgrade | Dan J Miller | 2018-06-29 | 1 | -4/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | 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 in... | Dan | 2018-06-27 | 4 | -6/+79 |
* | | | | | | | Merge pull request #4674 from MetaMask/removeOnlyTests | Thomas Huang | 2018-06-29 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | 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 | 4 | -6/+79 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Only show the customize gas modal if the estimateGas call is not currently in... | Dan | 2018-06-19 | 4 | -6/+79 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #4574 from MetaMask/i4409-i4410-ens-input-enhancements | Dan J Miller | 2018-06-28 | 6 | -41/+71 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | 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 | 19 | -56/+205 |
| |\| | | | | | |||||
| * | | | | | | ENS input in send form shows distinct errors for invalid addresses and non-ex... | Dan | 2018-06-15 | 6 | -22/+43 |
| * | | | | | | 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 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | 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 |
| | |_|/ / | |/| | | | |||||
* | | | | | Scroll large amounts in the send component | Whymarrh Whitby | 2018-06-21 | 2 | -4/+6 |
* | | | | | Handle large token balances in tx list hero | Whymarrh Whitby | 2018-06-21 | 4 | -5/+21 |
| |_|/ / |/| | | | |||||
* | | | | Merge pull request #4584 from MetaMask/fix-send-token | kumavis | 2018-06-19 | 11 | -19/+140 |
|\ \ \ \ | |||||
| * | | | | 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 sendi... | Dan | 2018-06-19 | 2 | -3/+8 |
| * | | | | 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 amou... | Dan | 2018-06-19 | 2 | -5/+11 |